Removed the gaia_ designation from gaia entities, at Jason's request.

This was SVN commit r3254.

binaries/data/mods/official/art/actors/units/hellenes/themistocles.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/dudeidle.psa" name="Idle" speed="200"/>
+        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
+        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
+        <animation file="biped/dudechop.psa" name="Chop" speed="150"/>
+        <animation file="biped/dudedeath_sword.psa" name="Death" speed="200"/>
+        <animation file="biped/dudedecay_sword.psa" name="Decay" speed="100"/>
+        <animation event="0.5" file="biped/inf_sword_shield_atk_a.psa" name="Attack" speed="100"/>
+        <animation event="0.5" file="biped/inf_sword_shield_atk_b.psa" name="Attack" speed="100"/>
+        <animation event="0.5" file="biped/inf_sword_shield_atk_c.psa" name="Attack" speed="100"/>
+      </animations>
+      <mesh>skeletal/m_tunic_b.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/hele_thermistocles.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/xiphos_alexander.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/hele_round_thermistocles.xml" attachpoint="shield"/>
+      </props>
+      <texture>skeletal/hele_themistocles.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>

binaries/data/mods/official/maps/random/cantabrian_highlands.js

@@ -7,7 +7,7 @@ const NUM_PLAYERS = 4;
 const tGrass = ["grass1_a", "grass_highlands_a", "grass1_a"];
 const tGrassForest = "grass_forest_floor_oak";
 const tCliff = ["cliff_greekb", "cliff_greekb", "cliff_greekb_moss"];
-const tForest = "forrestfloor|gaia_flora_oak";
+const tForest = "forrestfloor|flora_tree_oak";
 const tGrassDirt75 = "sand_grass_75";
 const tGrassDirt50 = "sand_grass_50";
 const tGrassDirt25 = "sand_grass_25";
@@ -17,12 +17,12 @@ const tShore = "sand_path";
 const tShoreBlend = "sand_grass_50";
 const tWater = "sand_path";
 
-const oTree = "gaia_flora_oak";
+const oTree = "flora_tree_oak";
 const oTreeLarge = "flora/trees/oak_large.xml";
-const oBerryBush = "gaia_flora_bush_berry";
-const oSheep = "gaia_fauna_sheep";
-const oDeer = "gaia_fauna_deer";
-const oMine = "gaia_rock_light";
+const oBerryBush = "flora_bush_berry";
+const oSheep = "fauna_sheep";
+const oDeer = "fauna_deer";
+const oMine = "geology_stone_light";
 const oGrass = "props/flora/grass_field_lush_tall.xml";
 const oGrassShort = "props/flora/grass_field_lush_short.xml";
 const oReeds = "props/flora/reeds_pond_dry.xml";

binaries/data/mods/official/maps/random/neareastern_badlands.js

@@ -18,11 +18,11 @@ const tWater = "water_2";
 const tWaterDeep = "water_3";
 
 const oTree = "flora/trees/palm_b.xml";
-const oBerryBush = "gaia_flora_bush_berry";
+const oBerryBush = "flora_bush_berry";
 const oBush = "props/flora/bush_dry_a.xml";
-const oSheep = "gaia_fauna_sheep";
-const oDeer = "gaia_fauna_deer";
-const oMine = "gaia_rock_light";
+const oSheep = "fauna_sheep";
+const oDeer = "fauna_deer";
+const oMine = "geology_stone_light";
 const oDecorativeRock = "geology/gray1.xml";
 
 // some utility functions to save typing