From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 13 Jul 2011 12:37:26 +0000 (+0300)
Subject: Rework the stomach board a little. When the player is not a prey, the stomach board... 
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=589338921e397496c09eacb3da4a8d491ee7ab8b;p=voretournament%2Fvoretournament.git

Rework the stomach board a little. When the player is not a prey, the stomach board will show their name instead of showing nothing. The stomach status strings are also gone, and replaced by an icon (biohazard symbol) indicating whether digestion is active, can be triggered, or cannot be done at that time
---

diff --git a/data/gfx/hud/sb_digestion.tga b/data/gfx/hud/sb_digestion.tga
new file mode 100644
index 00000000..69ddf383
Binary files /dev/null and b/data/gfx/hud/sb_digestion.tga differ
diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 5f86a862..21349e65 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -3033,21 +3033,19 @@ void Sbar_Draw (void)
 			vector status_pos;
 			string status_text;
 			status_text = strcat(ftos(bound(0, stomach_load, 9)), "/", ftos(bound(0, g_balance_vore_swallow_limit, 9)));
-			status_pos = bottomleft - '-43 171 0';
+			status_pos = bottomleft - '-44 171 0';
 			status_pos -= '1 0 0' * stringwidth(status_text, FALSE, '22 22 0') * 0.5;
 			drawstring(status_pos, status_text, '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 
-			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);
+			if(getstati(STAT_VORE_DIGESTING)) // we are currently digesting
+				drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0 1 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			else if(stomach_load) // we can digest at this time
+				drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0.25 0.25 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			else // we cannot digest at this time
+				drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0.25 0 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
 
 			// draw the stomach board player list
-			entity pl;
+			entity pl, pred;
 			float f;
 
 			pos = bottomleft;
@@ -3072,10 +3070,18 @@ void Sbar_Draw (void)
 					pos_y += 1.1 * sbar_fontsize_y;
 				}
 
+				// set the predator's name
 				if(getstati(STAT_VORE_EATEN))
-				if(pl.sv_entnum == getstati(STAT_VORE_EATEN) - 1)
-					Sbar_PrintStomachboardItemPred(bottomleft - '-76 156 0', pl);
+				{
+					if(pl.sv_entnum == getstati(STAT_VORE_EATEN) - 1)
+						pred = pl;
+				}
+				else
+					pred = self;
 			}
+
+			// draw the predator's name
+			Sbar_PrintStomachboardItemPred(bottomleft - '-76 150 0', pred);
 		}
 
 		if (cvar("viewsize") <= 100) {
diff --git a/data/voretournament-credits.txt b/data/voretournament-credits.txt
index 4a35f62f..9ca36fcb 100644
--- a/data/voretournament-credits.txt
+++ b/data/voretournament-credits.txt
@@ -74,7 +74,7 @@ http://www.furaffinity.net/view/4179878/
 Mircea Kitsune
 http://www.furaffinity.net/user/mircea/
 
-**---------------- Logo: ----------------
+**---------------- 2D art: ----------------
 
 *Wolf
 http://www.openclipart.org/detail/6111/wolf-by-johnny_automatic-6111
@@ -86,6 +86,11 @@ http://www.openclipart.org/detail/19935/buddy-by-sheikh_tuhin-19935
 sheikh_tuhin
 http://www.openclipart.org/user-detail/sheikh_tuhin
 
+*Biohazard symbol 
+http://www.openclipart.org/detail/23551/biohazard-symbol-by-gamefreak7744
+*GameFreak7744
+http://www.openclipart.org/user-detail/GameFreak7744
+
 **---------------- Coding: ----------------
 
 *Main Programmer
@@ -100,7 +105,6 @@ http://www.opengameart.org/content/food-pack
 pfunked
 http://www.opengameart.org/user/68
 
-
 **---------------- Sounds: ----------------
 
 *Swallowing Gulp