From 90257cbd15cd999707daeab28696701c3d07ed20 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Mon, 10 Sep 2012 04:51:54 -0400 Subject: [PATCH] These spawnfuncs belong in the CTF code file, not elsewhere --- qcsrc/server/mutators/gamemode_ctf.qc | 8 ++++++++ qcsrc/server/mutators/gamemode_ctf.qh | 9 --------- qcsrc/server/t_quake3.qc | 8 ++------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index 6bea4841c0..26834605ee 100644 --- 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 ff893b61e2..8fa2b5f944 100644 --- 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 82b5f4457a..7f8cb82921 100644 --- 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(); } -- 2.39.2