These spawnfuncs belong in the CTF code file, not elsewhere

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 6bea4841c05f9a8eee603d95b299a077eea756f1..26834605ee6dd02c0ace4a9447ed4f3814f57a0c 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -1345,6 +1345,14 @@ void spawnfunc_ctf_team()
        self.team = self.cnt + 1;
 }
 
+// compatibility for quake maps
+void spawnfunc_team_CTF_redflag()    { spawnfunc_item_flag_team1();    }
+void spawnfunc_team_CTF_blueflag()   { spawnfunc_item_flag_team2();    }
+void spawnfunc_team_CTF_redplayer()  { spawnfunc_info_player_team1();  }
+void spawnfunc_team_CTF_blueplayer() { spawnfunc_info_player_team2();  }
+void spawnfunc_team_CTF_redspawn()   { spawnfunc_info_player_team1();  }
+void spawnfunc_team_CTF_bluespawn()  { spawnfunc_info_player_team2();  }
+
 
 // ==============
 // Initialization

diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh
index ff893b61e21e7d4d1b1cb5ac66618589fe3ac36c..8fa2b5f944f9124b96854bfaf7161af736a470a7 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/gamemode_ctf.qh
@@ -3,15 +3,6 @@
 // used in cheats.qc
 void ctf_RespawnFlag(entity flag)
 
-// used in t_quake3.qc
-void spawnfunc_info_player_team1();
-void spawnfunc_info_player_team2();
-void spawnfunc_info_player_team3();
-void spawnfunc_info_player_team4();
-void spawnfunc_item_flag_team1();
-void spawnfunc_item_flag_team2();
-void spawnfunc_ctf_team();
-
 // score rule declarations
 #define ST_CTF_CAPS 1
 #define SP_CTF_CAPS 4

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 82b5f4457a9b8c5aeea05b5e185085a72fb5160b..7f8cb82921ee3ae2a3b068ac331bbff891a13949 100644 (file)
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -122,12 +122,8 @@ void spawnfunc_target_give()
 //void spawnfunc_item_health_mega()  /* handled in t_items.qc */
 //void spawnfunc_item_invis()        /* not supported */
 //void spawnfunc_item_regen()        /* not supported */
-void spawnfunc_team_CTF_redflag()    { spawnfunc_item_flag_team1();    }
-void spawnfunc_team_CTF_blueflag()   { spawnfunc_item_flag_team2();    }
-void spawnfunc_team_CTF_redplayer()  { spawnfunc_info_player_team1();  }
-void spawnfunc_team_CTF_blueplayer() { spawnfunc_info_player_team2();  }
-void spawnfunc_team_CTF_redspawn()   { spawnfunc_info_player_team1();  }
-void spawnfunc_team_CTF_bluespawn()  { spawnfunc_info_player_team2();  }
+
+// CTF spawnfuncs handled in mutators/gamemode_ctf.qc now
 
 void spawnfunc_item_flight()         { spawnfunc_item_jetpack();       }