From dd30b09526902493259ae4b20ce0d40993a0160a Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Tue, 8 Feb 2011 18:38:29 +0000 Subject: [PATCH] By ZTurtleMan: Cleanup; only load harvester data in harvester gametype, removed unused var, and ifdef a missionpack only var. --- code/cgame/cg_local.h | 7 ++++--- code/cgame/cg_main.c | 6 +----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h index 2aa6ba8e..ea331bff 100644 --- a/code/cgame/cg_local.h +++ b/code/cgame/cg_local.h @@ -550,8 +550,10 @@ typedef struct { int spectatorOffset; // current offset from start int spectatorPaintLen; // current offset from start +#ifdef MISSIONPACK // skull trails skulltrail_t skulltrails[MAX_CLIENTS]; +#endif // centerprinting int centerPrintTime; @@ -563,9 +565,6 @@ typedef struct { // low ammo warning state int lowAmmoWarning; // 1 = low, 2 = empty - // kill timers for carnage reward - int lastKillTime; - // crosshair client ID int crosshairClientNum; int crosshairClientTime; @@ -656,10 +655,12 @@ typedef struct { qhandle_t charsetPropB; qhandle_t whiteShader; +#ifdef MISSIONPACK qhandle_t redCubeModel; qhandle_t blueCubeModel; qhandle_t redCubeIcon; qhandle_t blueCubeIcon; +#endif qhandle_t redFlagModel; qhandle_t blueFlagModel; qhandle_t neutralFlagModel; diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c index 1eccfb7b..bcee18de 100644 --- a/code/cgame/cg_main.c +++ b/code/cgame/cg_main.c @@ -878,17 +878,13 @@ static void CG_RegisterGraphics( void ) { cgs.media.hastePuffShader = trap_R_RegisterShader("hasteSmokePuff" ); #ifdef MISSIONPACK - if ( cgs.gametype == GT_CTF || cgs.gametype == GT_1FCTF || cgs.gametype == GT_HARVESTER || cg_buildScript.integer ) { -#else - if ( cgs.gametype == GT_CTF || cg_buildScript.integer ) { -#endif + if ( cgs.gametype == GT_HARVESTER || cg_buildScript.integer ) { cgs.media.redCubeModel = trap_R_RegisterModel( "models/powerups/orb/r_orb.md3" ); cgs.media.blueCubeModel = trap_R_RegisterModel( "models/powerups/orb/b_orb.md3" ); cgs.media.redCubeIcon = trap_R_RegisterShader( "icons/skull_red" ); cgs.media.blueCubeIcon = trap_R_RegisterShader( "icons/skull_blue" ); } -#ifdef MISSIONPACK if ( cgs.gametype == GT_CTF || cgs.gametype == GT_1FCTF || cgs.gametype == GT_HARVESTER || cg_buildScript.integer ) { #else if ( cgs.gametype == GT_CTF || cg_buildScript.integer ) {