X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fclient%2Fsbar.qc;h=60d5139f29797ecc8d7095c244e96fbe07b5833c;hb=1d1f1251b5e836aa2d3bed03200d24ec4bb926d3;hp=d71abb52d552f6ed397537aa082e108cea29f334;hpb=c90a6276f96611225f238a75f8c921910c747bec;p=voretournament%2Fvoretournament.git diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc index d71abb52..60d5139f 100644 --- a/data/qcsrc/client/sbar.qc +++ b/data/qcsrc/client/sbar.qc @@ -2872,20 +2872,20 @@ void Sbar_Draw (void) fade = 3.2 - 2 * (time - weapontime); fade = bound(0.7, fade, 1); - if not(getstati(STAT_STOMACH_EATEN)) // useless if we're inside someone - { - if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) { - if (teamplay) - 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 - else { - // allow for custom HUD colors in non-teamgames - color_x = cvar("sbar_color_bg_r"); - color_y = cvar("sbar_color_bg_g"); - color_z = cvar("sbar_color_bg_b"); - - drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL); - } + if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) { + if (teamplay) + 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 + else { + // allow for custom HUD colors in non-teamgames + color_x = cvar("sbar_color_bg_r"); + color_y = cvar("sbar_color_bg_g"); + color_z = cvar("sbar_color_bg_b"); + + drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL); } + } + //if not(getstati(STAT_STOMACH_EATEN)) // useless if we're inside someone + //{ float stomach_load; stomach_load = getstati(STAT_STOMACH_LOAD); @@ -2900,11 +2900,11 @@ void Sbar_Draw (void) drawstring(bottomleft - '-76 150 0', "stomach empty", '14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); else drawstring(bottomleft - '-76 150 0', "stomach has prey", '14 14 0', '0.75 1 0.75', sbar_alpha_fg, DRAWFLAG_NORMAL); - } + //} // draw the stomach board - if not(getstati(STAT_STOMACH_EATEN)) // useless if we're inside someone - { + //if not(getstati(STAT_STOMACH_EATEN)) // useless if we're inside someone + //{ entity pl; float f; @@ -2924,7 +2924,7 @@ void Sbar_Draw (void) pos_y += 1.25 * sbar_fontsize_y; } } - } + //} if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) { if (teamplay)