Ticket #963: training_queue.diff

TrainingQueue.js

@@ -349 +349 @@
         }
 
         var numSpawned = this.SpawnUnits(item.template, item.count, item.metadata);
-        if (numSpawned > 0)
+        if (numSpawned == item.count)
         {
-            // This could be only partially finised
+            // All entities spawned, this batch finished
             cmpPlayer.UnReservePopulationSlots(item.population * numSpawned);
-            item.count -= numSpawned;
-            Engine.PostMessage(this.entity, MT_TrainingQueueChanged, { });
-        }
-        
-        if (item.count == 0)
-        {
-            // All entities spawned, this batch finished
+            item.count = 0;
+
             time -= item.timeRemaining;
             this.queue.shift();
             // Unset flag that training queue is blocked
             cmpPlayer.UnBlockTrainingQueue();
             this.spawnNotified = false;
+            Engine.PostMessage(this.entity, MT_TrainingQueueChanged, { });
         }
+        
+        else if (numSpawned > 0)
+        {
+            // Only partially finished
+            cmpPlayer.UnReservePopulationSlots(item.population * numSpawned);
+            item.count -= numSpawned;
+            Engine.PostMessage(this.entity, MT_TrainingQueueChanged, { });
+        }
         else
         {
             // Some entities failed to spawn