From 65f1427bf21c37ddffaf68c31332197f91789ceb Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Tue, 21 Jun 2011 20:35:19 +1200
Subject: [PATCH] Fix some other bogus bits in Bridge

---
 OpenRA.Mods.RA/Bridge.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Mods.RA/Bridge.cs b/OpenRA.Mods.RA/Bridge.cs
index 8cd5f6a62a..fc77ada57b 100644
--- a/OpenRA.Mods.RA/Bridge.cs
+++ b/OpenRA.Mods.RA/Bridge.cs
@@ -107,6 +107,10 @@ namespace OpenRA.Mods.RA
 					a => a.Key,
 					a => sprites[new TileReference<ushort,byte>(t.First, (byte)a.Value)]));
 			}
+
+			// Set the initial custom terrain types
+			foreach (var c in TileSprites[currentTemplate].Keys)
+				self.World.Map.CustomTerrain[c.X, c.Y] = GetTerrainType(c);
 		}
 		
 		public string GetTerrainType(int2 cell)
@@ -160,7 +164,7 @@ namespace OpenRA.Mods.RA
 			{
 				self.Kill(self); // this changes the damagestate
 			}
-
+			var oldTempate = currentTemplate;
 			var ds = Health.DamageState;
 			currentTemplate = (ds == DamageState.Dead && Info.DestroyedTemplate > 0) ? Info.DestroyedTemplate :
 							  (ds >= DamageState.Heavy && Info.DamagedTemplate > 0) ? Info.DamagedTemplate : Info.Template;
@@ -179,6 +183,9 @@ namespace OpenRA.Mods.RA
 					currentTemplate = Info.DestroyedPlusSouthTemplate;
 			}
 
+			if (currentTemplate == oldTempate)
+				return;
+
 			if (ds == DamageState.Dead && !dead)
 			{
 				dead = true;