Changeset 10015 for ps

Timestamp:

08/16/11 06:44:15 (13 years ago)

Author:

ben

Message:

Moves build limits counter to BuildLimits component, to avoid some weirdness with BuildRestrictions for preview entities (caused some warnings in Atlas).

Location:

ps/trunk/binaries/data/mods/public/simulation/components

Files:

• BuildLimits.js (modified) (3 diffs)
• BuildRestrictions.js (modified) (1 diff)

ps/trunk/binaries/data/mods/public/simulation/components/BuildLimits.js

@@ -77 +77 @@
         if (this.count[category] >= this.count["CivilCentre"] * this.limit[category].LimitPerCivCentre)
         {
-            var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
             var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player); 
             var notification = {"player": cmpPlayer.GetPlayerID(), "message": category+" build limit of "+this.limit[category].LimitPerCivCentre+" per civil centre reached"};
@@ -88 +87 @@
     else if (this.count[category] >= this.limit[category])
     {
-        var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
-        var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player); 
+        var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player);
         var notification = {"player": cmpPlayer.GetPlayerID(), "message": category+" build limit of "+this.limit[category]+ " reached"};
         var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
@@ -100 +98 @@
 };
 
+BuildLimits.prototype.OnGlobalOwnershipChanged = function(msg)
+{
+    // This automatically updates build counts
+    var cmpBuildRestrictions = Engine.QueryInterface(msg.entity, IID_BuildRestrictions);
+    if (cmpBuildRestrictions)
+    {
+        var playerID = (Engine.QueryInterface(this.entity, IID_Player)).GetPlayerID();
+        if (msg.from == playerID)
+        {
+            this.DecrementCount(cmpBuildRestrictions.GetCategory());
+        }
+        if (msg.to == playerID)
+        {
+            this.IncrementCount(cmpBuildRestrictions.GetCategory());
+        }
+    }
+};
+
 Engine.RegisterComponentType(IID_BuildLimits, "BuildLimits", BuildLimits);

ps/trunk/binaries/data/mods/public/simulation/components/BuildRestrictions.js

@@ -72 +72 @@
 };
 
-BuildRestrictions.prototype.OnOwnershipChanged = function(msg)
-{
-    // This automatically updates building counts
-    if (this.template.Category)
-    {
-        if (msg.from != -1)
-        {
-            var fromPlayerBuildLimits = QueryPlayerIDInterface(msg.from, IID_BuildLimits);
-            fromPlayerBuildLimits.DecrementCount(this.template.Category);
-        }
-        if (msg.to != -1)
-        {
-            var toPlayerBuildLimits = QueryPlayerIDInterface(msg.to, IID_BuildLimits);
-            toPlayerBuildLimits.IncrementCount(this.template.Category); 
-        }
-    }
-};
-
 BuildRestrictions.prototype.CheckPlacement = function(player)
 {