r3192 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Jan 19 13:33:54 EST 2008
Author: div0
Date: 2008-01-19 13:33:53 -0500 (Sat, 19 Jan 2008)
New Revision: 3192
Modified:
trunk/data/qcsrc/server/g_world.qc
Log:
fix GotoFirstMap logic
Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc 2008-01-19 18:17:48 UTC (rev 3191)
+++ trunk/data/qcsrc/server/g_world.qc 2008-01-19 18:33:53 UTC (rev 3192)
@@ -55,7 +55,7 @@
world.frags = 0;
}
-void GotoFirstMap()
+float GotoFirstMap()
{
if(cvar("_sv_init"))
{
@@ -78,8 +78,11 @@
if(!DoNextMapOverride())
GotoNextMap();
+
+ return 1;
}
}
+ return 0;
}
float world_already_spawned;
@@ -91,6 +94,8 @@
error("world already spawned - you may have EXACTLY ONE worldspawn!");
world_already_spawned = TRUE;
+ GotoFirstMap();
+
#ifdef MAPINFO
MapInfo_LoadMapSettings(mapname);
#endif
@@ -155,8 +160,6 @@
lms_lowest_lives = 0;
lms_next_place = 0;
- GotoFirstMap();
-
bot_waypoints_for_items = cvar("g_waypoints_for_items");
if(bot_waypoints_for_items == 1)
if(self.spawnflags & SPAWNFLAG_NO_WAYPOINTS_FOR_ITEMS)
More information about the nexuiz-commits
mailing list