Changeset 10140 for ps

Timestamp:

08/31/11 00:29:03 (13 years ago)

Author:

ben

Message:

Fixes promoted entities dropping from control groups, based on patch from gruby. Fixes #859.

Location:

ps/trunk/binaries/data/mods/public

Files:

• gui/session/selection.js (modified) (3 diffs)
• gui/session/session.js (modified) (1 diff)
• simulation/components/GuiInterface.js (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/gui/session/selection.js

@@ -234 +234 @@
 
 /**
- * Update selection if some selected entities was renamed
+ * Update selection if some selected entities were renamed
  * (in case of unit promotion or finishing building structure)
  */
 EntitySelection.prototype.checkRenamedEntities = function()
 {
-    var renamedEntities = Engine.GuiInterfaceCall("GetRenamedEntities", true);
+    var renamedEntities = Engine.GuiInterfaceCall("GetRenamedEntities");
     if (renamedEntities.length > 0)
     {
@@ -393 +393 @@
 EntityGroupsContainer.prototype.update = function()
 {
+    this.checkRenamedEntities();
     for each (var group in this.groups)
     {
@@ -408 +409 @@
 }
 
+/**
+ * Update control group if some entities in the group were renamed
+ * (in case of unit promotion or finishing building structure)
+ */
+EntityGroupsContainer.prototype.checkRenamedEntities = function()
+{
+    var renamedEntities = Engine.GuiInterfaceCall("GetRenamedEntities");
+    if (renamedEntities.length > 0)
+    {
+        for each (var group in this.groups)
+        {
+            var addToGroup = [];
+            for each (var renamedEntity in renamedEntities)
+            {
+                if (renamedEntity.entity in group.ents)
+                {
+                    group.removeEnt(renamedEntity.entity);
+                    addToGroup.push(renamedEntity.newentity);
+                }
+            }
+            group.add(addToGroup);
+        }
+    }
+}
+
 var g_Groups = new EntityGroupsContainer();

ps/trunk/binaries/data/mods/public/gui/session/session.js

@@ -180 +180 @@
     else
         getGUIObjectByName("resourcePop").textcolor = "white";
+        
+    // Clear renamed entities list
+    Engine.GuiInterfaceCall("ClearRenamedEntities", {});
 }
 

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

@@ -103 +103 @@
 };
 
-GuiInterface.prototype.GetRenamedEntities = function(player, clearList)
-{
-    var result = this.renamedEntities;
-    if (clearList)
-        this.renamedEntities = [];
-    return result;
+GuiInterface.prototype.GetRenamedEntities = function(player)
+{
+    return this.renamedEntities;
+};
+
+GuiInterface.prototype.ClearRenamedEntities = function(player)
+{
+    this.renamedEntities = [];
 };
 
@@ -669 +671 @@
     "GetExtendedSimulationState": 1,
     "GetRenamedEntities": 1,
+    "ClearRenamedEntities": 1,
     "GetEntityState": 1,
     "GetTemplateData": 1,