Ticket #2798: autostart.diff

source/ps/GameSetup/GameSetup.cpp

@@ -1276 +1276 @@
         }
         mapType = "random";
     }
-    else if (mapDirectory == L"scenarios")
+    else if (mapDirectory == L"scenarios" || mapDirectory == L"skirmishes")
     {
         // Initialize general settings from the map data so some values
         // (e.g. name of map) are always present, even when autostart is
@@ -1285 +1285 @@
         // for example...)
         CStr8 mapSettingsJSON = LoadSettingsOfScenarioMap("maps/" + autoStartName + ".xml");
         scriptInterface.ParseJSON(mapSettingsJSON, &settings);
-        mapType = "scenario";
-    }
-    else if (mapDirectory == L"skirmishes")
-    {
-        // In skirmish mode, the player initialization data is taken from the
-        // game-setup settings (see CGame::RegisterInit(...)). If some player
-        // is not initialized (PlayerData[] holding fewer/more entries than
-        // defined in map), there's a crash.
-        // To prevent this, we mimic the behavior of the game setup screen by
-        // retrieving the map settings from the actual map xml...
-        CStr8 mapSettingsJSON = LoadSettingsOfScenarioMap("maps/" + autoStartName + ".xml");
-        scriptInterface.ParseJSON(mapSettingsJSON, &settings);
         
         // ...and initialize the playerData array being edited by
         // autostart-civ et.al. with the real map data, so sensible values
         // are always present:
         scriptInterface.GetProperty(settings, "PlayerData", &playerData);
-        mapType = "skirmish";
+
+        if (mapDirectory == L"scenarios")
+            mapType = "scenario";
+        else
+            mapType = "skirmish";
     }
+
     if (mapType.empty())
     {
         LOGERROR(L"Unrecognized map type '%ls' detected", mapType.c_str());
@@ -1311 +1304 @@
     }
     scriptInterface.SetProperty(attrs, "mapType", mapType);
     scriptInterface.SetProperty(attrs, "map", std::string("maps/" + autoStartName));
-
     scriptInterface.SetProperty(settings, "mapType", mapType);
 
     // Set player data for AIs
@@ -1321 +1313 @@
         std::vector<CStr> aiArgs = args.GetMultiple("autostart-ai");
         for (size_t i = 0; i < aiArgs.size(); ++i)
         {
+            int playerID = aiArgs[i].BeforeFirst(":").ToInt();
+
             // Instead of overwriting existing player data, modify the array
             JS::RootedValue player(cx);
-            if (!scriptInterface.GetPropertyInt(playerData, i, &player) || player.isUndefined())
+            if (!scriptInterface.GetPropertyInt(playerData, playerID-1, &player) || player.isUndefined())
             {
+                if (mapDirectory == L"scenarios" || mapDirectory == L"skirmishes")
+                {
+                    // playerID is certainly bigger than this map player number
+                    LOGWARNING(L"Ai settings for player %d ignored.", playerID);
+                    continue;
+                }
                 scriptInterface.Eval("({})", &player);
             }
 
-            int playerID = aiArgs[i].BeforeFirst(":").ToInt();
             CStr name = aiArgs[i].AfterFirst(":");
-
             scriptInterface.SetProperty(player, "AI", std::string(name));
             scriptInterface.SetProperty(player, "AIDiff", 2);
             scriptInterface.SetPropertyInt(playerData, playerID-1, player);
@@ -1342 +1340 @@
         std::vector<CStr> civArgs = args.GetMultiple("autostart-aidiff");
         for (size_t i = 0; i < civArgs.size(); ++i)
         {
+            int playerID = civArgs[i].BeforeFirst(":").ToInt();
+
             // Instead of overwriting existing player data, modify the array
             JS::RootedValue player(cx);
-            if (!scriptInterface.GetPropertyInt(playerData, i, &player) || player.isUndefined())
+            if (!scriptInterface.GetPropertyInt(playerData, playerID-1, &player) || player.isUndefined())
             {
+                if (mapDirectory == L"scenarios" || mapDirectory == L"skirmishes")
+                {
+                    // playerID is certainly bigger than this map player number
+                    LOGWARNING(L"Aidiff settings for player %d ignored.", playerID);
+                    continue;
+                }
                 scriptInterface.Eval("({})", &player);
             }
-            
-            int playerID = civArgs[i].BeforeFirst(":").ToInt();
-            int difficulty = civArgs[i].AfterFirst(":").ToInt();
-            
+
+            int difficulty = civArgs[i].AfterFirst(":").ToInt();            
             scriptInterface.SetProperty(player, "AIDiff", difficulty);
             scriptInterface.SetPropertyInt(playerData, playerID-1, player);
         }
@@ -1359 +1363 @@
     // Set player data for Civs
     if (args.Has("autostart-civ"))
     {
-        std::vector<CStr> civArgs = args.GetMultiple("autostart-civ");
-        for (size_t i = 0; i < civArgs.size(); ++i)
+        if (mapDirectory != L"scenarios")
         {
-            // Instead of overwriting existing player data, modify the array
-            JS::RootedValue player(cx);
-            if (!scriptInterface.GetPropertyInt(playerData, i, &player) || player.isUndefined())
+            std::vector<CStr> civArgs = args.GetMultiple("autostart-civ");
+            for (size_t i = 0; i < civArgs.size(); ++i)
             {
-                scriptInterface.Eval("({})", &player);
+                int playerID = civArgs[i].BeforeFirst(":").ToInt();
+
+                // Instead of overwriting existing player data, modify the array
+                JS::RootedValue player(cx);
+                if (!scriptInterface.GetPropertyInt(playerData, playerID-1, &player) || player.isUndefined())
+                {
+                    if (mapDirectory == L"skirmishes")
+                    {
+                        // playerID is certainly bigger than this map player number
+                        LOGWARNING(L"Civ settings for player %d ignored.", playerID);
+                        continue;
+                    }
+                    scriptInterface.Eval("({})", &player);
+                }
+            
+                CStr name = civArgs[i].AfterFirst(":");         
+                scriptInterface.SetProperty(player, "Civ", std::string(name));
+                scriptInterface.SetPropertyInt(playerData, playerID-1, player);
             }
-            
-            int playerID = civArgs[i].BeforeFirst(":").ToInt();
-            CStr name = civArgs[i].AfterFirst(":");
-            
-            scriptInterface.SetProperty(player, "Civ", std::string(name));
-            scriptInterface.SetPropertyInt(playerData, playerID-1, player);
         }
+        else
+            LOGWARNING(L"For scenarios, autostart civs are ignored.");
     }
 
     // Add player data to map settings