From 39e51ea0f4d5ed8b41f8fb4c024fd23ade0d96b2 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Mon, 6 Sep 2010 16:33:06 +0300 Subject: [PATCH] Use a better name for the stats --- data/qcsrc/client/View.qc | 2 +- data/qcsrc/client/sbar.qc | 16 ++++++++-------- data/qcsrc/common/constants.qh | 6 +++--- data/qcsrc/server/g_world.qc | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 203907d8..e9110fb0 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -506,7 +506,7 @@ void CSQC_UpdateView(float w, float h) if(cvar("viewsize") < 120) CSQC_common_hud(); - if not(getstati(STAT_STOMACH_EATEN)) // crosshair is useless if we're in the stomach + if not(getstati(STAT_VORE_EATEN)) // crosshair is useless if we're in the stomach { // crosshair goes VERY LAST if(!scoreboard_active && !ons_showmap && !camera_active) { diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc index 896e1b27..6d75af02 100644 --- a/data/qcsrc/client/sbar.qc +++ b/data/qcsrc/client/sbar.qc @@ -967,7 +967,7 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl) // row highlighting if(field == ST_HIGHLIGHT) { - if(getstati(STAT_STOMACH_EATEN)) + if(getstati(STAT_VORE_EATEN)) drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color2")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL); else drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color1")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL); @@ -2948,7 +2948,7 @@ void Sbar_Draw (void) } } - if(getstati(STAT_STOMACH_EATEN)) + if(getstati(STAT_VORE_EATEN)) { drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color2"))), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL); drawstring(bottomleft - '-80 172 0', "predator:", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); @@ -2960,13 +2960,13 @@ void Sbar_Draw (void) } float stomach_load; - stomach_load = getstati(STAT_STOMACH_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise + stomach_load = getstati(STAT_VORE_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise Sbar_DrawXNum(bottomleft - '-18 170 0', bound(0, stomach_load, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL); drawstring(bottomleft - '-40 170 0', "/", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); Sbar_DrawXNum(bottomleft - '-50 170 0', bound(0, g_balance_vore_swallow_limit, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL); - if(getstati(STAT_STOMACH_DIGESTING)) + if(getstati(STAT_VORE_DIGESTING)) drawstring(bottomleft - '-76 142 0', "stomach digesting", '12 12 0', '1 0.5 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL); else if(stomach_load == g_balance_vore_swallow_limit) drawstring(bottomleft - '-76 142 0', "stomach full", '12 12 0', '0.5 1 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL); @@ -2985,8 +2985,8 @@ void Sbar_Draw (void) if(pl.team == COLOR_SPECTATOR) continue; - if(getstati(STAT_STOMACH_EATEN)) - f = pl.pleater == getstati(STAT_STOMACH_EATEN); + if(getstati(STAT_VORE_EATEN)) + f = pl.pleater == getstati(STAT_VORE_EATEN); else { if(spectatee_status) @@ -3001,8 +3001,8 @@ void Sbar_Draw (void) pos_y += 1.25 * sbar_fontsize_y; } - if(getstati(STAT_STOMACH_EATEN)) - if(pl.sv_entnum == getstati(STAT_STOMACH_EATEN) - 1) + if(getstati(STAT_VORE_EATEN)) + if(pl.sv_entnum == getstati(STAT_VORE_EATEN) - 1) Sbar_PrintStomachboardItemPred(bottomleft - '-76 156 0', pl); } diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh index d07d96b6..a6031ba9 100644 --- a/data/qcsrc/common/constants.qh +++ b/data/qcsrc/common/constants.qh @@ -276,9 +276,9 @@ const float STAT_FUEL = 44; const float STAT_NB_METERSTART = 45; const float STAT_SHOTORG = 46; // compressShotOrigin const float STAT_LEADLIMIT = 47; -const float STAT_STOMACH_LOAD = 48; -const float STAT_STOMACH_DIGESTING = 49; -const float STAT_STOMACH_EATEN = 50; +const float STAT_VORE_LOAD = 48; +const float STAT_VORE_DIGESTING = 49; +const float STAT_VORE_EATEN = 50; const float CTF_STATE_ATTACK = 1; const float CTF_STATE_DEFEND = 2; const float CTF_STATE_COMMANDER = 3; diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index 7fcde6c2..0355a36a 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -654,9 +654,9 @@ void spawnfunc_worldspawn (void) addstat(STAT_DAMAGE_FIRED, AS_INT, stat_fired); addstat(STAT_SHOTORG, AS_INT, stat_shotorg); addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit); - addstat(STAT_STOMACH_LOAD, AS_INT, stat_stomachload); - addstat(STAT_STOMACH_DIGESTING, AS_INT, stat_digesting); - addstat(STAT_STOMACH_EATEN, AS_INT, stat_eaten); + addstat(STAT_VORE_LOAD, AS_INT, stat_stomachload); + addstat(STAT_VORE_DIGESTING, AS_INT, stat_digesting); + addstat(STAT_VORE_EATEN, AS_INT, stat_eaten); next_pingtime = time + 5; InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS); -- 2.39.2