From 265bdd192d77ac2a0c191885383c98b86984a0f2 Mon Sep 17 00:00:00 2001
From: Enrique <enrique@wildfiregames.com>
Date: Wed, 8 Mar 2017 08:39:41 +0000
Subject: [PATCH] Fixed a problem with the hellenic faction fortresses, where
 old version of the props was used on the fortress death variation reported by
 elexis.

This was SVN commit r19280.
---
 .../props/structures/hellenes/fortress_props.xml | 16 ----------------
 .../art/actors/structures/athenians/fortress.xml |  6 +++---
 .../actors/structures/hellenes/fortress_up.xml   | 12 ++++++------
 .../structures/macedonians/fortress_up.xml       |  6 +++---
 .../actors/structures/spartans/fortress_up.xml   | 10 +++++-----
 5 files changed, 17 insertions(+), 33 deletions(-)
 delete mode 100644 binaries/data/mods/public/art/actors/props/structures/hellenes/fortress_props.xml

diff --git a/binaries/data/mods/public/art/actors/props/structures/hellenes/fortress_props.xml b/binaries/data/mods/public/art/actors/props/structures/hellenes/fortress_props.xml
deleted file mode 100644
index 7954192dc8..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/hellenes/fortress_props.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/hele_fortress_props.dae</mesh>
-      <textures>
-<texture file="props/hele_props_a.dds" name="baseTex"/>
-<texture file="props/hele_props_a_norm.png" name="normTex"/>
-<texture file="props/hele_props_a_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_fortress.png" name="aoTex"/>
-</textures>
-    </variant>
-  </group>
-<material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml b/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
index 363eb5edf3..b440f86c4d 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
@@ -7,7 +7,7 @@
       <props>
         <prop actor="props/structures/athenians/fortress_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_gate_up.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_props_up.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
@@ -38,8 +38,8 @@
         <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_props_up.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/fortress_up.xml b/binaries/data/mods/public/art/actors/structures/hellenes/fortress_up.xml
index 0193cccbdd..eee88d714c 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/fortress_up.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/fortress_up.xml
@@ -7,16 +7,16 @@
       <props>
         <prop actor="props/structures/hellenes/fortress_shields_up.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_gate_up.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_props_up.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
       </props>
       <textures>
         <texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_fortress.png" name="aoTex"/>
+        <texture file="structural/hele_struct_b_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
+        <texture file="structural/ao/hele_fortress.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -38,8 +38,8 @@
         <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_props_up.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/structures/macedonians/fortress_up.xml b/binaries/data/mods/public/art/actors/structures/macedonians/fortress_up.xml
index 4d51446988..cd5a35eaf5 100644
--- a/binaries/data/mods/public/art/actors/structures/macedonians/fortress_up.xml
+++ b/binaries/data/mods/public/art/actors/structures/macedonians/fortress_up.xml
@@ -7,7 +7,7 @@
       <props>
         <prop actor="props/structures/macedonians/fortress_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_gate_up.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_props_up.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
@@ -38,8 +38,8 @@
         <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_props_up.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/structures/spartans/fortress_up.xml b/binaries/data/mods/public/art/actors/structures/spartans/fortress_up.xml
index f57855da97..b26de60965 100644
--- a/binaries/data/mods/public/art/actors/structures/spartans/fortress_up.xml
+++ b/binaries/data/mods/public/art/actors/structures/spartans/fortress_up.xml
@@ -7,16 +7,16 @@
       <props>
         <prop actor="props/structures/spartans/fortress_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_gate_up.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_props_up.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
       </props>
       <textures>
         <texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_fortress.png" name="aoTex"/>
+        <texture file="structural/hele_struct_b_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
+        <texture file="structural/ao/hele_fortress.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -38,7 +38,7 @@
         <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_props_up.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
       </props>