From f68a148e0875b77fdf85b7ebe92ab7789e5a4b73 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sat, 23 Oct 2010 20:27:33 +0300 Subject: [PATCH] fixes --- qcsrc/client/hud.qc | 6 ++++-- qcsrc/common/constants.qh | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 966fdb385..7ce1a202d 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -3867,11 +3867,12 @@ void HUD_Mod_CA(vector pos, vector mySize) redalive = getstati(STAT_REDALIVE); bluealive = getstati(STAT_BLUEALIVE); + drawfont = hud_bigfont; vector redpos, bluepos; if(mySize_x > mySize_y) { redpos = pos; - bluepos = pos + eX * 0.5 * mySize_x; + bluepos = pos + eY * 0.5 * mySize_y; drawpic_aspect_skin(redpos, "player_red.tga", 0.5 * mySize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawstring_aspect(redpos + eX * 0.5 * mySize_x, ftos(redalive), 0.5 * mySize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawpic_aspect_skin(bluepos, "player_blue.tga", 0.5 * mySize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); @@ -3886,6 +3887,7 @@ void HUD_Mod_CA(vector pos, vector mySize) drawpic_aspect_skin(bluepos, "player_blue.tga", eX * mySize_x + eY * 0.3 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); drawstring_aspect(bluepos + eY * 0.3 * mySize_y, ftos(bluealive), eX * mySize_x + eY * 0.2 * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } + drawfont = hud_font; } // CTF HUD modicon section @@ -4384,7 +4386,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 && !autocvar__hud_configure) + if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && !autocvar__hud_configure) return; active_panel = HUD_PANEL_MODICONS; diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index db802cd46..b4b92ff8b 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -310,8 +310,7 @@ const float STAT_SHOTORG = 46; // compressShotOrigin const float STAT_LEADLIMIT = 47; const float STAT_BULLETS_LOADED = 48; const float STAT_NEX_CHARGE = 49; -const float STAT_REDALIVE = 50; -const float STAT_BLUEALIVE = 51; +const float STAT_HUD = 50; // see DP source, quakedef.h const float STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW = 222; @@ -322,7 +321,6 @@ const float CTF_STATE_ATTACK = 1; const float CTF_STATE_DEFEND = 2; const float CTF_STATE_COMMANDER = 3; -const float STAT_HUD = 50; const float HUD_NORMAL = 0; const float HUD_SPIDERBOT = 10; const float HUD_WAKIZASHI = 11; @@ -339,6 +337,10 @@ const float STAT_VEHICLESTAT_RELOAD1 = 64; const float STAT_VEHICLESTAT_AMMO2 = 65; const float STAT_VEHICLESTAT_RELOAD2 = 66; +// mod stats (1xx) +const float STAT_REDALIVE = 100; +const float STAT_BLUEALIVE = 101; + //const float STAT_SPIDERBOT_AIM 53 // compressShotOrigin //const float STAT_SPIDERBOT_TARGET 54 // compressShotOrigin -- 2.39.2