Show the predator's name on the stomach board.

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

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 60d5139f29797ecc8d7095c244e96fbe07b5833c..daa86a564eec547ceec47abef3a751f46f603711 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2887,19 +2887,19 @@ void Sbar_Draw (void)
                //if not(getstati(STAT_STOMACH_EATEN)) // useless if we're inside someone\r
                //{\r
                        float stomach_load;\r
-                       stomach_load = getstati(STAT_STOMACH_LOAD);\r
+                       stomach_load = getstati(STAT_STOMACH_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise\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
                        if(getstati(STAT_STOMACH_DIGESTING))\r
-                               drawstring(bottomleft - '-76 150 0', "stomach digesting", '14 14 0', '1 0.5 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL);\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 150 0', "stomach full", '14 14 0', '0.5 1 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL);\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 150 0', "stomach empty", '14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\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 150 0', "stomach has prey", '14 14 0', '0.75 1 0.75', sbar_alpha_fg, DRAWFLAG_NORMAL);\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
                // draw the stomach board\r
@@ -2914,15 +2914,28 @@ void Sbar_Draw (void)
                                if(pl.team == COLOR_SPECTATOR)\r
                                        continue;\r
 \r
-                               if(spectatee_status)\r
-                                       f = pl.pleater == spectatee_status;\r
+                               if(getstati(STAT_STOMACH_EATEN))\r
+                               {\r
+                                       f = pl.pleater == getstati(STAT_STOMACH_EATEN);\r
+                                       dprint(strcat(ftos(getstati(STAT_STOMACH_EATEN)), "<<++++++++++++++++++++++\n"));\r
+                               }\r
                                else\r
-                                       f = pl.pleater == player_localentnum;\r
+                               {\r
+                                       if(spectatee_status)\r
+                                               f = pl.pleater == spectatee_status;\r
+                                       else\r
+                                               f = pl.pleater == player_localentnum;\r
+                               }\r
+\r
                                if(f)\r
                                {\r
                                        Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
                                        pos_y += 1.25 * sbar_fontsize_y;\r
                                }\r
+\r
+                               if(getstati(STAT_STOMACH_EATEN))\r
+                               if(pl.sv_entnum == getstati(STAT_STOMACH_EATEN) - 1)\r
+                                       Sbar_PrintStomachboardItem(pos - '-76 156 0', pl);\r
                        }\r
                //}\r
 \r