From a44a5ef987ba2b48e29d3aff2ee4bc83757e7b8d Mon Sep 17 00:00:00 2001 From: FruitieX Date: Tue, 16 Nov 2010 10:27:27 +0200 Subject: [PATCH] freezetag can use the CA modicons panel for now, at the moment there's only support for two teams anyway --- qcsrc/client/hud.qc | 4 ++-- qcsrc/common/constants.qh | 2 ++ qcsrc/server/g_world.qc | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 9a203c72b..855cec4de 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4455,7 +4455,7 @@ void HUD_ModIcons(void) if(!autocvar_hud_panel_modicons && !autocvar__hud_configure) return; - if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && !autocvar__hud_configure) + if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && gametype != GAME_FREEZETAG && !autocvar__hud_configure) return; active_panel = HUD_PANEL_MODICONS; @@ -4492,7 +4492,7 @@ void HUD_ModIcons(void) HUD_Mod_NexBall(pos, mySize); else if(gametype == GAME_CTS || gametype == GAME_RACE) HUD_Mod_Race(pos, mySize); - else if(gametype == GAME_CA) + else if(gametype == GAME_CA || gametype == GAME_FREEZETAG) HUD_Mod_CA(pos, mySize); } diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index f3150439a..3f95ed19e 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -342,6 +342,8 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66; // mod stats (1xx) const float STAT_REDALIVE = 100; const float STAT_BLUEALIVE = 101; +const float STAT_YELLOWALIVE = 102; +const float STAT_PINKALIVE = 103; //const float STAT_SPIDERBOT_AIM 53 // compressShotOrigin //const float STAT_SPIDERBOT_TARGET 54 // compressShotOrigin diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index f381612c3..db5c36094 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -809,10 +809,12 @@ void spawnfunc_worldspawn (void) addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge); - if(g_ca) + if(g_ca || g_freezetag) { addstat(STAT_REDALIVE, AS_INT, redalive_stat); addstat(STAT_BLUEALIVE, AS_INT, bluealive_stat); + addstat(STAT_YELLOWALIVE, AS_INT, yellowalive_stat); + addstat(STAT_PINKALIVE, AS_INT, pinkalive_stat); } // g_movementspeed hack addstat(STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW, AS_FLOAT, stat_sv_airspeedlimit_nonqw); -- 2.39.2