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

fix obvious failures.

Browse Source
This commit is contained in:
Chris Forbes
2010-08-26 19:53:21 +12:00
parent 739c38d3d8
commit ce0e671ac5
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Actor.cs
View File

@@ -111,6 +111,9 @@ namespace OpenRA
return null; return null;
if (!World.Map.IsInMap(xy.X, xy.Y)) if (!World.Map.IsInMap(xy.X, xy.Y))
return null;
if (Destroyed)
return null; return null;
var underCursor = World.FindUnitsAtMouse(mi.Location) var underCursor = World.FindUnitsAtMouse(mi.Location)

1
OpenRA.Game/GameRules/WeaponInfo.cs
View File

@@ -65,6 +65,7 @@ namespace OpenRA.GameRules
public Target target; public Target target;
public int2 dest; public int2 dest;
public int destAltitude; public int destAltitude;
public float firepowerModifier = 1.0f;
} }
public interface IProjectileInfo { IEffect Create(ProjectileArgs args); } public interface IProjectileInfo { IEffect Create(ProjectileArgs args); }

12
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -38,17 +38,19 @@ namespace OpenRA.Orders
public void RenderBeforeWorld(World world) public void RenderBeforeWorld(World world)
{ {
foreach (var a in world.Selection.Actors) foreach (var a in world.Selection.Actors)
foreach (var t in a.TraitsImplementing<IPreRenderSelection>()) if (!a.Destroyed)
t.RenderBeforeWorld(a); foreach (var t in a.TraitsImplementing<IPreRenderSelection>())
t.RenderBeforeWorld(a);
Game.Renderer.Flush(); Game.Renderer.Flush();
} }
public void RenderAfterWorld( World world ) public void RenderAfterWorld( World world )
{ {
foreach (var a in world.Selection.Actors) foreach (var a in world.Selection.Actors)
foreach (var t in a.TraitsImplementing<IPostRenderSelection>()) if (!a.Destroyed)
t.RenderAfterWorld(a); foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
t.RenderAfterWorld(a);
Game.Renderer.Flush(); Game.Renderer.Flush();
} }

4
OpenRA.Mods.RA/AttackBase.cs
View File

@@ -144,6 +144,10 @@ namespace OpenRA.Mods.RA
facing = barrel.Facing + facing = barrel.Facing +
(self.HasTrait<Turreted>() ? self.Trait<Turreted>().turretFacing : (self.HasTrait<Turreted>() ? self.Trait<Turreted>().turretFacing :
facing != null ? facing.Facing : Util.GetFacing(target.CenterLocation - self.CenterLocation, 0)), facing != null ? facing.Facing : Util.GetFacing(target.CenterLocation - self.CenterLocation, 0)),
firepowerModifier = self.TraitsImplementing<IFirepowerModifier>()
.Select(a => a.GetFirepowerModifier())
.Product()
}; };
ScheduleDelayedAction( FireDelay( self, self.Info.Traits.Get<AttackBaseInfo>() ), () => ScheduleDelayedAction( FireDelay( self, self.Info.Traits.Get<AttackBaseInfo>() ), () =>

7
OpenRA.Mods.RA/Combat.cs
View File

@@ -70,11 +70,6 @@ namespace OpenRA.Mods.RA
if (warhead.Ore) if (warhead.Ore)
world.WorldActor.Trait<ResourceLayer>().Destroy(targetTile); world.WorldActor.Trait<ResourceLayer>().Destroy(targetTile);
var firepowerModifier = args.firedBy
.TraitsImplementing<IFirepowerModifier>()
.Select(a => a.GetFirepowerModifier())
.Product();
switch (warhead.DamageModel) switch (warhead.DamageModel)
{ {
case DamageModel.Normal: case DamageModel.Normal:
@@ -84,7 +79,7 @@ namespace OpenRA.Mods.RA
foreach (var victim in hitActors) foreach (var victim in hitActors)
{ {
var damage = (int)GetDamageToInflict(victim, args, warhead, firepowerModifier); var damage = (int)GetDamageToInflict(victim, args, warhead, args.firepowerModifier);
victim.InflictDamage(args.firedBy, damage, warhead); victim.InflictDamage(args.firedBy, damage, warhead);
} }
} break; } break;