epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some other bogus bits in Bridge

Browse Source
This commit is contained in:
Paul Chote
2011-06-21 20:35:19 +12:00
parent 5e220a9ac7
commit 65f1427bf2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/Bridge.cs
View File

@@ -107,6 +107,10 @@ namespace OpenRA.Mods.RA
a => a.Key, a => a.Key,
a => sprites[new TileReference<ushort,byte>(t.First, (byte)a.Value)])); 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) public string GetTerrainType(int2 cell)
@@ -160,7 +164,7 @@ namespace OpenRA.Mods.RA
{ {
self.Kill(self); // this changes the damagestate self.Kill(self); // this changes the damagestate
} }
var oldTempate = currentTemplate;
var ds = Health.DamageState; var ds = Health.DamageState;
currentTemplate = (ds == DamageState.Dead && Info.DestroyedTemplate > 0) ? Info.DestroyedTemplate : currentTemplate = (ds == DamageState.Dead && Info.DestroyedTemplate > 0) ? Info.DestroyedTemplate :
(ds >= DamageState.Heavy && Info.DamagedTemplate > 0) ? Info.DamagedTemplate : Info.Template; (ds >= DamageState.Heavy && Info.DamagedTemplate > 0) ? Info.DamagedTemplate : Info.Template;
@@ -179,6 +183,9 @@ namespace OpenRA.Mods.RA
currentTemplate = Info.DestroyedPlusSouthTemplate; currentTemplate = Info.DestroyedPlusSouthTemplate;
} }
if (currentTemplate == oldTempate)
return;
if (ds == DamageState.Dead && !dead) if (ds == DamageState.Dead && !dead)
{ {
dead = true; dead = true;