From e35d2a2e79fc74b2accc1f742e6a60c04e0e2b05 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 7 Oct 2008 18:05:28 +0000 Subject: [PATCH] update world mins/maxs fro mapinfo; fix comment git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4654 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/common/mapinfo.qc | 2 +- data/qcsrc/server/teamplay.qc | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/common/mapinfo.qc b/data/qcsrc/common/mapinfo.qc index d264e5b97..d9705549d 100644 --- a/data/qcsrc/common/mapinfo.qc +++ b/data/qcsrc/common/mapinfo.qc @@ -567,7 +567,7 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype 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; diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc index bafeab51a..5e96f606d 100644 --- a/data/qcsrc/server/teamplay.qc +++ b/data/qcsrc/server/teamplay.qc @@ -173,6 +173,11 @@ void InitGameplayMode() 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"); -- 2.39.2