Add a cvar that allows disabling the vore system. Yes, it's the core part Vore Tourna...

[voretournament/voretournament.git] / data / qcsrc / client / sbar.qc

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index b09e2bf6acdd336b8e30888622876f3a16bd8076..9db2566f77d5ac6a276400a6eea580a685358f35 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2943,76 +2943,79 @@ void Sbar_Draw (void)
                fade = 3.2 - 2 * (time - weapontime);\r
                fade = bound(0.7, fade, 1);\r
 \r
                fade = 3.2 - 2 * (time - weapontime);\r
                fade = bound(0.7, fade, 1);\r
 \r

-               // draw the stomach board\r
-               if (cvar("viewsize") <= 100) {\r
-                       if (teamplay)\r
-                               drawpic(bottomleft- '0 256 0', "gfx/hud/bg_stomach", '256 256 0', GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color\r
-                       else {\r
-                               // allow for custom HUD colors in non-teamgames\r
-                               color_x = cvar("sbar_color_bg_r");\r
-                               color_y = cvar("sbar_color_bg_g");\r
-                               color_z = cvar("sbar_color_bg_b");\r
-\r
-                               drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
-                       }\r
-               }\r
-\r
-               if(getstati(STAT_VORE_EATEN))\r
+               if(g_vore) // only when the vore system is enabled\r

                {\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
-               else\r
-               {\r
-                       drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color1"))), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
-                       drawstring(bottomleft - '-80 172 0', "self:", '10 10 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
-               }\r
+                       // draw the stomach board\r
+                       if (cvar("viewsize") <= 100) {\r
+                               if (teamplay)\r
+                                       drawpic(bottomleft- '0 256 0', "gfx/hud/bg_stomach", '256 256 0', GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color\r
+                               else {\r
+                                       // allow for custom HUD colors in non-teamgames\r
+                                       color_x = cvar("sbar_color_bg_r");\r
+                                       color_y = cvar("sbar_color_bg_g");\r
+                                       color_z = cvar("sbar_color_bg_b");\r
+\r
+                                       drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
+                               }\r
+                       }\r

 \r
 \r

-               float stomach_load;\r
-               stomach_load = getstati(STAT_VORE_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise\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
+                       else\r
+                       {\r
+                               drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color1"))), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                               drawstring(bottomleft - '-80 172 0', "self:", '10 10 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       }\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
+                       float stomach_load;\r
+                       stomach_load = getstati(STAT_VORE_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise\r

 \r
 \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
-               else if(!stomach_load)\r
-                       drawstring(bottomleft - '-76 142 0', "stomach empty", '12 12 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
-               else\r
-                       drawstring(bottomleft - '-76 142 0', "stomach has prey", '12 12 0', '0.75 1 0.75', sbar_alpha_fg, DRAWFLAG_NORMAL);\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

-               // draw the stomach board player list\r
-               entity pl;\r
-               float f;\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
+                       else if(!stomach_load)\r
+                               drawstring(bottomleft - '-76 142 0', "stomach empty", '12 12 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       else\r
+                               drawstring(bottomleft - '-76 142 0', "stomach has prey", '12 12 0', '0.75 1 0.75', sbar_alpha_fg, DRAWFLAG_NORMAL);\r

 \r
 \r

-               pos = bottomleft;\r
-               for(pl = players.sort_next; pl; pl = pl.sort_next)\r
-               {\r
-                       if(pl.team == COLOR_SPECTATOR)\r
-                               continue;\r
+                       // draw the stomach board player list\r
+                       entity pl;\r
+                       float f;\r

 \r
 \r

-                       if(getstati(STAT_VORE_EATEN))\r
-                               f = pl.plpredator == getstati(STAT_VORE_EATEN);\r
-                       else\r
+                       pos = bottomleft;\r
+                       for(pl = players.sort_next; pl; pl = pl.sort_next)\r

                        {\r
                        {\r

-                               if(spectatee_status)\r
-                                       f = pl.plpredator == spectatee_status;\r
+                               if(pl.team == COLOR_SPECTATOR)\r
+                                       continue;\r
+\r
+                               if(getstati(STAT_VORE_EATEN))\r
+                                       f = pl.plpredator == getstati(STAT_VORE_EATEN);\r

                                else\r
                                else\r

-                                       f = pl.plpredator == player_localentnum;\r
-                       }\r
+                               {\r
+                                       if(spectatee_status)\r
+                                               f = pl.plpredator == spectatee_status;\r
+                                       else\r
+                                               f = pl.plpredator == player_localentnum;\r
+                               }\r

 \r
 \r

-                       if(f)\r
-                       {\r
-                               Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
-                               pos_y += 1.25 * sbar_fontsize_y;\r
-                       }\r
+                               if(f)\r
+                               {\r
+                                       Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
+                                       pos_y += 1.25 * sbar_fontsize_y;\r
+                               }\r

 \r
 \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
+                               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
 \r
                if (cvar("viewsize") <= 100) {\r
                }\r
 \r
                if (cvar("viewsize") <= 100) {\r