fix desync on destroying ore storage buildings

This commit is contained in:
Chris Forbes
2010-10-06 09:15:55 +13:00
parent 24f0c28f56
commit 18e965e5aa

View File

@@ -44,13 +44,13 @@ namespace OpenRA.Mods.RA
int Stored(Actor self) int Stored(Actor self)
{ {
return (int)(Player.GetSiloFullness() * Info.Capacity); return Info.Capacity * Player.Ore / Player.OreCapacity;
} }
public void Damaged(Actor self, AttackInfo e) public void Damaged(Actor self, AttackInfo e)
{ {
if (self.IsDead() && Player.GetSiloFullness() > 0) if (self.IsDead())
Player.TakeOre(Stored(self)); // Lose the stored ore Player.TakeOre(Stored(self)); // Lose the stored ore
} }
public IEnumerable<PipType> GetPips(Actor self) public IEnumerable<PipType> GetPips(Actor self)
@@ -60,6 +60,6 @@ namespace OpenRA.Mods.RA
? Info.PipColor : PipType.Transparent ); ? Info.PipColor : PipType.Transparent );
} }
public bool ShouldExplode(Actor self) { return Player.GetSiloFullness() > 0; } public bool ShouldExplode(Actor self) { return Stored(self) > 0; }
} }
} }