Use a better name for the stats

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 203907d88e7d68b0df231b71ec7d83e9855fece6..e9110fb09e3c1dd32d2ed328e9e3c3f5cdc810e1 100644 (file)
--- 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)\r
                        CSQC_common_hud();\r
 \r
                if(cvar("viewsize") < 120)\r
                        CSQC_common_hud();\r
 \r

-       if not(getstati(STAT_STOMACH_EATEN)) // crosshair is useless if we're in the stomach\r
+       if not(getstati(STAT_VORE_EATEN)) // crosshair is useless if we're in the stomach\r

        {\r
                // crosshair goes VERY LAST\r
                if(!scoreboard_active && !ons_showmap && !camera_active) {\r
        {\r
                // crosshair goes VERY LAST\r
                if(!scoreboard_active && !ons_showmap && !camera_active) {\r

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 896e1b27265d68f93e9b7ce5622c6f24a56a261a..6d75af022bc56318995ce874cef0a1038c013162 100644 (file)
--- 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\r
                if(field == ST_HIGHLIGHT)\r
                {\r
                // row highlighting\r
                if(field == ST_HIGHLIGHT)\r
                {\r

-                       if(getstati(STAT_STOMACH_EATEN))\r
+                       if(getstati(STAT_VORE_EATEN))\r

                                drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color2")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        else\r
                                drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color1")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color2")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        else\r
                                drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color1")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r


@@ -2948,7 +2948,7 @@ void Sbar_Draw (void)
                        }\r
                }\r
 \r
                        }\r
                }\r
 \r

-               if(getstati(STAT_STOMACH_EATEN))\r
+               if(getstati(STAT_VORE_EATEN))\r

                {\r
                        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);\r
                        drawstring(bottomleft - '-80 172 0', "predator:", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                {\r
                        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);\r
                        drawstring(bottomleft - '-80 172 0', "predator:", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r


@@ -2960,13 +2960,13 @@ void Sbar_Draw (void)
                }\r
 \r
                float stomach_load;\r
                }\r
 \r
                float stomach_load;\r

-               stomach_load = getstati(STAT_STOMACH_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise\r
+               stomach_load = getstati(STAT_VORE_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise\r

 \r
                Sbar_DrawXNum(bottomleft - '-18 170 0', bound(0, stomach_load, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                drawstring(bottomleft - '-40 170 0', "/", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                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);\r
 \r
 \r
                Sbar_DrawXNum(bottomleft - '-18 170 0', bound(0, stomach_load, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                drawstring(bottomleft - '-40 170 0', "/", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                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);\r
 \r

-               if(getstati(STAT_STOMACH_DIGESTING))\r
+               if(getstati(STAT_VORE_DIGESTING))\r

                        drawstring(bottomleft - '-76 142 0', "stomach digesting", '12 12 0', '1 0.5 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                else if(stomach_load == g_balance_vore_swallow_limit)\r
                        drawstring(bottomleft - '-76 142 0', "stomach full", '12 12 0', '0.5 1 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        drawstring(bottomleft - '-76 142 0', "stomach digesting", '12 12 0', '1 0.5 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                else if(stomach_load == g_balance_vore_swallow_limit)\r
                        drawstring(bottomleft - '-76 142 0', "stomach full", '12 12 0', '0.5 1 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL);\r


@@ -2985,8 +2985,8 @@ void Sbar_Draw (void)
                        if(pl.team == COLOR_SPECTATOR)\r
                                continue;\r
 \r
                        if(pl.team == COLOR_SPECTATOR)\r
                                continue;\r
 \r

-                       if(getstati(STAT_STOMACH_EATEN))\r
-                               f = pl.pleater == getstati(STAT_STOMACH_EATEN);\r
+                       if(getstati(STAT_VORE_EATEN))\r
+                               f = pl.pleater == getstati(STAT_VORE_EATEN);\r

                        else\r
                        {\r
                                if(spectatee_status)\r
                        else\r
                        {\r
                                if(spectatee_status)\r


@@ -3001,8 +3001,8 @@ void Sbar_Draw (void)
                                pos_y += 1.25 * sbar_fontsize_y;\r
                        }\r
 \r
                                pos_y += 1.25 * sbar_fontsize_y;\r
                        }\r
 \r

-                       if(getstati(STAT_STOMACH_EATEN))\r
-                       if(pl.sv_entnum == getstati(STAT_STOMACH_EATEN) - 1)\r
+                       if(getstati(STAT_VORE_EATEN))\r
+                       if(pl.sv_entnum == getstati(STAT_VORE_EATEN) - 1)\r

                                Sbar_PrintStomachboardItemPred(bottomleft - '-76 156 0', pl);\r
                }\r
 \r
                                Sbar_PrintStomachboardItemPred(bottomleft - '-76 156 0', pl);\r
                }\r
 \r

diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh
index d07d96b63b628d1f4c5601f9a6d73736452e7fb0..a6031ba92c8115e7aa53304db9d9438b53dbc028 100644 (file)
--- 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;\r
 const float STAT_SHOTORG = 46; // compressShotOrigin\r
 const float STAT_LEADLIMIT = 47;\r
 const float STAT_NB_METERSTART = 45;\r
 const float STAT_SHOTORG = 46; // compressShotOrigin\r
 const float STAT_LEADLIMIT = 47;\r

-const float STAT_STOMACH_LOAD = 48;\r
-const float STAT_STOMACH_DIGESTING = 49;\r
-const float STAT_STOMACH_EATEN = 50;\r
+const float STAT_VORE_LOAD = 48;\r
+const float STAT_VORE_DIGESTING = 49;\r
+const float STAT_VORE_EATEN = 50;\r

 const float CTF_STATE_ATTACK = 1;\r
 const float CTF_STATE_DEFEND = 2;\r
 const float CTF_STATE_COMMANDER = 3;\r
 const float CTF_STATE_ATTACK = 1;\r
 const float CTF_STATE_DEFEND = 2;\r
 const float CTF_STATE_COMMANDER = 3;\r

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 7fcde6c22ce1f53dd7655ab786ba8f57dcf97d74..0355a36a7953f898de7d4a8dc96a058ee247dee7 100644 (file)
--- 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);\r
        addstat(STAT_SHOTORG, AS_INT, stat_shotorg);\r
        addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);\r
        addstat(STAT_DAMAGE_FIRED, AS_INT, stat_fired);\r
        addstat(STAT_SHOTORG, AS_INT, stat_shotorg);\r
        addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);\r

-       addstat(STAT_STOMACH_LOAD, AS_INT, stat_stomachload);\r
-       addstat(STAT_STOMACH_DIGESTING, AS_INT, stat_digesting);\r
-       addstat(STAT_STOMACH_EATEN, AS_INT, stat_eaten);\r
+       addstat(STAT_VORE_LOAD, AS_INT, stat_stomachload);\r
+       addstat(STAT_VORE_DIGESTING, AS_INT, stat_digesting);\r
+       addstat(STAT_VORE_EATEN, AS_INT, stat_eaten);\r

 \r
        next_pingtime = time + 5;\r
        InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);\r
 \r
        next_pingtime = time + 5;\r
        InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);\r