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

Merge the two DamageState types

Browse Source
This commit is contained in:
Paul Chote
2010-07-30 21:26:46 +12:00
parent 41c0d175bd
commit 028c5b5201
19 changed files with 37 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,19 +58,19 @@ namespace OpenRA.Mods.RA.Render
public virtual void Damaged(Actor self, AttackInfo e)
{
if (!e.DamageStateChanged)
if (!e.ExtendedDamageStateChanged)
return;
switch( e.DamageState )
switch( e.ExtendedDamageState )
{
case DamageState.Normal:
case ExtendedDamageState.ThreeQuarter: case ExtendedDamageState.Normal: case ExtendedDamageState.Undamaged:
anim.ReplaceAnim("idle");
break;
case DamageState.Half:
case ExtendedDamageState.Half: case ExtendedDamageState.Quarter:
anim.ReplaceAnim("damaged-idle");
Sound.Play(self.Info.Traits.Get<BuildingInfo>().DamagedSound, self.CenterLocation);
break;
case DamageState.Dead:
case ExtendedDamageState.Dead:
self.World.AddFrameEndTask(w => w.Add(new Explosion(w, self.CenterLocation.ToInt2(), "building", false)));
break;
}

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

@@ -31,15 +31,15 @@ namespace OpenRA.Mods.RA.Render
public override void Damaged(Actor self, AttackInfo e)
{
if (!e.DamageStateChanged) return;
if (!e.ExtendedDamageStateChanged) return;
switch (e.DamageState)
switch( e.ExtendedDamageState )
{
case DamageState.Normal:
anim.Play( "idle" );
case ExtendedDamageState.ThreeQuarter: case ExtendedDamageState.Normal: case ExtendedDamageState.Undamaged:
anim.ReplaceAnim("idle");
break;
case DamageState.Half:
anim.Play( "damaged-idle" );
case ExtendedDamageState.Half: case ExtendedDamageState.Quarter:
anim.ReplaceAnim("damaged-idle");
Sound.Play(self.Info.Traits.Get<BuildingInfo>().DamagedSound, self.CenterLocation);
break;
}

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

@@ -53,13 +53,14 @@ namespace OpenRA.Mods.RA.Render
public void Damaged(Actor self, AttackInfo e)
{
if (!e.DamageStateChanged) return;
switch (e.DamageState)
if (!e.ExtendedDamageStateChanged) return;
switch( e.ExtendedDamageState )
{
case DamageState.Normal:
case ExtendedDamageState.ThreeQuarter: case ExtendedDamageState.Normal: case ExtendedDamageState.Undamaged:
roof.ReplaceAnim(roof.CurrentSequence.Name.Replace("damaged-",""));
break;
case DamageState.Half:
case ExtendedDamageState.Half: case ExtendedDamageState.Quarter:
roof.ReplaceAnim("damaged-" + roof.CurrentSequence.Name);
break;
}

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

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.RA.Render
public void Damaged(Actor self, AttackInfo e)
{
if (e.DamageState == DamageState.Dead)
if (e.ExtendedDamageState == ExtendedDamageState.Dead)
{
var death = e.Warhead != null ? e.Warhead.InfDeath : 0;
Sound.PlayVoice("Die", self);

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.Half) return;
if (e.ExtendedDamageState > ExtendedDamageState.Half) return;
if (isSmoking) return;
isSmoking = true;