From c8f410822593d991c10f7a78bceb849295bdd20f Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 2 Dec 2013 20:14:14 +0000 Subject: [PATCH] Hotkey Updates (by Buggler) - Duplicate all applicable arrow hotkeys to WASD hotkeys in Laptop mode (w -> UP, a -> LEFT, s -> DOWN, d -> RIGHT) - Remapped squad 14 to 'Ctrl + 4' in tactical screen git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6674 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/AimFacialIndex.cpp | 2 ++ Laptop/AimMembers.cpp | 8 ++++++++ Laptop/BobbyRGuns.cpp | 8 ++++++++ Laptop/mercs Files.cpp | Bin 141862 -> 3796 bytes Laptop/personnel.cpp | 6 ++++++ Tactical/Turn Based Input.cpp | 2 ++ 6 files changed, 26 insertions(+) diff --git a/Laptop/AimFacialIndex.cpp b/Laptop/AimFacialIndex.cpp index 40be32bc6..9dadeb55b 100644 --- a/Laptop/AimFacialIndex.cpp +++ b/Laptop/AimFacialIndex.cpp @@ -519,6 +519,7 @@ void HandleAimFacialIndexKeyBoardInput() guiCurrentLaptopMode = LAPTOP_MODE_AIM_MEMBERS; break; case LEFTARROW: + case 'a': if ( MAX_NUMBER_MERCS > (AIM_FI_NUM_MUGSHOTS_X * AIM_FI_NUM_MUGSHOTS_Y) ) { // previous page @@ -548,6 +549,7 @@ void HandleAimFacialIndexKeyBoardInput() } break; case RIGHTARROW: + case 'd': if ( MAX_NUMBER_MERCS > (AIM_FI_NUM_MUGSHOTS_X * AIM_FI_NUM_MUGSHOTS_Y) ) { // next page diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp index 133731a10..ec6bab4cc 100644 --- a/Laptop/AimMembers.cpp +++ b/Laptop/AimMembers.cpp @@ -5108,6 +5108,7 @@ void HandleAimMemberKeyBoardInput() switch (InputEvent.usParam) { case LEFTARROW: + case 'a': // previous button InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); @@ -5129,6 +5130,7 @@ void HandleAimMemberKeyBoardInput() gfRedrawScreen = TRUE; break; case RIGHTARROW: + case 'd': // next button InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); @@ -5150,6 +5152,7 @@ void HandleAimMemberKeyBoardInput() gfRedrawScreen = TRUE; break; case SHIFT_LEFTARROW: + case 'A': // previous button InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); @@ -5171,6 +5174,7 @@ void HandleAimMemberKeyBoardInput() gfRedrawScreen = TRUE; break; case SHIFT_RIGHTARROW: + case 'D': // next button InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); @@ -5357,6 +5361,7 @@ void HandleAimMemberKeyBoardInput() switch( InputEvent.usParam ) { case LEFTARROW: + case 'a': // previous button InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); @@ -5373,6 +5378,7 @@ void HandleAimMemberKeyBoardInput() gfRedrawScreen = TRUE; break; case RIGHTARROW: + case 'd': // next button InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); @@ -5389,6 +5395,7 @@ void HandleAimMemberKeyBoardInput() gfRedrawScreen = TRUE; break; case SHIFT_LEFTARROW: + case 'A': // previous button InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); @@ -5405,6 +5412,7 @@ void HandleAimMemberKeyBoardInput() gfRedrawScreen = TRUE; break; case SHIFT_RIGHTARROW: + case 'D': // next button InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0); diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp index 997de3083..0281cb507 100644 --- a/Laptop/BobbyRGuns.cpp +++ b/Laptop/BobbyRGuns.cpp @@ -3708,6 +3708,7 @@ void HandleBobbyRGunsKeyBoardInput() switch (InputEvent.usParam) { case LEFTARROW: + case 'a': // previous page if( gubCurPage > 0 ) { @@ -3720,6 +3721,7 @@ void HandleBobbyRGunsKeyBoardInput() fPausedReDrawScreenFlag = TRUE; break; case RIGHTARROW: + case 'd': // next page if( gubCurPage < gubNumPages - 1 ) { @@ -3732,6 +3734,7 @@ void HandleBobbyRGunsKeyBoardInput() fPausedReDrawScreenFlag = TRUE; break; case SHIFT_LEFTARROW: + case 'A': // jump to 10 pages back if( gubCurPage > 0 ) { @@ -3744,6 +3747,7 @@ void HandleBobbyRGunsKeyBoardInput() fPausedReDrawScreenFlag = TRUE; break; case SHIFT_RIGHTARROW: + case 'D': // jump to 10 pages forward if( gubCurPage < gubNumPages - 1 ) { @@ -3871,6 +3875,7 @@ void HandleBobbyRGunsKeyBoardInput() switch( InputEvent.usParam ) { case LEFTARROW: + case 'a': // previous page if( gubCurPage > 0 ) gubCurPage--; @@ -3879,6 +3884,7 @@ void HandleBobbyRGunsKeyBoardInput() fPausedReDrawScreenFlag = TRUE; break; case RIGHTARROW: + case 'd': // next page if( gubCurPage < gubNumPages - 1 ) gubCurPage++; @@ -3887,6 +3893,7 @@ void HandleBobbyRGunsKeyBoardInput() fPausedReDrawScreenFlag = TRUE; break; case SHIFT_LEFTARROW: + case 'A': // jump to 10 pages back if( gubCurPage > 0 ) gubCurPage = __max(gubCurPage - 10, 0); @@ -3895,6 +3902,7 @@ void HandleBobbyRGunsKeyBoardInput() fPausedReDrawScreenFlag = TRUE; break; case SHIFT_RIGHTARROW: + case 'D': // jump to 10 pages forward if( gubCurPage < gubNumPages - 1 ) gubCurPage = __min(gubNumPages - 1, gubCurPage + 10); diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp index 69ea13c9f93f436d67bead8d714f7c1256072346..83272e4f86420ac9449150c9ad1f4ffd5464cd4e 100644 GIT binary patch literal 3796 tcmeIuK?wi=2n4XdU>5tAJIx`CHP~jlFkrxd0RsjM7%*VKfB^#!2M#ngtdal# literal 141862 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 PERSONNEL_STAT_BTN ) @@ -6541,6 +6542,7 @@ void HandlePersonnelKeyboard( void ) } break; case DNARROW: + case 's': if ( fCurrentTeamMode ) { if( gubPersonnelInfoState < PERSONNEL_NUM_BTN-1 ) @@ -6561,6 +6563,7 @@ void HandlePersonnelKeyboard( void ) } break; case LEFTARROW: + case 'a': fReDrawScreenFlag = TRUE; PrevPersonnelFace( ); uiCurrentInventoryIndex = 0; @@ -6568,6 +6571,7 @@ void HandlePersonnelKeyboard( void ) fPausedReDrawScreenFlag = TRUE; break; case RIGHTARROW: + case 'd': fReDrawScreenFlag = TRUE; NextPersonnelFace( ); uiCurrentInventoryIndex = 0; @@ -6609,6 +6613,7 @@ void HandlePersonnelKeyboard( void ) switch (InputEvent.usParam) { case LEFTARROW: + case 'a': fReDrawScreenFlag = TRUE; PrevPersonnelFace( ); uiCurrentInventoryIndex = 0; @@ -6616,6 +6621,7 @@ void HandlePersonnelKeyboard( void ) fPausedReDrawScreenFlag = TRUE; break; case RIGHTARROW: + case 'd': fReDrawScreenFlag = TRUE; NextPersonnelFace( ); uiCurrentInventoryIndex = 0; diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index cd1873454..22519e678 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -2446,6 +2446,8 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) ChangeSoldiersBodyType( CRIPPLECIV, TRUE ); } } + else if( fCtrl ) //remapped squad 14 to here + ChangeCurrentSquad( 13 ); else ChangeCurrentSquad( 3 );