Ticket #2264: TerrainFlattening.diff

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

@@ -876 +876 @@
     var cmpFoundation = Engine.QueryInterface(ent, IID_Foundation);
     cmpFoundation.InitialiseConstruction(player, cmd.template);
 
+
+    // If it modifies the terrain, apply the changes
+    var CmpTerrainModifier = Engine.QueryInterface(ent, IID_TerrainModifier);
+    if (CmpTerrainModifier)
+        CmpTerrainModifier.ApplyTerrainModification();
+
     // send Metadata info if any
     if (cmd.metadata)
         Engine.PostMessage(ent, MT_AIMetadata, { "id": ent, "metadata" : cmd.metadata, "owner" : player } );

binaries/data/mods/public/simulation/templates/template_structure.xml

@@ -97 +97 @@
     <BarHeight>0.6</BarHeight>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
+  <TerrainModifier/>
   <TerritoryDecay>
     <HealthDecayRate>5</HealthDecayRate>
   </TerritoryDecay>

source/simulation2/TypeList.h

@@ -149 +149 @@
 INTERFACE(Terrain)
 COMPONENT(Terrain)
 
+INTERFACE(TerrainModifier)
+COMPONENT(TerrainModifier)
+
 INTERFACE(TerritoryInfluence)
 COMPONENT(TerritoryInfluence)
 

source/simulation2/components/CCmpTemplateManager.cpp

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

source/simulation2/components/CCmpTerrain.cpp

@@ -25 +25 @@
 #include "simulation2/MessageTypes.h"
 
 #include "graphics/Terrain.h"
+#include "graphics/RenderableObject.h"
+#include "ps/Game.h"
+#include "ps/World.h"
 #include "renderer/Renderer.h"
 #include "renderer/WaterManager.h"
 #include "maths/Vector3D.h"
@@ -140 +143 @@
 
         MakeDirty(0, 0, tiles+1, tiles+1);
     }
-
+    
     virtual void MakeDirty(i32 i0, i32 j0, i32 i1, i32 j1)
     {
         CMessageTerrainChanged msg(i0, j0, i1, j1);