okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #254 from WolfWings/patch-1

Browse source 
Redundant #ifndef MISSIONPACK block
This commit is contained in:
Zack Middleton 2017-05-24 13:44:20 -05:00 • committed by GitHub
commit 80c3e503d9
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
code/cgame/cg_newdraw.c
View file

@ -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 ) { static void CG_DrawPlayerAmmoIcon( rectDef_t *rect, qboolean draw2D ) {
centity_t *cent; centity_t *cent;
vec3_t angles; vec3_t angles;