X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fclient%2Fsbar.qc;h=9db2566f77d5ac6a276400a6eea580a685358f35;hp=b09e2bf6acdd336b8e30888622876f3a16bd8076;hb=cf3ba5b1d3e30d29e0b8ac5c16957b42689a8a3a;hpb=cff6c248e87a1a698e2b1c93d6376aedef8f2587

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index b09e2bf6..9db2566f 100644
--- 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);
 		fade = bound(0.7, fade, 1);
 
-		// draw the stomach board
-		if (cvar("viewsize") <= 100) {
-			if (teamplay)
-				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
-			else {
-				// allow for custom HUD colors in non-teamgames
-				color_x = cvar("sbar_color_bg_r");
-				color_y = cvar("sbar_color_bg_g");
-				color_z = cvar("sbar_color_bg_b");
-
-				drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);
-			}
-		}
-
-		if(getstati(STAT_VORE_EATEN))
+		if(g_vore) // only when the vore system is enabled
 		{
-			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);
-		}
-		else
-		{
-			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);
-			drawstring(bottomleft - '-80 172 0', "self:", '10 10 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-		}
+			// draw the stomach board
+			if (cvar("viewsize") <= 100) {
+				if (teamplay)
+					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
+				else {
+					// allow for custom HUD colors in non-teamgames
+					color_x = cvar("sbar_color_bg_r");
+					color_y = cvar("sbar_color_bg_g");
+					color_z = cvar("sbar_color_bg_b");
+
+					drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);
+				}
+			}
 
-		float stomach_load;
-		stomach_load = getstati(STAT_VORE_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise
+			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);
+			}
+			else
+			{
+				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);
+				drawstring(bottomleft - '-80 172 0', "self:", '10 10 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			}
 
-		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);
+			float stomach_load;
+			stomach_load = getstati(STAT_VORE_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise
 
-		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);
-		else if(!stomach_load)
-			drawstring(bottomleft - '-76 142 0', "stomach empty", '12 12 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-		else
-			drawstring(bottomleft - '-76 142 0', "stomach has prey", '12 12 0', '0.75 1 0.75', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			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);
 
-		// draw the stomach board player list
-		entity pl;
-		float f;
+			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);
+			else if(!stomach_load)
+				drawstring(bottomleft - '-76 142 0', "stomach empty", '12 12 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			else
+				drawstring(bottomleft - '-76 142 0', "stomach has prey", '12 12 0', '0.75 1 0.75', sbar_alpha_fg, DRAWFLAG_NORMAL);
 
-		pos = bottomleft;
-		for(pl = players.sort_next; pl; pl = pl.sort_next)
-		{
-			if(pl.team == COLOR_SPECTATOR)
-				continue;
+			// draw the stomach board player list
+			entity pl;
+			float f;
 
-			if(getstati(STAT_VORE_EATEN))
-				f = pl.plpredator == getstati(STAT_VORE_EATEN);
-			else
+			pos = bottomleft;
+			for(pl = players.sort_next; pl; pl = pl.sort_next)
 			{
-				if(spectatee_status)
-					f = pl.plpredator == spectatee_status;
+				if(pl.team == COLOR_SPECTATOR)
+					continue;
+
+				if(getstati(STAT_VORE_EATEN))
+					f = pl.plpredator == getstati(STAT_VORE_EATEN);
 				else
-					f = pl.plpredator == player_localentnum;
-			}
+				{
+					if(spectatee_status)
+						f = pl.plpredator == spectatee_status;
+					else
+						f = pl.plpredator == player_localentnum;
+				}
 
-			if(f)
-			{
-				Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);
-				pos_y += 1.25 * sbar_fontsize_y;
-			}
+				if(f)
+				{
+					Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);
+					pos_y += 1.25 * sbar_fontsize_y;
+				}
 
-			if(getstati(STAT_VORE_EATEN))
-			if(pl.sv_entnum == getstati(STAT_VORE_EATEN) - 1)
-				Sbar_PrintStomachboardItemPred(bottomleft - '-76 156 0', pl);
+				if(getstati(STAT_VORE_EATEN))
+				if(pl.sv_entnum == getstati(STAT_VORE_EATEN) - 1)
+					Sbar_PrintStomachboardItemPred(bottomleft - '-76 156 0', pl);
+			}
 		}
 
 		if (cvar("viewsize") <= 100) {