r4654 - in trunk/data/qcsrc: common server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-07 14:05:28 -0400 (Tue, 07 Oct 2008)
New Revision: 4654

Modified:
   trunk/data/qcsrc/common/mapinfo.qc
   trunk/data/qcsrc/server/teamplay.qc
Log:
update world mins/maxs fro mapinfo; fix comment


Modified: trunk/data/qcsrc/common/mapinfo.qc
===================================================================
--- trunk/data/qcsrc/common/mapinfo.qc	2008-10-07 12:04:04 UTC (rev 4653)
+++ trunk/data/qcsrc/common/mapinfo.qc	2008-10-07 18:05:28 UTC (rev 4654)
@@ -567,7 +567,7 @@
 		fputs(fh, "// optional: fog density red green blue alpha mindist maxdist\n");
 		fputs(fh, "// optional: settemp_for_type (all|gametypename) cvarname value\n");
 		fputs(fh, "// optional: clientsettemp_for_type (all|gametypename) cvarname value\n");
-		fputs(fh, "// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z (for team map)\n");
+		fputs(fh, "// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z\n");
 
 		fclose(fh);
 		r = 2;

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2008-10-07 12:04:04 UTC (rev 4653)
+++ trunk/data/qcsrc/server/teamplay.qc	2008-10-07 18:05:28 UTC (rev 4654)
@@ -173,6 +173,11 @@
 	WriteGameCvars();
 
 	MapInfo_LoadMapSettings(mapname);
+	if(MapInfo_Map_mins_x < MapInfo_Map_maxs_x)
+	{
+		world.mins = MapInfo_Map_mins;
+		world.maxs = MapInfo_Map_maxs;
+	}
 	if not(cvar_value_issafe(world.fog))
 	{
 		print("The current map contains a potentially harmful fog setting, ignored\n");