Allow campaigns to include configuration files in their mutator list string
authorMario <mario.mario@y7mail.com>
Sat, 23 May 2020 10:17:40 +0000 (20:17 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 23 May 2020 10:17:56 +0000 (20:17 +1000)
qcsrc/common/mapinfo.qc
qcsrc/server/campaign.qc

index 257e5e4..f771b0f 100644 (file)
@@ -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;
index 336d825..110704f 100644 (file)
@@ -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