From 116ec5e1696de7a2cfefd76b47a12454cb443e74 Mon Sep 17 00:00:00 2001
From: Bryce Hutchings <niceass@rq3.com>
Date: Tue, 27 Aug 2002 05:10:42 +0000
Subject: [PATCH] new ctb marker shader names

---
 reaction/cgame/cg_ents.c  | 7 +++++--
 reaction/cgame/cg_local.h | 7 +++++--
 reaction/cgame/cg_main.c  | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/reaction/cgame/cg_ents.c b/reaction/cgame/cg_ents.c
index f6f8ed12..44f1a7da 100644
--- a/reaction/cgame/cg_ents.c
+++ b/reaction/cgame/cg_ents.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.31  2002/08/27 05:10:42  niceass
+// new ctb marker shader names
+//
 // Revision 1.30  2002/07/19 04:33:52  niceass
 // laser fog fix and ctb markers
 //
@@ -980,10 +983,10 @@ static void CG_DrawDecal(centity_t * cent)
 		CG_Trace(&trace, cent->lerpOrigin, NULL, NULL, end, 0, CONTENTS_SOLID | CONTENTS_PLAYERCLIP);
 
 		if (cent->currentState.modelindex == TEAM_RED)
-			CG_ImpactMark(cgs.media.ctbXMark1, trace.endpos, trace.plane.normal, 45.0f,
+			CG_ImpactMark(cgs.media.ctbXMarkSilver, trace.endpos, trace.plane.normal, 45.0f,
 				      1, 1, 1, 1, qfalse, radius, qtrue);
 		else
-			CG_ImpactMark(cgs.media.ctbXMark2, trace.endpos, trace.plane.normal, 45.0f,
+			CG_ImpactMark(cgs.media.ctbOMarkBlack, trace.endpos, trace.plane.normal, 45.0f,
 				      1, 1, 1, 1, qfalse, radius, qtrue);
 	}
 }
diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h
index e8125128..ea7a2b9c 100644
--- a/reaction/cgame/cg_local.h
+++ b/reaction/cgame/cg_local.h
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.120  2002/08/27 05:10:42  niceass
+// new ctb marker shader names
+//
 // Revision 1.119  2002/08/25 07:08:41  niceass
 // added "life" setting to func_pressure
 //
@@ -1169,8 +1172,8 @@ typedef struct {
 	// wall mark shaders
 	qhandle_t wakeMarkShader;
 	qhandle_t bloodMarkShader;
-	qhandle_t ctbXMark1;
-	qhandle_t ctbXMark2;
+	qhandle_t ctbXMarkSilver;
+	qhandle_t ctbOMarkBlack;
 	qhandle_t bulletMarkShader;
 	qhandle_t burnMarkShader;
 	qhandle_t holeMarkShader;
diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c
index 7f23a19c..970280eb 100644
--- a/reaction/cgame/cg_main.c
+++ b/reaction/cgame/cg_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.104  2002/08/27 05:10:05  niceass
+// new ctb marker shader names
+//
 // Revision 1.103  2002/08/25 00:45:24  niceass
 // q3f atmosphere
 //
@@ -1867,8 +1870,8 @@ static void CG_RegisterGraphics(void)
 	cgs.media.shadowMarkShader = trap_R_RegisterShader("markShadow");
 	cgs.media.wakeMarkShader = trap_R_RegisterShader("wake");
 	cgs.media.bloodMarkShader = trap_R_RegisterShader("bloodMark");
-	cgs.media.ctbXMark1 = trap_R_RegisterShader("ctbXMark1");
-	cgs.media.ctbXMark2 = trap_R_RegisterShader("ctbXMark2");
+	cgs.media.ctbXMarkSilver = trap_R_RegisterShader("ctbXMarkSilver");
+	cgs.media.ctbOMarkBlack = trap_R_RegisterShader("ctbOMarkBlack");
 	//Blaze: added for explosive boxes and grenades
 	cgs.media.grenadeExplosionShader = trap_R_RegisterShader("grenadeExplosion");
 	// Elder: added