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 69ea13c9f..83272e4f8 100644 Binary files a/Laptop/mercs Files.cpp and b/Laptop/mercs Files.cpp differ diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp index af9d16fca..ed151fb32 100644 --- a/Laptop/personnel.cpp +++ b/Laptop/personnel.cpp @@ -6521,6 +6521,7 @@ void HandlePersonnelKeyboard( void ) } break; case UPARROW: + case 'w': if ( fCurrentTeamMode ) { if( gubPersonnelInfoState > 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 );