From 50b224ef8be4902d6e4ba77b71ebbb2ff187e950 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 23 May 2020 20:17:40 +1000 Subject: [PATCH] Allow campaigns to include configuration files in their mutator list string --- qcsrc/common/mapinfo.qc | 5 +---- qcsrc/server/campaign.qc | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 257e5e40f1..f771b0f83c 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 336d825a7f..110704f2bb 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 -- 2.39.2