r1908 - branches/nexuiz-2.0/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-11-06 07:00:20 -0500 (Mon, 06 Nov 2006)
New Revision: 1908

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
Log:
MERGE: bail out on multiple worldspawns


Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2006-11-06 11:59:03 UTC (rev 1907)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2006-11-06 12:00:20 UTC (rev 1908)
@@ -29,9 +29,12 @@
 	}
 }
 
+float world_already_spawned;
 void worldspawn (void)
 {
-
+	if(world_already_spawned)
+		error("world already spawned - you may have EXACTLY ONE worldspawn!");
+	world_already_spawned = TRUE;
 	// Precache all player models
 	// Workaround for "invisible players"
 	precache_model("models/player/carni.zym");