ubergames
/
lilium-voyager
mirror of https://github.com/UberGames/lilium-voyager.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

By ZTurtleMan: Cleanup; only load harvester data in harvester gametype, removed unused var, and ifdef a missionpack only var.

This commit is contained in:
Thilo Schulz 2011-02-08 18:38:29 +00:00
parent 2b52867b74
commit dd30b09526
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/cgame/cg_local.h
View File

@ -550,8 +550,10 @@ typedef struct {
int spectatorOffset; // current offset from start int spectatorOffset; // current offset from start
int spectatorPaintLen; // current offset from start int spectatorPaintLen; // current offset from start
#ifdef MISSIONPACK
// skull trails // skull trails
skulltrail_t skulltrails[MAX_CLIENTS]; skulltrail_t skulltrails[MAX_CLIENTS];
#endif
// centerprinting // centerprinting
int centerPrintTime; int centerPrintTime;
@ -563,9 +565,6 @@ typedef struct {
// low ammo warning state // low ammo warning state
int lowAmmoWarning; // 1 = low, 2 = empty int lowAmmoWarning; // 1 = low, 2 = empty
// kill timers for carnage reward
int lastKillTime;
// crosshair client ID // crosshair client ID
int crosshairClientNum; int crosshairClientNum;
int crosshairClientTime; int crosshairClientTime;
@ -656,10 +655,12 @@ typedef struct {
qhandle_t charsetPropB; qhandle_t charsetPropB;
qhandle_t whiteShader; qhandle_t whiteShader;
#ifdef MISSIONPACK
qhandle_t redCubeModel; qhandle_t redCubeModel;
qhandle_t blueCubeModel; qhandle_t blueCubeModel;
qhandle_t redCubeIcon; qhandle_t redCubeIcon;
qhandle_t blueCubeIcon; qhandle_t blueCubeIcon;
#endif
qhandle_t redFlagModel; qhandle_t redFlagModel;
qhandle_t blueFlagModel; qhandle_t blueFlagModel;
qhandle_t neutralFlagModel; qhandle_t neutralFlagModel;

6
code/cgame/cg_main.c
View File

@ -878,17 +878,13 @@ static void CG_RegisterGraphics( void ) {
cgs.media.hastePuffShader = trap_R_RegisterShader("hasteSmokePuff" ); cgs.media.hastePuffShader = trap_R_RegisterShader("hasteSmokePuff" );
#ifdef MISSIONPACK #ifdef MISSIONPACK
if ( cgs.gametype == GT_CTF || cgs.gametype == GT_1FCTF || cgs.gametype == GT_HARVESTER || cg_buildScript.integer ) { if ( cgs.gametype == GT_HARVESTER || cg_buildScript.integer ) {
#else
if ( cgs.gametype == GT_CTF || cg_buildScript.integer ) {
#endif
cgs.media.redCubeModel = trap_R_RegisterModel( "models/powerups/orb/r_orb.md3" ); 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.blueCubeModel = trap_R_RegisterModel( "models/powerups/orb/b_orb.md3" );
cgs.media.redCubeIcon = trap_R_RegisterShader( "icons/skull_red" ); cgs.media.redCubeIcon = trap_R_RegisterShader( "icons/skull_red" );
cgs.media.blueCubeIcon = trap_R_RegisterShader( "icons/skull_blue" ); 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 ) { if ( cgs.gametype == GT_CTF || cgs.gametype == GT_1FCTF || cgs.gametype == GT_HARVESTER || cg_buildScript.integer ) {
#else #else
if ( cgs.gametype == GT_CTF || cg_buildScript.integer ) { if ( cgs.gametype == GT_CTF || cg_buildScript.integer ) {