[quake3-commits] r2069 - in trunk/code: game ui

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-07-07 19:13:20 -0400 (Thu, 07 Jul 2011)
New Revision: 2069

Modified:
   trunk/code/game/g_spawn.c
   trunk/code/ui/ui_main.c
Log:
Bug 5067 - Remove references to unused teamtournament gametype. Toggle areaportal on mover ents where due is needed, patch by Ensiform


Modified: trunk/code/game/g_spawn.c
===================================================================
--- trunk/code/game/g_spawn.c	2011-07-07 23:05:09 UTC (rev 2068)
+++ trunk/code/game/g_spawn.c	2011-07-07 23:13:20 UTC (rev 2069)
@@ -379,9 +379,13 @@
 	}
 }
 
+#define ADJUST_AREAPORTAL() \
+	if(ent->s.eType == ET_MOVER) \
+	{ \
+		trap_LinkEntity(ent); \
+		trap_AdjustAreaPortalState(ent, qtrue); \
+	}
 
-
-
 /*
 ===================
 G_SpawnGEntityFromSpawnVars
@@ -394,7 +398,7 @@
 	int			i;
 	gentity_t	*ent;
 	char		*s, *value, *gametypeName;
-	static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester", "teamtournament"};
+	static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester"};
 
 	// get the next free entity
 	ent = G_Spawn();
@@ -407,6 +411,7 @@
 	if ( g_gametype.integer == GT_SINGLE_PLAYER ) {
 		G_SpawnInt( "notsingle", "0", &i );
 		if ( i ) {
+			ADJUST_AREAPORTAL();
 			G_FreeEntity( ent );
 			return;
 		}
@@ -415,12 +420,14 @@
 	if ( g_gametype.integer >= GT_TEAM ) {
 		G_SpawnInt( "notteam", "0", &i );
 		if ( i ) {
+			ADJUST_AREAPORTAL();
 			G_FreeEntity( ent );
 			return;
 		}
 	} else {
 		G_SpawnInt( "notfree", "0", &i );
 		if ( i ) {
+			ADJUST_AREAPORTAL();
 			G_FreeEntity( ent );
 			return;
 		}
@@ -429,12 +436,14 @@
 #ifdef MISSIONPACK
 	G_SpawnInt( "notta", "0", &i );
 	if ( i ) {
+		ADJUST_AREAPORTAL();
 		G_FreeEntity( ent );
 		return;
 	}
 #else
 	G_SpawnInt( "notq3a", "0", &i );
 	if ( i ) {
+		ADJUST_AREAPORTAL();
 		G_FreeEntity( ent );
 		return;
 	}
@@ -446,6 +455,7 @@
 
 			s = strstr( value, gametypeName );
 			if( !s ) {
+				ADJUST_AREAPORTAL();
 				G_FreeEntity( ent );
 				return;
 			}

Modified: trunk/code/ui/ui_main.c
===================================================================
--- trunk/code/ui/ui_main.c	2011-07-07 23:05:09 UTC (rev 2068)
+++ trunk/code/ui/ui_main.c	2011-07-07 23:13:20 UTC (rev 2069)
@@ -83,8 +83,7 @@
 	"CTF",
 	"1FCTF",
 	"OVERLOAD",
-	"HARVESTER",
-	"TEAMTOURNAMENT"
+	"HARVESTER"
 };
 
 static int const numTeamArenaGameTypes = ARRAY_LEN( teamArenaGameTypes );