# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1547068786 -3600
# Node ID 1b97bc7de9368ef97ac0f2b6741f69e128c04728
# Parent  e1ae6d8e84b0690f091e53cdb7d1018e527cc8d9
Remove default keybinding for unselecting weapon

diff -r e1ae6d8e84b0 -r 1b97bc7de936 ChangeLog.txt
--- a/ChangeLog.txt	Wed Jan 09 22:09:27 2019 +0100
+++ b/ChangeLog.txt	Wed Jan 09 22:19:46 2019 +0100
@@ -14,7 +14,7 @@
  + The Specialists: Unlock game scheme
  + The Specialists: Add script parameter support to set custom specialists order
  + Display player name of own teams in online games
- + Add control to unselect current weapon (default: X)
+ + Add control to unselect current weapon (no key chosen by default)
  * Use player-chosen team identity in campaigns and singleplayer missions
  * Fix last 2 characters in demo chat being missing
  * Fix homing bee flying weird if passing wrap world edge or target was placed beyond it
diff -r e1ae6d8e84b0 -r 1b97bc7de936 QTfrontend/binds.cpp
--- a/QTfrontend/binds.cpp	Wed Jan 09 22:09:27 2019 +0100
+++ b/QTfrontend/binds.cpp	Wed Jan 09 22:19:46 2019 +0100
@@ -39,7 +39,7 @@
     {"slot 8",    "f8",         QT_TRANSLATE_NOOP("binds", "slot 8"),          NULL, NULL},
     {"slot 9",    "f9",         QT_TRANSLATE_NOOP("binds", "slot 9"),          NULL, NULL},
     {"slot :",    "f10",        QT_TRANSLATE_NOOP("binds", "slot 10"),         NULL, NULL},
-    {"setweap ~", "x",          QT_TRANSLATE_NOOP("binds", "unselect weapon"), NULL, NULL},
+    {"setweap ~", "none",       QT_TRANSLATE_NOOP("binds", "unselect weapon"), NULL, NULL},
     {"timer 1",   "1",          QT_TRANSLATE_NOOP("binds", "timer 1 sec"),     NULL, QT_TRANSLATE_NOOP("binds (descriptions)", "Set the timer on bombs and timed weapons:")},
     {"timer 2",   "2",          QT_TRANSLATE_NOOP("binds", "timer 2 sec"),     NULL, NULL},
     {"timer 3",   "3",          QT_TRANSLATE_NOOP("binds", "timer 3 sec"),     NULL, NULL},
diff -r e1ae6d8e84b0 -r 1b97bc7de936 README.md
--- a/README.md	Wed Jan 09 22:09:27 2019 +0100
+++ b/README.md	Wed Jan 09 22:19:46 2019 +0100
@@ -63,7 +63,6 @@
 * Tab: Switch hedgehog (after activating the utility)
 * 1-5: Set weapon timer
 * F1-F10: Weapon shortcuts
-* X: Unselect weapon
 * M: Mission panel / game mode information. Hold pressed to display, release to hide
 * P: Pause, when playing offline, toggle automatic turn skipping when online
 * Esc: Quit with prompt
diff -r e1ae6d8e84b0 -r 1b97bc7de936 hedgewars/uInputHandler.pas
--- a/hedgewars/uInputHandler.pas	Wed Jan 09 22:09:27 2019 +0100
+++ b/hedgewars/uInputHandler.pas	Wed Jan 09 22:19:46 2019 +0100
@@ -385,7 +385,6 @@
     RegisterBind(DefaultBinds, 'f12', 'fullscr');
 
     for i:= 1 to 10 do RegisterBind(DefaultBinds, 'f'+IntToStr(i), 'slot '+char(48+i));
-    RegisterBind(DefaultBinds, 'x', 'setweap ~');
     for i:= 1 to 5  do RegisterBind(DefaultBinds, IntToStr(i), 'timer '+IntToStr(i));
     RegisterBind(DefaultBinds, _S'n', 'timer_u');