From 7359631a43274e3c8850b0a53a9a237aaa970b9c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 21 Sep 2014 11:08:38 +0200 Subject: [PATCH] - fixed weapon drawing rules to account for the death camera. --- src/gl/scene/gl_weapon.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gl/scene/gl_weapon.cpp b/src/gl/scene/gl_weapon.cpp index d64c0a39a7..96b4d91373 100644 --- a/src/gl/scene/gl_weapon.cpp +++ b/src/gl/scene/gl_weapon.cpp @@ -62,6 +62,7 @@ EXTERN_CVAR (Bool, r_drawplayersprites) EXTERN_CVAR(Float, transsouls) EXTERN_CVAR (Bool, st_scale) EXTERN_CVAR(Int, gl_fuzztype) +EXTERN_CVAR (Bool, r_deathcamera) //========================================================================== @@ -191,7 +192,8 @@ void FGLRenderer::DrawPlayerSprites(sector_t * viewsector, bool hudModelStep) if (!player || !r_drawplayersprites || !camera->player || - (players[consoleplayer].cheats & CF_CHASECAM)) + (player->cheats & CF_CHASECAM) || + (r_deathcamera && camera->health <= 0)) return; P_BobWeapon (player, &player->psprites[ps_weapon], &ofsx, &ofsy);