zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 15:22:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bug-47011' of https://github.com/kevans91/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2014-12-02 09:06:20 +01:00
commit 689b39ed30
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_shared/shared_sbar.cpp
View file

@ -1123,7 +1123,7 @@ void DBaseStatusBar::DrawCrosshair ()
ST_LoadCrosshair(); ST_LoadCrosshair();
// Don't draw the crosshair if there is none // Don't draw the crosshair if there is none
if (CrosshairImage == NULL || gamestate == GS_TITLELEVEL) if (CrosshairImage == NULL || gamestate == GS_TITLELEVEL || camera->health <= 0)
{ {
return; return;
} }

4
src/r_things.cpp
View file

@ -95,6 +95,7 @@ extern fixed_t globaluclip, globaldclip;
EXTERN_CVAR (Bool, st_scale) EXTERN_CVAR (Bool, st_scale)
EXTERN_CVAR(Bool, r_shadercolormaps) EXTERN_CVAR(Bool, r_shadercolormaps)
EXTERN_CVAR(Int, r_drawfuzz) EXTERN_CVAR(Int, r_drawfuzz)
EXTERN_CVAR(Bool, r_deathcamera);
// //
// Sprite rotation 0 is facing the viewer, // Sprite rotation 0 is facing the viewer,
@ -1410,7 +1411,8 @@ void R_DrawPlayerSprites ()
if (!r_drawplayersprites || if (!r_drawplayersprites ||
!camera->player || !camera->player ||
(players[consoleplayer].cheats & CF_CHASECAM)) (players[consoleplayer].cheats & CF_CHASECAM) ||
(r_deathcamera && camera->health <= 0))
return; return;
if(fixedlightlev < 0 && viewsector->e && viewsector->e->XFloor.lightlist.Size()) { if(fixedlightlev < 0 && viewsector->e && viewsector->e->XFloor.lightlist.Size()) {