if(str == strtolower(scores_label[j]))\r
goto found; // sorry, but otherwise fteqcc -O3 miscompiles this and warns about "unreachable code"\r
:notfound\r
- if(str == "frags" && !gametype == GAME_RPG)\r
+ if(str == "frags" && !(gametype == GAME_RPG))\r
{\r
j = SP_FRAGS;\r
}\r
fade = 3.2 - 2 * (time - weapontime);\r
fade = bound(0.7, fade, 1);\r
\r
- if not(getstati(STAT_STOMACH_EATEN)) // useless if we're inside someone\r
- {\r
- if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) {\r
- if (teamplay)\r
- drawpic(bottomleft- '0 256 0', "gfx/hud/bg_stomach", '256 256 0', GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color\r
- else {\r
- // allow for custom HUD colors in non-teamgames\r
- color_x = cvar("sbar_color_bg_r");\r
- color_y = cvar("sbar_color_bg_g");\r
- color_z = cvar("sbar_color_bg_b");\r
-\r
- drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
- }\r
+ if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) {\r
+ if (teamplay)\r
+ drawpic(bottomleft- '0 256 0', "gfx/hud/bg_stomach", '256 256 0', GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color\r
+ else {\r
+ // allow for custom HUD colors in non-teamgames\r
+ color_x = cvar("sbar_color_bg_r");\r
+ color_y = cvar("sbar_color_bg_g");\r
+ color_z = cvar("sbar_color_bg_b");\r
+\r
+ 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);\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
drawstring(bottomleft - '-76 150 0', "stomach empty", '14 14 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
- }\r
+ //}\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
+\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(spectatee_status)\r
+ // f = pl.pleater == spectatee_status;\r
+\r
+ if(getstati(STAT_STOMACH_EATEN))\r
+ f = pl.pleater == getstati(STAT_STOMACH_EATEN);\r
+ else\r
+ f = pl.pleater == player_localentnum;\r
+\r
+ if(f)\r
+ {\r
+ Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
+ pos_y += 1.25 * sbar_fontsize_y;\r
+ }\r
+ }\r
+ //}\r
\r
if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) {\r
if (teamplay)\r
Sbar_DrawXNum(pos - '144 16 0', a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\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
-\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(spectatee_status)\r
- f = pl.pleater == spectatee_status;\r
- else\r
- f = pl.pleater == player_localentnum;\r
- if(f)\r
- {\r
- Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
- pos_y += 1.25 * sbar_fontsize_y;\r
- }\r
- }\r
- }\r
-\r
// draw scores and timer\r
Sbar_Score();\r
Sbar_Timer();\r