Ticket #3730: t3730_show_rallypoints_to_observers_v1.patch

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

@@ -234 +234 @@
     "resetselectionpannel": function(notification, player)
     {
         if (player != Engine.GetPlayerID())
             return;
         g_Selection.rebuildSelection({});
+    },
+    "set-rallypoint": function(notification, player)
+    {
+        // GUI update needed in case another client sent the command
+        // (change-perspective, control-all-units or observer)
+        Engine.GuiInterfaceCall("DisplayRallyPoint", {
+            "entities": notification.entities,
+            "x": notification.x,
+            "z": notification.z,
+            "queued": notification.queued,
+            "isObserver": g_IsObserver
+        });
+        Engine.GuiInterfaceCall("DisplayRallyPoint", { "entities": g_Selection.toList(), "isObserver": g_IsObserver });
+    },
+    "unset-rallypoint": function(notification, player)
+    {
+        Engine.GuiInterfaceCall("DisplayRallyPoint", { "entities": g_Selection.toList(), "isObserver": g_IsObserver });
     }
 };
 
 /**
  * Loads all known cheat commands.

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

@@ -441 +441 @@
         g_Selection.dirty = false;
 
         onSimulationUpdate();
 
         // Display rally points for selected buildings
-        if (!g_IsObserver)
-            Engine.GuiInterfaceCall("DisplayRallyPoint", { "entities": g_Selection.toList() });
+        Engine.GuiInterfaceCall("DisplayRallyPoint", { "entities": g_Selection.toList(), "isObserver": g_IsObserver });
     }
 
     updateTimers();
 
     updateMenuPosition(tickLength);

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

@@ -890 +890 @@
         if (!cmpRallyPoint)
             continue;
 
         // Verify the owner
         let cmpOwnership = Engine.QueryInterface(ent, IID_Ownership);
-        if (!(cmpPlayer && cmpPlayer.CanControlAllUnits()))
+        if (!cmd.isObserver && !(cmpPlayer && cmpPlayer.CanControlAllUnits()))
             if (!cmpOwnership || cmpOwnership.GetOwner() != player)
                 continue;
 
         // If the command was passed an explicit position, use that and
         // override the real rally point position; otherwise use the real position

binaries/data/mods/public/simulation/helpers/Commands.js

@@ -393 +393 @@
 
                 cmpRallyPoint.AddPosition(cmd.x, cmd.z);
                 cmpRallyPoint.AddData(cmd.data);
             }
         }
+
+        var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+        cmpGuiInterface.PushNotification({
+            "type": "set-rallypoint",
+            "players": [player],
+            "entities": cmd.entities,
+            "x": cmd.x,
+            "z": cmd.z,
+            "queued": cmd.queued
+        });
     },
 
     "unset-rallypoint": function(player, cmd, data)
     {
         for each (var ent in data.entities)
         {
             var cmpRallyPoint = Engine.QueryInterface(ent, IID_RallyPoint);
             if (cmpRallyPoint)
                 cmpRallyPoint.Reset();
         }
+
+        var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+        cmpGuiInterface.PushNotification({
+            "type": "unset-rallypoint",
+            "players": [player],
+            "entities": data.entities
+        });
     },
 
     "defeat-player": function(player, cmd, data)
     {
         // Send "OnPlayerDefeated" message to player