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

Correct the ordering on DamageState

Browse Source
This commit is contained in:
Paul Chote
2010-07-30 22:02:19 +12:00
parent 4cf0610fd9
commit 8528c5d3a3
12 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.RA/Render/RenderBuilding.cs
View File

@@ -61,19 +61,15 @@ namespace OpenRA.Mods.RA.Render
if (!e.DamageStateChanged)
return;
switch( e.DamageState )
if (e.DamageState == DamageState.Dead)
self.World.AddFrameEndTask(w => w.Add(new Explosion(w, self.CenterLocation.ToInt2(), "building", false)));
else if (e.DamageState >= DamageState.Heavy)
{
case DamageState.Medium: case DamageState.Light: case DamageState.Undamaged:
anim.ReplaceAnim("idle");
break;
case DamageState.Heavy: case DamageState.Critical:
anim.ReplaceAnim("damaged-idle");
Sound.Play(self.Info.Traits.Get<BuildingInfo>().DamagedSound, self.CenterLocation);
break;
case DamageState.Dead:
self.World.AddFrameEndTask(w => w.Add(new Explosion(w, self.CenterLocation.ToInt2(), "building", false)));
break;
anim.ReplaceAnim("damaged-idle");
Sound.Play(self.Info.Traits.Get<BuildingInfo>().DamagedSound, self.CenterLocation);
}
else
anim.ReplaceAnim("idle");
}
public void Selling( Actor self )

13
OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs
View File

@@ -33,16 +33,13 @@ namespace OpenRA.Mods.RA.Render
{
if (!e.DamageStateChanged) return;
switch( e.DamageState )
if (e.DamageState >= DamageState.Heavy)
{
case DamageState.Medium: case DamageState.Light: case DamageState.Undamaged:
anim.ReplaceAnim("idle");
break;
case DamageState.Heavy: case DamageState.Critical:
anim.ReplaceAnim("damaged-idle");
Sound.Play(self.Info.Traits.Get<BuildingInfo>().DamagedSound, self.CenterLocation);
break;
anim.ReplaceAnim("damaged-idle");
Sound.Play(self.Info.Traits.Get<BuildingInfo>().DamagedSound, self.CenterLocation);
}
else
anim.ReplaceAnim("idle");
}
}
}

15
OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA.Render
string GetPrefix(Actor self)
{
return self.GetDamageState() <= DamageState.Heavy ? "damaged-" : "";
return self.GetDamageState() >= DamageState.Heavy ? "damaged-" : "";
}
public RenderWarFactory(Actor self)
@@ -55,15 +55,10 @@ namespace OpenRA.Mods.RA.Render
{
if (!e.DamageStateChanged) return;
switch( e.DamageState )
{
case DamageState.Medium: case DamageState.Light: case DamageState.Undamaged:
roof.ReplaceAnim(roof.CurrentSequence.Name.Replace("damaged-",""));
break;
case DamageState.Heavy: case DamageState.Critical:
roof.ReplaceAnim("damaged-" + roof.CurrentSequence.Name);
break;
}
if (e.DamageState >= DamageState.Heavy)
roof.ReplaceAnim("damaged-" + roof.CurrentSequence.Name);
else
roof.ReplaceAnim(roof.CurrentSequence.Name.Replace("damaged-",""));
}
public void UnitProduced(Actor self, Actor other)

2
OpenRA.Mods.RA/Render/RenderUnit.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA.Render
public void Damaged(Actor self, AttackInfo e)
{
if (e.DamageState > DamageState.Heavy) return;
if (e.DamageState < DamageState.Heavy) return;
if (isSmoking) return;
isSmoking = true;