r5015 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-08 11:35:48 -0500 (Sat, 08 Nov 2008)
New Revision: 5015

Modified:
   trunk/data/qcsrc/server/g_world.qc
Log:
remove "NOTE: crashed before even initializing the world, not saving persistent data\n" warning on first server start


Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-11-08 08:44:14 UTC (rev 5014)
+++ trunk/data/qcsrc/server/g_world.qc	2008-11-08 16:35:48 UTC (rev 5015)
@@ -225,7 +225,10 @@
 	RegisterWeapons();
 
 	if(GotoFirstMap())
+	{
+		world_initialized = -1; // don't complain
 		return;
+	}
 
 	if(sv_cheats)
 		ServerProgsDB = db_create();
@@ -401,9 +404,9 @@
 	Nagger_Init();
 
 	next_pingtime = time + 5;
+	InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);
+
 	world_initialized = 1;
-
-	InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);
 }
 
 void spawnfunc_light (void)
@@ -2327,7 +2330,7 @@
 
 void SV_Shutdown()
 {
-	if(world_initialized)
+	if(world_initialized > 0)
 	{
 		world_initialized = 0;
 		print("Saving persistent data...\n");
@@ -2344,7 +2347,7 @@
 
 		MapInfo_Shutdown();
 	}
-	else
+	else if(world_initialized == 0)
 	{
 		print("NOTE: crashed before even initializing the world, not saving persistent data\n");
 	}