[quake3-commits] r1875 - trunk/code/cgame

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-02-08 13:38:29 -0500 (Tue, 08 Feb 2011)
New Revision: 1875

Modified:
   trunk/code/cgame/cg_local.h
   trunk/code/cgame/cg_main.c
Log:
By ZTurtleMan: Cleanup; only load harvester data in harvester gametype, removed unused var, and ifdef a missionpack only var.


Modified: trunk/code/cgame/cg_local.h
===================================================================
--- trunk/code/cgame/cg_local.h	2011-02-08 18:19:31 UTC (rev 1874)
+++ trunk/code/cgame/cg_local.h	2011-02-08 18:38:29 UTC (rev 1875)
@@ -550,8 +550,10 @@
 	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 @@
 	// 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 @@
 	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;

Modified: trunk/code/cgame/cg_main.c
===================================================================
--- trunk/code/cgame/cg_main.c	2011-02-08 18:19:31 UTC (rev 1874)
+++ trunk/code/cgame/cg_main.c	2011-02-08 18:38:29 UTC (rev 1875)
@@ -878,17 +878,13 @@
 	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 ) {