[iortcw] 320/497: All: Fix crosshair drawing not clearing color

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit ecd1b545be80c475e35b87b5e26dd434267d8e05
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Tue Mar 24 06:39:37 2015 -0400

    All: Fix crosshair drawing not clearing color
---
 MP/code/cgame/cg_draw.c | 2 ++
 SP/code/cgame/cg_draw.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/MP/code/cgame/cg_draw.c b/MP/code/cgame/cg_draw.c
index 9630850..215feec 100644
--- a/MP/code/cgame/cg_draw.c
+++ b/MP/code/cgame/cg_draw.c
@@ -1709,6 +1709,8 @@ static void CG_DrawCrosshair( void ) {
 		}
 	}
 	// -NERVE - SMF
+
+	trap_R_SetColor( NULL );
 }
 
 
diff --git a/SP/code/cgame/cg_draw.c b/SP/code/cgame/cg_draw.c
index 5248205..aa835f1 100644
--- a/SP/code/cgame/cg_draw.c
+++ b/SP/code/cgame/cg_draw.c
@@ -2318,6 +2318,8 @@ static void CG_DrawCrosshair( void ) {
 	trap_R_DrawStretchPic(  x + cg.refdef.x + 0.5 * ( cg.refdef.width - w ),
 							y + cg.refdef.y + 0.5 * ( cg.refdef.height - h ),
 							w, h, 0, 0, 1, 1, hShader );
+
+	trap_R_SetColor( NULL );
 }
 
 /*

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