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

Fixed bug in cash ticks, normal settings.

Browse Source 
No sound was heared when repairing buildings or on low power.
Fixed.
This commit is contained in:
Remco van der Zon
2012-05-06 12:37:16 +02:00
committed by Chris Forbes
parent 6c96a106e7
commit 8a08365666
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Traits/Player/PlayerResources.cs
View File

@@ -64,7 +64,7 @@ namespace OpenRA.Traits
readonly Player Owner; readonly Player Owner;
int AdviceInterval; int AdviceInterval;
int tickermod = 0; int cashtickallowed = 0;
public PlayerResources(Actor self, PlayerResourcesInfo info) public PlayerResources(Actor self, PlayerResourcesInfo info)
{ {
@@ -137,7 +137,10 @@ namespace OpenRA.Traits
public void Tick(Actor self) public void Tick(Actor self)
{ {
var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>(); var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
tickermod = (tickermod + 1) % 3;
if(cashtickallowed > 0) {
cashtickallowed = cashtickallowed - 1;
}
OreCapacity = self.World.ActorsWithTrait<IStoreOre>() OreCapacity = self.World.ActorsWithTrait<IStoreOre>()
.Where(a => a.Actor.Owner == Owner) .Where(a => a.Actor.Owner == Owner)
@@ -201,9 +204,10 @@ namespace OpenRA.Traits
var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>(); var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
if ( if (
Game.Settings.Sound.SoundCashTickType == SoundCashTicks.Extreme || Game.Settings.Sound.SoundCashTickType == SoundCashTicks.Extreme ||
(Game.Settings.Sound.SoundCashTickType == SoundCashTicks.Normal && tickermod == 0) (Game.Settings.Sound.SoundCashTickType == SoundCashTicks.Normal && cashtickallowed == 0)
) { ) {
Sound.PlayToPlayer(self.Owner, eva.CashTickDown); Sound.PlayToPlayer(self.Owner, eva.CashTickDown);
cashtickallowed = 3;
} }
} }