From 8086433e2b6f80d873393b25e9f0e2d76237365a Mon Sep 17 00:00:00 2001
From: EmjeR <matthijs@wildfiregames.com>
Date: Thu, 2 Dec 2010 23:42:59 +0000
Subject: [PATCH] This was SVN commit r8767.

---
 .../props/structures/persians/trireme_oars.xml       |  2 +-
 .../art/actors/structures/carthaginians/trireme.xml  |  8 ++++----
 .../art/actors/structures/persians/trireme.xml       | 12 +++++++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/binaries/data/mods/internal/art/actors/props/structures/persians/trireme_oars.xml b/binaries/data/mods/internal/art/actors/props/structures/persians/trireme_oars.xml
index 6dc67d5a59..d439bfaee4 100644
--- a/binaries/data/mods/internal/art/actors/props/structures/persians/trireme_oars.xml
+++ b/binaries/data/mods/internal/art/actors/props/structures/persians/trireme_oars.xml
@@ -6,7 +6,7 @@
   <float/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <mesh>props/pers_tri_oars.dae</mesh>
       <texture>structural/pers_tri.dds</texture>
     </variant>
diff --git a/binaries/data/mods/internal/art/actors/structures/carthaginians/trireme.xml b/binaries/data/mods/internal/art/actors/structures/carthaginians/trireme.xml
index 5d7c11ae32..d8d41e2d4f 100644
--- a/binaries/data/mods/internal/art/actors/structures/carthaginians/trireme.xml
+++ b/binaries/data/mods/internal/art/actors/structures/carthaginians/trireme.xml
@@ -8,10 +8,10 @@
   <group>
     <variant frequency="100" name="Base">
       <mesh>structural/kart_tri.dae</mesh>
-      <!--<props>
-        <prop actor="props/structures/persians/trireme_oars.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/trireme_mast.xml" attachpoint="root"/>
-      </props>-->
+      <props>
+        <prop actor="props/structures/carthaginians/trireme_oars.xml" attachpoint="root"/>
+        <!--<prop actor="props/structures/persians/trireme_mast.xml" attachpoint="root"/>-->
+      </props>
       <texture>structural/plac_kart.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/internal/art/actors/structures/persians/trireme.xml b/binaries/data/mods/internal/art/actors/structures/persians/trireme.xml
index 398dd0266e..fc4353c024 100644
--- a/binaries/data/mods/internal/art/actors/structures/persians/trireme.xml
+++ b/binaries/data/mods/internal/art/actors/structures/persians/trireme.xml
@@ -5,12 +5,22 @@
   <group>
     <variant frequency="100" name="Base">
       <mesh>structural/pers_tri.dae</mesh>
+      <texture>structural/pers_tri.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="sail">
       <props>
         <prop actor="props/structures/persians/trireme_oars.xml" attachpoint="root"/>
         <prop actor="props/structures/persians/trireme_mast.xml" attachpoint="root"/>
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
       </props>
-      <texture>structural/pers_tri.dds</texture>
+    </variant>
+    <variant frequency="1" name="no-sail">
+      <props>
+        <prop actor="props/structures/persians/trireme_oars.xml" attachpoint="root"/>
+      </props>
     </variant>
   </group>
   <material>player_trans.xml</material>