Put our tools back in the shelf once our work is done. Also remove the now useless...
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 4 Sep 2010 11:15:10 +0000 (14:15 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 4 Sep 2010 11:15:10 +0000 (14:15 +0300)
data/qcsrc/client/sbar.qc
data/qcsrc/server/vore.qc

index daa86a564eec547ceec47abef3a751f46f603711..2ef328c0d6c67f98368e40b3d5e98e8cd678e6c4 100644 (file)
@@ -2884,60 +2884,53 @@ void Sbar_Draw (void)
                                drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
                        }\r
                }\r
-               //if not(getstati(STAT_STOMACH_EATEN)) // useless if we're inside someone\r
-               //{\r
-                       float 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 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
-               //}\r
+               float 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 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
 \r
                // draw the stomach board\r
-               //if not(getstati(STAT_STOMACH_EATEN)) // useless if we're inside someone\r
-               //{\r
-                       entity pl;\r
-                       float f;\r
+               entity pl;\r
+               float f;\r
 \r
-                       pos = bottomleft;\r
-                       for(pl = players.sort_next; pl; pl = pl.sort_next)\r
-                       {\r
-                               if(pl.team == COLOR_SPECTATOR)\r
-                                       continue;\r
+               pos = bottomleft;\r
+               for(pl = players.sort_next; pl; pl = pl.sort_next)\r
+               {\r
+                       if(pl.team == COLOR_SPECTATOR)\r
+                               continue;\r
 \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
+                       if(getstati(STAT_STOMACH_EATEN))\r
+                       {\r
+                               f = pl.pleater == getstati(STAT_STOMACH_EATEN);\r
+                       }\r
+                       else\r
+                       {\r
+                               if(spectatee_status)\r
+                                       f = pl.pleater == spectatee_status;\r
                                else\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
+                                       f = pl.pleater == player_localentnum;\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
+                       if(f)\r
+                       {\r
+                               Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
+                               pos_y += 1.25 * sbar_fontsize_y;\r
                        }\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
                if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) {\r
                        if (teamplay)\r
index c8806b9f98f32bb677919ebe139c33c069effa82..bb35b189cef495b052952417ac3ffc6ce76d2012 100644 (file)
@@ -235,22 +235,16 @@ void Vore_Gurglesound()
 void Vore()\r
 {\r
        // if we are free, show our stomach load on the HUD. Otherwise, show the predator's\r
-       string x;\r
        if(self.eater != self && self.eater.classname == "player")\r
        {\r
                self.stat_stomachload = self.eater.stomach_load;\r
                self.stat_eaten = num_for_edict(self.eater);\r
-               x = playername(self.eater);\r
-               //bprint(strcat(ftos(self.stat_eaten), "<<--------------------------\n"));\r
        }\r
        else\r
        {\r
                self.stat_stomachload = self.stomach_load;\r
                self.stat_eaten = 0;\r
-               x = "NONE!";\r
        }\r
-       //bprint(strcat(ftos(self.stat_eaten), "<<--------------------------\n"));\r
-       //bprint(strcat(playername(self), "<<--------------------------\n"));\r
 \r
        // skip the vore system under some circumstances\r
        if(time < game_starttime)\r