r2848 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-10-21 17:50:40 -0400 (Sun, 21 Oct 2007)
New Revision: 2848

Modified:
   trunk/data/qcsrc/server/g_world.qc
Log:
handle "alreadychangedlevel" slightly better


Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2007-10-21 19:02:47 UTC (rev 2847)
+++ trunk/data/qcsrc/server/g_world.qc	2007-10-21 21:50:40 UTC (rev 2848)
@@ -699,6 +699,7 @@
 	if(cvar("g_campaign"))
 	{
 		CampaignPostIntermission();
+		alreadychangedlevel = TRUE;
 		return TRUE;
 	}
 	if(cvar("quit_when_empty"))
@@ -706,12 +707,14 @@
 		if(player_count <= currentbots)
 		{
 			localcmd("quit\n");
+			alreadychangedlevel = TRUE;
 			return TRUE;
 		}
 	}
 	if(cvar_string("quit_and_redirect") != "")
 	{
 		redirection_target = strzone(cvar_string("quit_and_redirect"));
+		alreadychangedlevel = TRUE;
 		return TRUE;
 	}
 	if (cvar("samelevel")) // if samelevel is set, stay on same level
@@ -721,6 +724,7 @@
 		// so instead just restart the current map using the restart command (DOES NOT WORK PROPERLY WITH exit_cfg STUFF)
 		localcmd("restart\n");
 		//changelevel (mapname);
+		alreadychangedlevel = TRUE;
 		return TRUE;
 	}
 	if(cvar_string("nextmap") != "")
@@ -728,12 +732,14 @@
 		{
 			Map_Goto_SetStr(cvar_string("nextmap"));
 			Map_Goto();
+			alreadychangedlevel = TRUE;
 			return TRUE;
 		}
 	if(cvar("lastlevel"))
 	{
 		GameResetCfg();
 		localcmd("set lastlevel 0\ntogglemenu\n");
+		alreadychangedlevel = TRUE;
 		return TRUE;
 	}
 	return FALSE;
@@ -1769,6 +1775,7 @@
 
 	Map_Goto_SetStr(mapvote_maps[mappos]);
 	Map_Goto();
+	alreadychangedlevel = TRUE;
 	return TRUE;
 }
 void MapVote_CheckRules_1()
@@ -1956,10 +1963,7 @@
 	{
 		mapvote_initialized = TRUE;
 		if(DoNextMapOverride())
-		{
-			alreadychangedlevel = TRUE;
 			return;
-		}
 		if(!cvar("g_maplist_votable") || player_count <= 0)
 		{
 			GotoNextMap();