Ticket #1839: tribute-insufficient-resources.patch

simulation/components/Player.js

@@ -533 +533 @@
     if (this.state != "active" || cmpPlayer.state != "active")
         return;
 
-    if (!this.GetNeededResources(amounts))
+    if (this.TrySubtractResources(amounts))
     {
-        for (var type in amounts)
-            this.resourceCount[type] -= amounts[type];
-
         cmpPlayer.AddResources(amounts);
-
+        
         var total = Object.keys(amounts).reduce(function (sum, type){ return sum + amounts[type]; }, 0);
         var cmpOurStatisticsTracker = QueryPlayerIDInterface(this.playerID, IID_StatisticsTracker);
         if (cmpOurStatisticsTracker)
@@ -549 +546 @@
             cmpTheirStatisticsTracker.IncreaseTributesReceivedCounter(total);
         // TODO: notify the receiver
     }
-    // else not enough resources... TODO: send gui notification
 };
 
 Engine.RegisterComponentType(IID_Player, "Player", Player);