From: Mario Date: Sat, 23 May 2020 10:17:40 +0000 (+1000) Subject: Allow campaigns to include configuration files in their mutator list string X-Git-Tag: xonotic-v0.8.5~1048 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=50b224ef8be4902d6e4ba77b71ebbb2ff187e950;p=xonotic%2Fxonotic-data.pk3dir.git Allow campaigns to include configuration files in their mutator list string --- diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 257e5e40f..f771b0f83 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -671,11 +671,8 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, } else { - for (;;) + while((s = fgets(fh))) { - if (!((s = fgets(fh)))) - break; - // catch different sorts of comments if(s == "") // empty lines continue; diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc index 336d825a7..110704f2b 100644 --- a/qcsrc/server/campaign.qc +++ b/qcsrc/server/campaign.qc @@ -124,7 +124,7 @@ void CampaignPreInit() { string arg = argv(j); if(arg == "") continue; - _MapInfo_Parse_Settemp(mapname, MAPINFO_SETTEMP_ACL_USER, 0, arg, 0); // no recursion! + _MapInfo_Parse_Settemp(mapname, MAPINFO_SETTEMP_ACL_USER, 0, arg, 1); } } #endif