Ticket #1762: rallyPointRenderer.diff

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

@@ -296 +296 @@
         {
             var cmpRallyPoint = Engine.QueryInterface(ent, IID_RallyPoint);
             if (cmpRallyPoint)
-                cmpRallyPoint.Unset();
+                cmpRallyPoint.Reset();
         }
         break;
 

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

@@ +1 @@
+function InitSavedGame()
+{
+    // This will be called after the map settings have been loaded,
+    // before the simulation has started.
+    // This is only called at the start of a saved game, not when loading
+    // a new game.
+
+    // rebuild the RallyPointRenderers from the RallyPoints info
+    var rallyPoints = Engine.GetEntitiesWithInterface(IID_RallyPoint);
+    for each (var ent in rallyPoints)
+    {
+        var cmpRallyPointRenderer = Engine.QueryInterface(ent, IID_RallyPointRenderer);
+        if (!cmpRallyPointRenderer)
+            continue;
+        var positions = Engine.QueryInterface(ent, IID_RallyPoint).GetPositions();
+        for each (var pos in positions)
+            cmpRallyPointRenderer.AddPosition({'x': pos.x, 'y': pos.z});
+    }
+}
+
+Engine.RegisterGlobal("InitSavedGame", InitSavedGame);

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

@@ -20 +20 @@
     this.placementEntity = undefined; // = undefined or [templateName, entityID]
     this.placementWallEntities = undefined;
     this.placementWallLastAngle = 0;
-    this.rallyPoints = undefined;
     this.notifications = [];
     this.renamedEntities = [];
 };

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

@@ -43 +43 @@
     this.data = [];
 };
 
+RallyPoint.prototype.Reset = function()
+{
+    this.Unset();
+    var cmpRallyPointRenderer = Engine.QueryInterface(this.entity, IID_RallyPointRenderer);
+    if (cmpRallyPointRenderer)
+        cmpRallyPointRenderer.Reset();
+};
+
 Engine.RegisterComponentType(IID_RallyPoint, "RallyPoint", RallyPoint);

source/simulation2/components/ICmpRallyPointRenderer.cpp

@@ -26 +26 @@
 DEFINE_INTERFACE_METHOD_1("SetDisplayed", void, ICmpRallyPointRenderer, SetDisplayed, bool)
 DEFINE_INTERFACE_METHOD_1("SetPosition", void, ICmpRallyPointRenderer, SetPosition, CFixedVector2D)
 DEFINE_INTERFACE_METHOD_1("AddPosition", void, ICmpRallyPointRenderer, AddPosition_wrapper, CFixedVector2D)
+DEFINE_INTERFACE_METHOD_0("Reset", void, ICmpRallyPointRenderer, Reset)
 END_INTERFACE_WRAPPER(RallyPointRenderer)

source/simulation2/components/CCmpRallyPointRenderer.cpp

@@ -293 +293 @@
         }
     }
 
+    virtual void Reset()
+    {
+        m_RallyPoints.clear();
+        RecomputeAllRallyPointPaths();
+    }
+
 private:
 
     /**

source/simulation2/components/ICmpRallyPointRenderer.h

@@ -41 +41 @@
     /// to the previous one.
     virtual void AddPosition_wrapper(CFixedVector2D position) = 0;
 
+    /// Reset the positions of this rally point marker
+    virtual void Reset() = 0;
+
     DECLARE_INTERFACE_TYPE(RallyPointRenderer)
 };
 

source/simulation2/Simulation2.cpp

@@ -649 +649 @@
     GetScriptInterface().CallFunctionVoid(GetScriptInterface().GetGlobalObject(), "InitGame", data);
 }
 
+void CSimulation2::InitSavedGame()
+{
+    GetScriptInterface().CallFunctionVoid(GetScriptInterface().GetGlobalObject(), "InitSavedGame");
+}
+
 void CSimulation2::Update(int turnLength)
 {
     std::vector<SimulationCommand> commands;

source/simulation2/Simulation2.h

@@ -150 +150 @@
      * Initialise a new game, based on some script data. (Called on CGame instantiation)
      * (This mustn't be used when e.g. loading saved games, only when starting new ones.)
      * This calls the InitGame function defined in helpers/InitGame.js.
+     * Saved games are initialized with InitSavedGame.
      */
     void InitGame(const CScriptVal& data);
+    void InitSavedGame();
 
     void Update(int turnLength);
     void Update(int turnLength, const std::vector<SimulationCommand>& commands);

source/ps/Game.cpp

@@ -195 +195 @@
  **/
 PSRETURN CGame::ReallyStartGame()
 {
-    // Call the script function InitGame only for new games, not saved games
+    // Call the script function InitGame only for new games, and InitSavedGame for saved games
     if (!m_IsSavedGame)
     {
         CScriptVal settings;
         m_Simulation2->GetScriptInterface().GetProperty(m_Simulation2->GetInitAttributes().get(), "settings", settings);
         m_Simulation2->InitGame(settings);
     }
+    else
+    {
+        m_Simulation2->InitSavedGame();
+    }
 
     // We need to do an initial Interpolate call to set up all the models etc,
     // because Update might never interpolate (e.g. if the game starts paused)