From bf5a04be18f2b16b8a565acff4baabc5fbfed293 Mon Sep 17 00:00:00 2001 From: andy5995 Date: Sun, 28 Jan 2018 03:36:31 -0600 Subject: [PATCH] add hotkey value for "move" This is needed now that https://github.com/ZetaGlest/zetaglest-source/commit/2c4fc340de958f6b94b40ee62eabff015625e62b has been implemented --- mk/shared/glestkeys.ini | 7 ++++--- source/glest_game/gui/gui.cpp | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mk/shared/glestkeys.ini b/mk/shared/glestkeys.ini index a3018425a..d12a26a0e 100644 --- a/mk/shared/glestkeys.ini +++ b/mk/shared/glestkeys.ini @@ -1,8 +1,8 @@ -; === propertyMap File === +; === propertyMap File === RenderInGamePerformance=` RenderNetworkStatus=N -ShowFullConsole=M +ShowFullConsole=Z Screenshot=E FreeCameraMode=F ResetCameraMode=space @@ -39,6 +39,7 @@ HotKeyRotateUnitDuringPlacement=R HotKeySelectDamagedUnit=D HotKeySelectStoreUnit=T HotKeySelectedUnitsAttack=A +HotKeySelectedUnitsMove=M HotKeySelectedUnitsStop=S HotKeyToggleOSMouseEnabled=/ ChatTeamMode=H @@ -53,5 +54,5 @@ SaveGame=f11 BookmarkAdd=f2 BookmarkRemove=f3 CameraFollowSelectedUnit=f4 -; === propertyMap File === +; === propertyMap File === diff --git a/source/glest_game/gui/gui.cpp b/source/glest_game/gui/gui.cpp index d8044575f..60e390921 100644 --- a/source/glest_game/gui/gui.cpp +++ b/source/glest_game/gui/gui.cpp @@ -432,6 +432,10 @@ void Gui::hotKey(SDL_KeyboardEvent key) { else if(isKeyPressed(configKeys.getSDLKey("HotKeySelectedUnitsAttack"),key) == true) { clickCommonCommand(ccAttack); } + //else if(key == configKeys.getCharKey("HotKeySelectedUnitsAttack")) { + else if(isKeyPressed(configKeys.getSDLKey("HotKeySelectedUnitsMove"),key) == true) { + clickCommonCommand(ccMove); + } //else if(key == configKeys.getCharKey("HotKeySelectedUnitsStop")) { else if(isKeyPressed(configKeys.getSDLKey("HotKeySelectedUnitsStop"),key) == true) { clickCommonCommand(ccStop);