Ticket #3215: t3215_fix_observer_statusbars.patch

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

@@ -809 +809 @@
 }
 
 // Toggles the display of status bars for all of the player's entities.
 function recalculateStatusBarDisplay()
 {
-    if (g_ShowAllStatusBars)
-        var entities = Engine.PickFriendlyEntitiesOnScreen(Engine.GetPlayerID());
+    if (g_IsObserver)
+    {
+        var entities = [];
+        var numPlayers = GetSimState().players.length;
+        for (let i = 1; i < numPlayers; ++i)
+            entities = entities.concat(Engine.GuiInterfaceCall("GetPlayerEntities", i));
+    }
     else
     {
-        var selected = g_Selection.toList();
-        for each (var ent in g_Selection.highlighted)
-            selected.push(ent);
-
-        // Remove selected entities from the 'all entities' array, to avoid disabling their status bars.
-        var entities = Engine.GuiInterfaceCall("GetPlayerEntities").filter(
-                function(idx) { return (selected.indexOf(idx) == -1); }
-        );
+        if (g_ShowAllStatusBars)
+            var entities = Engine.PickFriendlyEntitiesOnScreen(Engine.GetPlayerID());
+        else
+        {
+            // Get selected entities
+            var selected = g_Selection.toList();
+            for each (var ent in g_Selection.highlighted)
+                selected.push(ent);
+            
+            // Remove selected entities from the 'all entities' array, to avoid disabling their status bars.
+            entities = Engine.GuiInterfaceCall("GetPlayerEntities").filter(
+                    function(idx) { return (selected.indexOf(idx) == -1); }
+            );
+        }
     }
-
     Engine.GuiInterfaceCall("SetStatusBars", { "entities": entities, "enabled": g_ShowAllStatusBars });
 }
 
 // Update the additional list of entities to be highlighted.
 function updateAdditionalHighlight()

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

@@ -887 +887 @@
         if (cmpStatusBars)
             cmpStatusBars.RegenerateSprites();
     }
 };
 
-GuiInterface.prototype.GetPlayerEntities = function(player)
+// The player variable will be set to the current player ID automatically.
+// If you want the entity IDs of another player, use the specificPlayer argument.
+GuiInterface.prototype.GetPlayerEntities = function(player, specificPlayer)
 {
     var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
-    return cmpRangeManager.GetEntitiesByPlayer(player);
+    if (specificPlayer)
+        return cmpRangeManager.GetEntitiesByPlayer(specificPlayer);
+    else
+        return cmpRangeManager.GetEntitiesByPlayer(player);
 };
 
 /**
  * Displays the rally points of a given list of entities (carried in cmd.entities).
  *