Rework the stomach board a little. When the player is not a prey, the stomach board...

diff --git a/data/gfx/hud/sb_digestion.tga b/data/gfx/hud/sb_digestion.tga
new file mode 100644 (file)
index 0000000..69ddf38
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 5f86a862e5866a607cd45253eba629e90fc28da0..21349e65a878989896231da77f82955ea5cfffd1 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -3033,21 +3033,19 @@ void Sbar_Draw (void)
                        vector status_pos;\r
                        string status_text;\r
                        status_text = strcat(ftos(bound(0, stomach_load, 9)), "/", ftos(bound(0, g_balance_vore_swallow_limit, 9)));\r
-                       status_pos = bottomleft - '-43 171 0';\r
+                       status_pos = bottomleft - '-44 171 0';\r
                        status_pos -= '1 0 0' * stringwidth(status_text, FALSE, '22 22 0') * 0.5;\r
                        drawstring(status_pos, status_text, '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\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
+                       if(getstati(STAT_VORE_DIGESTING)) // we are currently digesting\r
+                               drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0 1 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       else if(stomach_load) // we can digest at this time\r
+                               drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0.25 0.25 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       else // we cannot digest at this time\r
+                               drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0.25 0 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 \r
                        // draw the stomach board player list\r
-                       entity pl;\r
+                       entity pl, pred;\r
                        float f;\r
 \r
                        pos = bottomleft;\r
@@ -3072,10 +3070,18 @@ void Sbar_Draw (void)
                                        pos_y += 1.1 * sbar_fontsize_y;\r
                                }\r
 \r
+                               // set the predator's name\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
+                                       if(pl.sv_entnum == getstati(STAT_VORE_EATEN) - 1)\r
+                                               pred = pl;\r
+                               }\r
+                               else\r
+                                       pred = self;\r
                        }\r
+\r
+                       // draw the predator's name\r
+                       Sbar_PrintStomachboardItemPred(bottomleft - '-76 150 0', pred);\r
                }\r
 \r
                if (cvar("viewsize") <= 100) {\r

diff --git a/data/voretournament-credits.txt b/data/voretournament-credits.txt
index 4a35f62f2b0bbe04b6a6c487e6b486fd68fb8df4..9ca36fcb8c747b294a8bd5f70bc98577fc0e23b0 100644 (file)
--- a/data/voretournament-credits.txt
+++ b/data/voretournament-credits.txt
@@ -74,7 +74,7 @@ http://www.furaffinity.net/view/4179878/
 Mircea Kitsune\r
 http://www.furaffinity.net/user/mircea/\r
 \r
-**---------------- Logo: ----------------\r
+**---------------- 2D art: ----------------\r
 \r
 *Wolf\r
 http://www.openclipart.org/detail/6111/wolf-by-johnny_automatic-6111\r
@@ -86,6 +86,11 @@ http://www.openclipart.org/detail/19935/buddy-by-sheikh_tuhin-19935
 sheikh_tuhin\r
 http://www.openclipart.org/user-detail/sheikh_tuhin\r
 \r
+*Biohazard symbol \r
+http://www.openclipart.org/detail/23551/biohazard-symbol-by-gamefreak7744\r
+*GameFreak7744\r
+http://www.openclipart.org/user-detail/GameFreak7744\r
+\r
 **---------------- Coding: ----------------\r
 \r
 *Main Programmer\r
@@ -100,7 +105,6 @@ http://www.opengameart.org/content/food-pack
 pfunked\r
 http://www.opengameart.org/user/68\r
 \r
-\r
 **---------------- Sounds: ----------------\r
 \r
 *Swallowing Gulp\r