Ticket #902: v3_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)
+        {
+            var rallyCoords = cmpRallyPoint.GetPositions();
+            if (rallyCoords[0])
+            {
+                var rallyDatas = cmpRallyPoint.GetData();
+                var cmpBuildingRallyPointRenderer = Engine.QueryInterface(building, IID_RallyPointRenderer);
+                for each (var rallyCoord in rallyCoords)
+                {
+                    cmpBuildingRallyPoint.AddPosition(rallyCoord["x"], rallyCoord["z"]);
+                    cmpBuildingRallyPointRenderer.AddPosition({'x': rallyCoord["x"], 'y': rallyCoord["z"]})
+                }
+                for each (var rallyData in rallyDatas)
+                    cmpBuildingRallyPoint.AddData(rallyData);
+            }       
+        }
         // 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);