[iortcw] 51/152: All: Don't show blood flash when cg_showblood/com_blood is 0

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.5a
in repository iortcw.

commit 2ab725ad6d135381b72d2373e4a9862848103098
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sat May 7 18:12:44 2016 -0400

    All: Don't show blood flash when cg_showblood/com_blood is 0
---
 MP/code/cgame/cg_draw.c | 4 ++++
 SP/code/cgame/cg_draw.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/MP/code/cgame/cg_draw.c b/MP/code/cgame/cg_draw.c
index 15c9768..8af29e4 100644
--- a/MP/code/cgame/cg_draw.c
+++ b/MP/code/cgame/cg_draw.c
@@ -2927,6 +2927,10 @@ static void CG_DrawFlashDamage( void ) {
 		return;
 	}
 
+	if (!cg_blood.integer) {
+		return;
+	}
+
 	if ( cg.v_dmg_time > cg.time ) {
 		redFlash = fabs( cg.v_dmg_pitch * ( ( cg.v_dmg_time - cg.time ) / DAMAGE_TIME ) );
 
diff --git a/SP/code/cgame/cg_draw.c b/SP/code/cgame/cg_draw.c
index f06940d..65b1ce1 100644
--- a/SP/code/cgame/cg_draw.c
+++ b/SP/code/cgame/cg_draw.c
@@ -3361,6 +3361,10 @@ static void CG_DrawFlashDamage( void ) {
 		return;
 	}
 
+	if (!cg_blood.integer) {
+		return;
+	}
+
 	if ( cg.v_dmg_time > cg.time ) {
 		redFlash = fabs( cg.v_dmg_pitch * ( ( cg.v_dmg_time - cg.time ) / DAMAGE_TIME ) );
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git