diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 7c4b135ca5..3ea4d15cd6 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -299,7 +299,6 @@
-
diff --git a/OpenRA.Mods.Common/Traits/Player/InsufficientFundsWarning.cs b/OpenRA.Mods.Common/Traits/Player/InsufficientFundsWarning.cs
deleted file mode 100644
index b76a5d50c3..0000000000
--- a/OpenRA.Mods.Common/Traits/Player/InsufficientFundsWarning.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.Common.Traits
-{
- [Desc("Provides the player with an audible warning when they run out of money while producing.")]
- public class InsufficientFundsWarningInfo : ITraitInfo, Requires
- {
- [Desc("The speech to play for the warning.")]
- public readonly string Notification = "InsufficientFunds";
-
- public object Create(ActorInitializer init) { return new InsufficientFundsWarning(this); }
- }
-
- public class InsufficientFundsWarning : INotifyInsufficientFunds
- {
- readonly InsufficientFundsWarningInfo info;
-
- bool played;
-
- public InsufficientFundsWarning(InsufficientFundsWarningInfo info)
- {
- this.info = info;
- }
-
- void INotifyInsufficientFunds.InsufficientFunds(Actor self)
- {
- Game.RunAfterTick(() =>
- {
- if (played)
- return;
-
- played = true;
- var owner = self.Owner;
- Game.Sound.PlayNotification(self.World.Map.Rules, owner, "Speech", info.Notification, owner.Faction.InternalName);
- });
- }
-
- void INotifyInsufficientFunds.SufficientFunds(Actor self)
- {
- played = false;
- }
- }
-}
diff --git a/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs b/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
index b3cb6df09f..197c11eebe 100644
--- a/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
+++ b/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
@@ -415,12 +415,8 @@ namespace OpenRA.Mods.Common.Traits
public bool Started { get; private set; }
public int Slowdown { get; private set; }
- readonly INotifyInsufficientFunds[] insufficientFunds;
- readonly Player owner;
readonly PowerManager pm;
- bool insufficientFundsPlayed;
-
public ProductionItem(ProductionQueue queue, string item, int cost, PowerManager pm, Action onComplete)
{
Item = item;
@@ -429,8 +425,6 @@ namespace OpenRA.Mods.Common.Traits
OnComplete = onComplete;
Queue = queue;
this.pm = pm;
- owner = queue.Actor.Owner;
- insufficientFunds = owner.PlayerActor.TraitsImplementing().ToArray();
}
public void Tick(PlayerResources pr)
@@ -441,13 +435,6 @@ namespace OpenRA.Mods.Common.Traits
if (time > 0)
RemainingTime = TotalTime = time;
- // Don't play a QueuedAudio notification when we can't start building (because we don't have the money to)
- // Also don't play it when the time to build is actually 0 (i.e. normally dev cheats)
- // to prevent overlapping with the ReadyAudio notification
- var initialCost = RemainingCost / RemainingTime;
- if (time != 0 && initialCost != 0 && pr.Cash + pr.Resources > initialCost)
- Game.Sound.PlayNotification(owner.World.Map.Rules, owner, "Speech", Queue.Info.QueuedAudio, owner.Faction.InternalName);
-
Started = true;
}
@@ -472,22 +459,7 @@ namespace OpenRA.Mods.Common.Traits
var costThisFrame = RemainingCost / RemainingTime;
if (costThisFrame != 0 && !pr.TakeCash(costThisFrame))
- {
- if (!insufficientFundsPlayed)
- {
- insufficientFundsPlayed = true;
- foreach (var funds in insufficientFunds)
- funds.InsufficientFunds(owner.PlayerActor);
- }
-
return;
- }
-
- if (insufficientFundsPlayed)
- insufficientFundsPlayed = false;
-
- foreach (var funds in insufficientFunds)
- funds.SufficientFunds(owner.PlayerActor);
RemainingCost -= costThisFrame;
RemainingTime -= 1;
diff --git a/OpenRA.Mods.Common/TraitsInterfaces.cs b/OpenRA.Mods.Common/TraitsInterfaces.cs
index 7b355fb53c..a996d6e76a 100644
--- a/OpenRA.Mods.Common/TraitsInterfaces.cs
+++ b/OpenRA.Mods.Common/TraitsInterfaces.cs
@@ -124,11 +124,4 @@ namespace OpenRA.Mods.Common.Traits
bool AdjacentWallCanConnect(Actor self, CPos wallLocation, string wallType, out CVec facing);
void SetDirty();
}
-
- [RequireExplicitImplementation]
- interface INotifyInsufficientFunds
- {
- void InsufficientFunds(Actor self);
- void SufficientFunds(Actor self);
- }
}
diff --git a/OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs b/OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
index 0801a934b2..0f4661ff84 100644
--- a/OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
@@ -233,6 +233,7 @@ namespace OpenRA.Mods.Common.Widgets
{
// Queue a new item
Game.Sound.Play(TabClick);
+ Game.Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Speech", CurrentQueue.Info.QueuedAudio, World.LocalPlayer.Faction.InternalName);
World.IssueOrder(Order.StartProduction(CurrentQueue.Actor, icon.Name, handleCount));
return true;
}
diff --git a/mods/d2k/rules/player.yaml b/mods/d2k/rules/player.yaml
index 807fd19362..a0b685fe5a 100644
--- a/mods/d2k/rules/player.yaml
+++ b/mods/d2k/rules/player.yaml
@@ -86,4 +86,3 @@ Player:
GlobalUpgradeManager:
ResourceStorageWarning:
AdviceInterval: 26
- InsufficientFundsWarning:
diff --git a/mods/ra/rules/player.yaml b/mods/ra/rules/player.yaml
index d442ad4cf5..83a167a67d 100644
--- a/mods/ra/rules/player.yaml
+++ b/mods/ra/rules/player.yaml
@@ -72,4 +72,3 @@ Player:
Image: iconchevrons
Sequence: veteran
ResourceStorageWarning:
- InsufficientFundsWarning:
diff --git a/mods/ts/rules/player.yaml b/mods/ts/rules/player.yaml
index 7cffe960e3..2831adf368 100644
--- a/mods/ts/rules/player.yaml
+++ b/mods/ts/rules/player.yaml
@@ -51,4 +51,3 @@ Player:
PlayerStatistics:
PlaceBeacon:
ResourceStorageWarning:
- InsufficientFundsWarning: