Cleanup: move stuff from .qh into .qc files

diff --git a/qcsrc/server/mutators/gamemode_arena.qc b/qcsrc/server/mutators/gamemode_arena.qc
index 132b116bb7d3f0a42f6ab436604da09711748836..cc93dd3e4196e4d50bc4078f861d942576426bff 100644 (file)
--- a/qcsrc/server/mutators/gamemode_arena.qc
+++ b/qcsrc/server/mutators/gamemode_arena.qc
@@ -1,3 +1,12 @@
+.float spawned;
+float maxspawned;
+float numspawned;
+.entity spawnqueue_next;
+.entity spawnqueue_prev;
+.float spawnqueue_in;
+entity spawnqueue_first;
+entity spawnqueue_last;
+
 void Spawnqueue_Insert(entity e)
 {
        if(e.spawnqueue_in)

diff --git a/qcsrc/server/mutators/gamemode_arena.qh b/qcsrc/server/mutators/gamemode_arena.qh
index 7e23d4f1c35d902dbc12d9f3cc88f058a5bb7162..a2f623a000cc4a27d872aa357a58bc86e793166d 100644 (file)
--- a/qcsrc/server/mutators/gamemode_arena.qh
+++ b/qcsrc/server/mutators/gamemode_arena.qh
@@ -1,14 +1,2 @@
-float maxspawned;
-float numspawned;
+// should be removed in the future, as other code should not have to care
 float arena_roundbased;
-.float spawned;
-.entity spawnqueue_next;
-.entity spawnqueue_prev;
-.float spawnqueue_in;
-entity spawnqueue_first;
-entity spawnqueue_last;
-
-void Spawnqueue_Insert(entity e);
-void Spawnqueue_Remove(entity e);
-void Spawnqueue_Unmark(entity e);
-void Spawnqueue_Mark(entity e);

diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index 528a8812a56445e085ef8970b2ade2ec00fc50d1..1a27b119e218126354275d6b5b26be715db02e86 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@ -1,3 +1,9 @@
+float total_players;
+float redalive, bluealive, yellowalive, pinkalive;
+.float redalive_stat, bluealive_stat, yellowalive_stat, pinkalive_stat;
+float ca_teams;
+float allowed_to_spawn;
+
 void CA_count_alive_players()
 {
        entity e;
@@ -57,6 +63,8 @@ float CA_GetWinnerTeam()
        return -1; // no player left
 }
 
+#define CA_ALIVE_TEAMS() ((redalive > 0) + (bluealive > 0) + (yellowalive > 0) + (pinkalive > 0))
+#define CA_ALIVE_TEAMS_OK() (CA_ALIVE_TEAMS() == ca_teams)
 float CA_CheckWinner()
 {
        entity e;

diff --git a/qcsrc/server/mutators/gamemode_ca.qh b/qcsrc/server/mutators/gamemode_ca.qh
index 8d493bb312711243cb82e4fb70580d1a1f4bb840..54df1a4013999347be22ee333d4f34dba4b19ef5 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ca.qh
+++ b/qcsrc/server/mutators/gamemode_ca.qh
@@ -1,10 +1,3 @@
+// should be removed in the future, as other code should not have to care
 .float caplayer;
-float total_players;
-float redalive, bluealive, yellowalive, pinkalive;
-.float redalive_stat, bluealive_stat, yellowalive_stat, pinkalive_stat;
-#define CA_ALIVE_TEAMS() ((redalive > 0) + (bluealive > 0) + (yellowalive > 0) + (pinkalive > 0))
-#define CA_ALIVE_TEAMS_OK() (CA_ALIVE_TEAMS() == ca_teams)
-float ca_teams;
-
-float allowed_to_spawn;