Allow campaigns to include configuration files in their mutator list string

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 257e5e40f185ddc0bf254b9dc11d926258365cc2..f771b0f83cfea0d7c2a9545c96ea28f04af00d10 100644 (file)
--- 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 336d825a7f58cc2ba4aa99ae1a45d81781293b80..110704f2bbd9b2d80cfba1f6325faa321b53f378 100644 (file)
--- 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