Ticket #902: v1_rally_construct.diff

0ad/binaries/data/mods/public/simulation/components/Foundation.js

@@ -277 +277 @@
         var rot = cmpPosition.GetRotation();
         cmpBuildingPosition.SetYRotation(rot.y);
         cmpBuildingPosition.SetXZRotation(rot.x, rot.z);
+        var cmpRallyPoint = Engine.QueryInterface(this.entity, IID_RallyPoint);
+        var cmpBuildingRallyPoint = Engine.QueryInterface(building, IID_RallyPoint);
+        if(cmpRallyPoint!=null)
+        {
+            var rallyCoords = cmpRallyPoint.GetPositions()[0];
+            var rallyData = cmpRallyPoint.GetData();
+            if(rallyData)
+                cmpBuildingRallyPoint.AddData(rallyData);
+            if(rallyCoords)
+            {
+                cmpBuildingRallyPoint.AddPosition(rallyCoords["x"], rallyCoords["z"]);
+                var cmpBuildingRallyPointRenderer = Engine.QueryInterface(building, IID_RallyPointRenderer);
+                cmpBuildingRallyPointRenderer.SetPosition({'x': rallyCoords["x"], 'y': rallyCoords["z"]});
+                cmpBuildingRallyPointRenderer.SetDisplayed(true);
+            }
+        }
         // TODO: should add a ICmpPosition::CopyFrom() instead of all this
 
         // ----------------------------------------------------------------------

0ad/source/simulation2/components/CCmpTemplateManager.cpp

@@ -566 +566 @@
     permittedComponentTypes.insert("Sound");
     permittedComponentTypes.insert("Vision");
     permittedComponentTypes.insert("AIProxy");
+    permittedComponentTypes.insert("RallyPoint");
+    permittedComponentTypes.insert("RallyPointRenderer");
 
     CParamNode::LoadXMLString(out, "<Entity/>");
     out.CopyFilteredChildrenOfChild(in, "Entity", permittedComponentTypes);