From 44b40a85bb5df6455cd930374778cdd2790b3234 Mon Sep 17 00:00:00 2001
From: historic_bruno <ben@wildfiregames.com>
Date: Sun, 4 May 2014 08:08:48 +0000
Subject: [PATCH] Fixes some broken actor references

This was SVN commit r15109.
---
 .../art/actors/props/structures/ptolemies/merchant_tent.xml | 6 +++---
 .../mods/public/art/actors/structures/ptolemies/dock.xml    | 2 +-
 .../mods/public/art/actors/structures/ptolemies/house.xml   | 2 +-
 .../mods/public/art/actors/structures/ptolemies/wall.xml    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/props/structures/ptolemies/merchant_tent.xml b/binaries/data/mods/public/art/actors/props/structures/ptolemies/merchant_tent.xml
index 6b10884346..e13ac935c8 100644
--- a/binaries/data/mods/public/art/actors/props/structures/ptolemies/merchant_tent.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/ptolemies/merchant_tent.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="stall_big_cloth full playercolor">
-      <mesh>structural/ptol_ship_merchant_tent</mesh>
+      <mesh>structural/ptol_ship_merchant_tent.dae</mesh>
       <textures>
        <texture file="props/stall_big_cloth.png" name="baseTex"/>
        <texture file="props/stall_big_cloth_norm.png" name="normTex"/>
@@ -12,7 +12,7 @@
       </textures>
     </variant>
     <variant frequency="1" name="stall_big_clothstripes1">
-      <mesh>structural/ptol_ship_merchant_tent</mesh>
+      <mesh>structural/ptol_ship_merchant_tent.dae</mesh>
       <textures>
        <texture file="props/stall_big_stripe_a_cloth.png" name="baseTex"/>
        <texture file="props/stall_big_cloth_norm.png" name="normTex"/>
@@ -21,7 +21,7 @@
       </textures>
     </variant>    
     <variant frequency="1" name="stall_big_cloth stripes2">
-      <mesh>structural/ptol_ship_merchant_tent</mesh>
+      <mesh>structural/ptol_ship_merchant_tent.dae</mesh>
       <textures>
        <texture file="props/stall_big_stripe_b_cloth.png" name="baseTex"/>
        <texture file="props/stall_big_cloth_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/dock.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/dock.xml
index 11af4cc170..caec759494 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/dock.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/dock.xml
@@ -34,7 +34,7 @@
         <prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
         <prop actor="props/special/eyecandy/wood_pile_1_c.xml" attachpoint="wood1"/>
-        <prop actor="props/special/eyecandy/wood_pile_2_c.xml" attachpoint="wood2"/>        
+        <prop actor="props/special/eyecandy/wood_pile_1_c.xml" attachpoint="wood2"/>        
         <prop actor="props/structures/ptolemies/dock_cloth.xml" attachpoint="root"/>        
         <prop actor="props/structures/ptolemies/dock_roof.xml" attachpoint="root"/>
         <prop actor="props/structures/ptolemies/dock_scaffold.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/house.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/house.xml
index 82f8cdaccd..5146a6c22d 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/house.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/house.xml
@@ -63,7 +63,7 @@
 	  </textures>
     </variant>
     <variant frequency="1" name="House F">
-      <mesh>structural/ptol_house_f.e</mesh>
+      <mesh>structural/ptol_house_f.dae</mesh>
       <props>
         <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/wall.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/wall.xml
index c6c9f9a795..61c20a70d4 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/wall.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/wall.xml
@@ -4,7 +4,7 @@
   <group>
     <variant frequency="100" name="Base">
       <mesh>structural/ptol_wall_medium.dae</mesh>
-      <textures><texture file="structural/ptol_struct.dds" name="baseTex"/></textures>
+      <textures><texture file="structural/ptol_struct.png" name="baseTex"/></textures>
     </variant>
   </group>
   <group>