r3272 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-25 06:38:02 -0500 (Fri, 25 Jan 2008)
New Revision: 3272

Modified:
   trunk/data/qcsrc/server/g_world.qc
Log:
fix sv_init handling again


Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-01-25 11:31:42 UTC (rev 3271)
+++ trunk/data/qcsrc/server/g_world.qc	2008-01-25 11:38:02 UTC (rev 3272)
@@ -66,8 +66,8 @@
 		tokenizebyseparator(cvar_string("g_maplist"), " ");
 #else
 		tokenize(cvar_string("g_maplist"));
+		if(argv(0) != GetMapname())
 #endif
-		if(argv(0) != GetMapname())
 		{
 			cvar_set("nextmap", argv(0));
 
@@ -94,7 +94,8 @@
 		error("world already spawned - you may have EXACTLY ONE worldspawn!");
 	world_already_spawned = TRUE;
 
-	GotoFirstMap();
+	if(GotoFirstMap())
+		return;
 
 #ifdef MAPINFO
 	MapInfo_LoadMapSettings(mapname);