Ticket #2969: InitGame.js.2.patch

binaries/data/mods/public/simulation/components/PlayerManager.js

@@ -52 +52 @@
     this.playerEntities[id] = ent;
     cmpPlayer.SetDiplomacy(diplo);
     Engine.DestroyEntity(oldent);
-    Engine.FlushDestroyedComponents();
+    Engine.FlushDestroyedEntities();
 
     for (var e of entities)
     {

binaries/data/mods/public/simulation/helpers/InitGame.js

@@ -4 +4 @@
  */
 function PreInitGame()
 {
+    // We need to replace skirmish "default" entities with real ones.
+    // This needs to happen before AI initialization (in InitGame).
+    // And we need to flush destroyed entities otherwise the AI gets the wrong game state in 
+    // the beginning and a bunch of "destroy" messages on turn 0, which just shouldn't happen.
     Engine.BroadcastMessage(MT_SkirmishReplace, {});
+    Engine.FlushDestroyedEntities(); 
 
     let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
     let playerIds = cmpPlayerManager.GetAllPlayerEntities().slice(1); // ignore gaia
@@ -14 +19 @@
         if (cmpTechnologyManager)
             cmpTechnologyManager.UpdateAutoResearch();
     }
+
+    // Explore the map inside the players' territory borders
+    let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    cmpRangeManager.ExploreTerritories();
 }
 
 function InitGame(settings)
@@ -22 +31 @@
     if (!settings)
         return;
 
-    let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
     if (settings.ExploreMap)
+    {
+        let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
         for (let i = 1; i < settings.PlayerData.length; ++i)
             cmpRangeManager.ExploreAllTiles(i);
-    else
-        // Explore the map only inside the players' territory borders
-        cmpRangeManager.ExploreTerritories();
+    }
 
     let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
     let cmpAIManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIManager);

source/ps/Game.cpp

@@ -1 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -213 +213 @@
     if (!m_IsSavedGame)
     {
         if (!g_AtlasGameLoop->running)
-        {
-            // We need to replace skirmish "default" entities with real ones.
-            // This needs to happen before AI initialization (in InitGame).
-            // And we need to flush destroyed entities otherwise the AI
-            // gets the wrong game state in the beginning and a bunch of
-            // "destroy" messages on turn 0, which just shouldn't happen.
             m_Simulation2->PreInitGame();
-            m_Simulation2->FlushDestroyedEntities();
-        }
+
         JS::RootedValue settings(cx);
         JS::RootedValue tmpInitAttributes(cx, m_Simulation2->GetInitAttributes().get());
         m_Simulation2->GetScriptInterface().GetProperty(tmpInitAttributes, "settings", &settings);

source/simulation2/system/ComponentManager.cpp

@@ -1 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -84 +84 @@
         m_ScriptInterface.RegisterFunction<int, std::string, CComponentManager::Script_AddEntity> ("AddEntity");
         m_ScriptInterface.RegisterFunction<int, std::string, CComponentManager::Script_AddLocalEntity> ("AddLocalEntity");
         m_ScriptInterface.RegisterFunction<void, int, CComponentManager::Script_DestroyEntity> ("DestroyEntity");
-        m_ScriptInterface.RegisterFunction<void, CComponentManager::Script_FlushDestroyedComponents> ("FlushDestroyedComponents");
+        m_ScriptInterface.RegisterFunction<void, CComponentManager::Script_FlushDestroyedEntities> ("FlushDestroyedEntities");
         m_ScriptInterface.RegisterFunction<CScriptVal, std::wstring, CComponentManager::Script_ReadJSONFile> ("ReadJSONFile");
         m_ScriptInterface.RegisterFunction<CScriptVal, std::wstring, CComponentManager::Script_ReadCivJSONFile> ("ReadCivJSONFile");
         m_ScriptInterface.RegisterFunction<std::vector<std::string>, std::wstring, bool, CComponentManager::Script_FindJSONFiles> ("FindJSONFiles");
@@ -508 +508 @@
     componentManager->DestroyComponentsSoon(ent);
 }
 
-void CComponentManager::Script_FlushDestroyedComponents(ScriptInterface::CxPrivate *pCxPrivate) 
+void CComponentManager::Script_FlushDestroyedEntities(ScriptInterface::CxPrivate *pCxPrivate) 
 { 
     CComponentManager* componentManager = static_cast<CComponentManager*> (pCxPrivate->pCBData); 
     componentManager->FlushDestroyedComponents(); 

source/simulation2/system/ComponentManager.h

@@ -1 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -283 +283 @@
     static int Script_AddEntity(ScriptInterface::CxPrivate* pCxPrivate, std::string templateName);
     static int Script_AddLocalEntity(ScriptInterface::CxPrivate* pCxPrivate, std::string templateName);
     static void Script_DestroyEntity(ScriptInterface::CxPrivate* pCxPrivate, int ent);
-    static void Script_FlushDestroyedComponents(ScriptInterface::CxPrivate* pCxPrivate);
+    static void Script_FlushDestroyedEntities(ScriptInterface::CxPrivate* pCxPrivate);
     static CScriptVal Script_ReadJSONFile(ScriptInterface::CxPrivate* pCxPrivate, std::wstring fileName);
     static CScriptVal Script_ReadCivJSONFile(ScriptInterface::CxPrivate* pCxPrivate, std::wstring fileName);
     static std::vector<std::string> Script_FindJSONFiles(ScriptInterface::CxPrivate* pCxPrivate, std::wstring subPath, bool recursive);