Merge pull request #254 from WolfWings/patch-1

Redundant #ifndef MISSIONPACK block
ioquake · May 24, 2017 · 80c3e50 · 80c3e50
2 parents 2c225a5 + 0c3879f
commit 80c3e50
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/code/cgame/cg_newdraw.c b/code/cgame/cg_newdraw.c
@@ -199,15 +199,6 @@ static void CG_DrawPlayerArmorValue(rectDef_t *rect, float scale, vec4_t color,
 	}
 }
 
-#ifndef MISSIONPACK
-static float healthColors[4][4] = { 
-//		{ 0.2, 1.0, 0.2, 1.0 } , { 1.0, 0.2, 0.2, 1.0 }, {0.5, 0.5, 0.5, 1} };
-  { 1.0f, 0.69f, 0.0f, 1.0f } ,		// normal
-  { 1.0f, 0.2f, 0.2f, 1.0f },		// low health
-  { 0.5f, 0.5f, 0.5f, 1.0f},		// weapon firing
-  { 1.0f, 1.0f, 1.0f, 1.0f } };		// health > 100
-#endif
-
 static void CG_DrawPlayerAmmoIcon( rectDef_t *rect, qboolean draw2D ) {
 	centity_t	*cent;
 	vec3_t		angles;