Ticket #2117: rallypoint.diff

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

@@ -204 +204 @@
     if (!target)
     {
         if (action == "set-rallypoint" && haveRallyPoints)
-            return {"possible": true};
+            return {"possible": true, "cursor": "action-set-rally"};
         else if (action == "move" || action == "attack-move")
             return {"possible": true};
         else
@@ -233 +233 @@
         var enemyOwned = playerState.isEnemy[targetState.player];
         var gaiaOwned = (targetState.player == 0);
 
-        var cursor = "";
+        var cursor = "action-set-rally";
         var tooltip;
 
         // default to walking there
@@ -538 +538 @@
         else if (getActionInfo("attack", target).possible)
             return {"type": "attack", "cursor": "action-attack", "target": target};
         else if (getActionInfo("unset-rallypoint", target).possible)
-            return {"type": "unset-rallypoint"};
+            return {"type": "unset-rallypoint", "cursor": "action-unset-rally"};
         else if (getActionInfo("move", target).possible)
             return {"type": "move"};
     }
@@ -1420 +1420 @@
         return true;
 
     case "unset-rallypoint":
-        var target = Engine.GetTerrainAtScreenPoint(ev.x, ev.y);
         Engine.PostNetworkCommand({"type": "unset-rallypoint", "entities": selection});
         // Remove displayed rally point
         Engine.GuiInterfaceCall("DisplayRallyPoint", {

binaries/data/mods/public/art/textures/cursors/action-set-rally.txt

@@ +1 @@
+1 1

binaries/data/mods/public/art/textures/cursors/action-unset-rally.txt

@@ +1 @@
+1 1