From 589338921e397496c09eacb3da4a8d491ee7ab8b Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 13 Jul 2011 15:37:26 +0300
Subject: [PATCH] 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

---
 data/gfx/hud/sb_digestion.tga   | Bin 0 -> 4140 bytes
 data/qcsrc/client/sbar.qc       |  30 ++++++++++++++++++------------
 data/voretournament-credits.txt |   8 ++++++--
 3 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 data/gfx/hud/sb_digestion.tga

diff --git a/data/gfx/hud/sb_digestion.tga b/data/gfx/hud/sb_digestion.tga
new file mode 100644
index 0000000000000000000000000000000000000000..69ddf3833555463fcd7dbba54906b4cc5d5148c7
GIT binary patch
literal 4140
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
M5O3MXUhhc$1JV_7lK=n!

literal 0
HcmV?d00001

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
-- 
2.39.2