Ticket #1928: v2_escape_cancel.diff

0ad/binaries/data/config/default.cfg

@@ -207 +207 @@
 hotkey.selection.add = Shift                ; Add units to selection
 hotkey.selection.milonly = Alt              ; Add only military units to selection
 hotkey.selection.remove = Ctrl              ; Remove units from selection
+hotkey.selection.cancel = Esc               ; Un-select all units and cancel building placement
 hotkey.selection.idleworker = Period        ; Select next idle worker
 hotkey.selection.idlewarrior = Comma        ; Select next idle warrior
 hotkey.selection.offscreen = Alt            ; Include offscreen units in selection

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

@@ -1036 +1036 @@
         recalculateStatusBarDisplay();
     }
 
+    if (ev.hotkey == "selection.cancel")
+    {
+        inputState = INPUT_NORMAL;
+        preSelectedAction = ACTION_NONE;
+        g_Selection.reset();
+        placementSupport.Reset();
+    }
     // State-machine processing:
 
     switch (inputState)