From 3b120b0791924f28d80c8d88b31f4bcb9d931e92 Mon Sep 17 00:00:00 2001
From: Wijitmaker <jason@wildfiregames.com>
Date: Sat, 16 Apr 2005 03:00:18 +0000
Subject: [PATCH] pre-emptive fix for missing props for these 2 roman buildings

This was SVN commit r2138.
---
 .../art/actors/structures/rome_ho.xml         |   9 +-
 .../art/actors/structures/rome_mc.xml         | 100 +++++++++---------
 2 files changed, 53 insertions(+), 56 deletions(-)

diff --git a/binaries/data/mods/official/art/actors/structures/rome_ho.xml b/binaries/data/mods/official/art/actors/structures/rome_ho.xml
index f5c5d8e841..4fa9454700 100644
--- a/binaries/data/mods/official/art/actors/structures/rome_ho.xml
+++ b/binaries/data/mods/official/art/actors/structures/rome_ho.xml
@@ -35,12 +35,11 @@
         <prop actor="props/gaia/cypress_potted_a.xml" attachpoint="cypress_potted1"/>
         <prop actor="props/gaia/cypress_potted_b.xml" attachpoint="cypress_potted02"/>
         <prop actor="props/gaia/cypress_potted_a.xml" attachpoint="cypress_potted03"/>
-        <prop actor="props/romans/rome_ho3_vines.xml" attachpoint="r_ho3_vines"/>
         <prop actor="props/romans/rome_door_1.xml" attachpoint="door_top"/>
-        <prop actor="foliage/wrld_fol_grass6.xml" attachpoint="grass01"/>
-        <prop actor="foliage/wrld_fol_grass12.xml" attachpoint="grass02"/>
-        <prop actor="foliage/bush_highlands3.xml" attachpoint="grass03"/>
-        <prop actor="foliage/bush_highlands1.xml" attachpoint="grass04"/>
+        <prop actor="foliage/wrld_fol_grass.xml" attachpoint="grass01"/>
+        <prop actor="foliage/wrld_fol_grass.xml" attachpoint="grass02"/>
+        <prop actor="foliage/bush_highlands.xml" attachpoint="grass03"/>
+        <prop actor="foliage/bush_highlands.xml" attachpoint="grass04"/>
         <prop actor="props/shield/shld_rome_sm_11.xml" attachpoint="shield1"/>
         <prop actor="props/shield/shld_rome_sm_8.xml" attachpoint="shield2"/>
         <prop actor="props/eyecandy/rome_basket_e.xml" attachpoint="pot1"/>
diff --git a/binaries/data/mods/official/art/actors/structures/rome_mc.xml b/binaries/data/mods/official/art/actors/structures/rome_mc.xml
index 7161d1bd11..242f6d8786 100644
--- a/binaries/data/mods/official/art/actors/structures/rome_mc.xml
+++ b/binaries/data/mods/official/art/actors/structures/rome_mc.xml
@@ -1,51 +1,49 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-
-<!DOCTYPE Object SYSTEM "/art/actors/object.dtd">
-
-<!-- File automatically generated by ScEd -->
-<Object>
-	<Name>Rome Barracks</Name>
-	<ModelName>art/meshes/structural/rome_mc.pmd</ModelName>
-	<TextureName>art/textures/skins/structural/rome_struct_1.dds</TextureName>
-	<Properties
-		autoflatten="0"
-		castshadows="1"
-	></Properties>
-	<Props>
-		<Prop attachpoint="wheel1" model="props/eyecandy/wheel_laying.xml"> </Prop>
-		<Prop attachpoint="anvil" model="props/eyecandy/anvil.xml"> </Prop>
-		<Prop attachpoint="bench" model="props/eyecandy/bench_1.xml"> </Prop>
-		<Prop attachpoint="sack1" model="props/eyecandy/sack_1.xml"> </Prop>
-		<Prop attachpoint="sack2" model="props/eyecandy/sack_1.xml"> </Prop>
-		<Prop attachpoint="blocks_stack" model="props/eyecandy/blocks_granite_pile_b.xml"> </Prop>
-		<Prop attachpoint="vine" model="foliage/vines_1_a.xml"> </Prop>
-		<Prop attachpoint="cornerpost1" model="props/construct/corner_post_c.xml"> </Prop>
-		<Prop attachpoint="cornerpost2" model="props/construct/corner_post_a.xml"> </Prop>
-		<Prop attachpoint="wood_sm_pile1" model="props/eyecandy/wood_sm_pile_a.xml"> </Prop>
-		<Prop attachpoint="dummy" model="props/eyecandy/dummy_a.xml"> </Prop>
-		<Prop attachpoint="win_left1" model="props/romans/rome_window_mc.xml"> </Prop>
-		<Prop attachpoint="win_right_2" model="props/romans/rome_window_mc.xml"> </Prop>
-		<Prop attachpoint="win_right_1" model="props/romans/rome_window_mc.xml"> </Prop>
-		<Prop attachpoint="foliage1" model="foliage/wrld_fol_grass_crab1.xml"> </Prop>
-		<Prop attachpoint="vase_1" model="props/eyecandy/vase_rome_f.xml"> </Prop>
-		<Prop attachpoint="pot_2" model="props/eyecandy/basket_rome_c.xml"> </Prop>
-		<Prop attachpoint="pot_3" model="props/eyecandy/basket_rome_b.xml"> </Prop>
-		<Prop attachpoint="shield_la_1" model="props/shield/shld_rome_la_4.xml"> </Prop>
-		<Prop attachpoint="wood_sm_pile2" model="props/eyecandy/wood_sm_pile_b.xml"> </Prop>
-		<Prop attachpoint="pot_1" model="props/eyecandy/basket_rome_a.xml"> </Prop>
-		<Prop attachpoint="sword1" model="props/weapon/weap_gladus_d.xml"> </Prop>
-		<Prop attachpoint="sword2" model="props/weapon/weap_gladus_b.xml"> </Prop>
-		<Prop attachpoint="sword3" model="props/weapon/weap_gladus_c.xml"> </Prop>
-		<Prop attachpoint="sword6" model="props/weapon/weap_gladus_c.xml"> </Prop>
-		<Prop attachpoint="sword5" model="props/weapon/weap_gladus_f.xml"> </Prop>
-		<Prop attachpoint="sword4" model="props/weapon/weap_gladus_a.xml"> </Prop>
-		<Prop attachpoint="spear2" model="props/weapon/weap_spear_ball_e.xml"> </Prop>
-		<Prop attachpoint="spear1" model="props/weapon/weap_spear_b.xml"> </Prop>
-		<Prop attachpoint="sword2" model="props/weapon/weap_gladus_b.xml"> </Prop>
-		<Prop attachpoint="woodcord" model="props/eyecandy/woodcord.xml"> </Prop>
-		<Prop attachpoint="shield_sm_1" model="props/shield/shld_rome_sm_9.xml"> </Prop>
-		<Prop attachpoint="win_left2" model="props/romans/rome_window_mc.xml"> </Prop>
-		<Prop attachpoint="shield_sm_3" model="props/shield/shld_rome_sm_5.xml"> </Prop>
-		<Prop attachpoint="shld_sm_5" model="props/shield/shld_rome_sm_10.xml"> </Prop>
-	</Props>
-</Object>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/rome_mc.pmd</mesh>
+      <props>
+        <prop actor="props/eyecandy/wheel_laying.xml" attachpoint="wheel1"/>
+        <prop actor="props/eyecandy/anvil.xml" attachpoint="anvil"/>
+        <prop actor="props/eyecandy/bench_1.xml" attachpoint="bench"/>
+        <prop actor="props/eyecandy/sack_1.xml" attachpoint="sack1"/>
+        <prop actor="props/eyecandy/sack_1.xml" attachpoint="sack2"/>
+        <prop actor="props/eyecandy/blocks_granite_pile_b.xml" attachpoint="blocks_stack"/>
+        <prop actor="props/construct/corner_post_c.xml" attachpoint="cornerpost1"/>
+        <prop actor="props/construct/corner_post_a.xml" attachpoint="cornerpost2"/>
+        <prop actor="props/eyecandy/wood_sm_pile_a.xml" attachpoint="wood_sm_pile1"/>
+        <prop actor="props/eyecandy/dummy_a.xml" attachpoint="dummy"/>
+        <prop actor="props/romans/rome_window_mc.xml" attachpoint="win_left1"/>
+        <prop actor="props/romans/rome_window_mc.xml" attachpoint="win_right_2"/>
+        <prop actor="props/romans/rome_window_mc.xml" attachpoint="win_right_1"/>
+        <prop actor="foliage/wrld_fol_grass_crab.xml" attachpoint="foliage1"/>
+        <prop actor="props/eyecandy/vase_rome_f.xml" attachpoint="vase_1"/>
+        <prop actor="props/eyecandy/basket_rome_c.xml" attachpoint="pot_2"/>
+        <prop actor="props/eyecandy/basket_rome_b.xml" attachpoint="pot_3"/>
+        <prop actor="props/shield/shld_rome_la_4.xml" attachpoint="shield_la_1"/>
+        <prop actor="props/eyecandy/wood_sm_pile_b.xml" attachpoint="wood_sm_pile2"/>
+        <prop actor="props/eyecandy/basket_rome_a.xml" attachpoint="pot_1"/>
+        <prop actor="props/weapon/weap_gladus_d.xml" attachpoint="sword1"/>
+        <prop actor="props/weapon/weap_gladus_b.xml" attachpoint="sword2"/>
+        <prop actor="props/weapon/weap_gladus_c.xml" attachpoint="sword3"/>
+        <prop actor="props/weapon/weap_gladus_c.xml" attachpoint="sword6"/>
+        <prop actor="props/weapon/weap_gladus_f.xml" attachpoint="sword5"/>
+        <prop actor="props/weapon/weap_gladus_a.xml" attachpoint="sword4"/>
+        <prop actor="props/weapon/weap_spear_ball_e.xml" attachpoint="spear2"/>
+        <prop actor="props/weapon/weap_spear_b.xml" attachpoint="spear1"/>
+        <prop actor="props/weapon/weap_gladus_b.xml" attachpoint="sword2"/>
+        <prop actor="props/eyecandy/woodcord.xml" attachpoint="woodcord"/>
+        <prop actor="props/shield/shld_rome_sm_9.xml" attachpoint="shield_sm_1"/>
+        <prop actor="props/romans/rome_window_mc.xml" attachpoint="win_left2"/>
+        <prop actor="props/shield/shld_rome_sm_5.xml" attachpoint="shield_sm_3"/>
+        <prop actor="props/shield/shld_rome_sm_10.xml" attachpoint="shld_sm_5"/>
+      </props>
+      <texture>structural/rome_struct_1.dds</texture>
+    </variant>
+  </group>
+
+</actor>