Ticket #3880: autostart.patch

source/ps/GameSetup/GameSetup.cpp

@@ -1324 +1324 @@
     scriptInterface.SetProperty(settings, "AISeed", aiseed);
 
     // Set player data for AIs
-    //      attrs.settings = { PlayerData: [ { AI: ... }, ... ] }:
+    //      attrs.settings = { PlayerData: [ { AI: ... }, ... ] }
+    //                          or = { PlayerData: [ null, { AI: ... }, ... ] } when gaia set
+    int i0 = 1;
+    JS::RootedValue player(cx);
+    if (scriptInterface.GetPropertyInt(playerData, 0, &player) && player.isNull())
+        i0 = 0;
+
     if (args.Has("autostart-ai"))
     {
         std::vector<CStr> aiArgs = args.GetMultiple("autostart-ai");
@@ -1334 +1340 @@
 
             // Instead of overwriting existing player data, modify the array
             JS::RootedValue player(cx);
-            if (!scriptInterface.GetPropertyInt(playerData, playerID-1, &player) || player.isUndefined())
+            if (!scriptInterface.GetPropertyInt(playerData, playerID-i0, &player) || player.isUndefined())
             {
                 if (mapDirectory == L"scenarios" || mapDirectory == L"skirmishes")
                 {
@@ -1348 +1354 @@
             CStr name = aiArgs[i].AfterFirst(":");
             scriptInterface.SetProperty(player, "AI", std::string(name));
             scriptInterface.SetProperty(player, "AIDiff", 3);
-            scriptInterface.SetPropertyInt(playerData, playerID-1, player);
+            scriptInterface.SetPropertyInt(playerData, playerID-i0, player);
         }
     }
     // Set AI difficulty
@@ -1361 +1367 @@
 
             // Instead of overwriting existing player data, modify the array
             JS::RootedValue player(cx);
-            if (!scriptInterface.GetPropertyInt(playerData, playerID-1, &player) || player.isUndefined())
+            if (!scriptInterface.GetPropertyInt(playerData, playerID-i0, &player) || player.isUndefined())
             {
                 if (mapDirectory == L"scenarios" || mapDirectory == L"skirmishes")
                 {
@@ -1374 +1380 @@
 
             int difficulty = civArgs[i].AfterFirst(":").ToInt();            
             scriptInterface.SetProperty(player, "AIDiff", difficulty);
-            scriptInterface.SetPropertyInt(playerData, playerID-1, player);
+            scriptInterface.SetPropertyInt(playerData, playerID-i0, player);
         }
     }
     // Set player data for Civs
@@ -1389 +1395 @@
 
                 // Instead of overwriting existing player data, modify the array
                 JS::RootedValue player(cx);
-                if (!scriptInterface.GetPropertyInt(playerData, playerID-1, &player) || player.isUndefined())
+                if (!scriptInterface.GetPropertyInt(playerData, playerID-i0, &player) || player.isUndefined())
                 {
                     if (mapDirectory == L"skirmishes")
                     {
@@ -1400 +1406 @@
                     scriptInterface.Eval("({})", &player);
                 }
             
-                CStr name = civArgs[i].AfterFirst(":");         
+                CStr name = civArgs[i].AfterFirst(":");
                 scriptInterface.SetProperty(player, "Civ", std::string(name));
-                scriptInterface.SetPropertyInt(playerData, playerID-1, player);
+                scriptInterface.SetPropertyInt(playerData, playerID-i0, player);
             }
         }
         else