From 81f493aa5aaa1e39683d301cbb7d41c53f808936 Mon Sep 17 00:00:00 2001
From: Sevenfm <Sevenfm@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 20 Feb 2022 13:42:59 +0000
Subject: [PATCH] Quick keys Alt + 0..9 and Alt + [~] now work consistently in
 normal and cheat mode. Moved Alt + 1..5 cheat hotkeys to Ctrl + Alt + 1..5

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9309 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Turn Based Input.cpp | 78 +++++++++++++++++------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp
index 07126d98..bad51675 100644
--- a/Tactical/Turn Based Input.cpp	
+++ b/Tactical/Turn Based Input.cpp	
@@ -2964,35 +2964,35 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				break;
 
 			case '1':
-				if( fAlt )
+				if (fCtrl && fAlt)
 				{
-					if ( CHEATER_CHEAT_LEVEL( ) )
+					if (CHEATER_CHEAT_LEVEL())
 					{
 						//ChangeSoldiersBodyType( TANK_NW, TRUE );
 						// MercPtrs[ gusSelectedSoldier ]->flags.uiStatusFlags |= SOLDIER_CREATURE;
 						//EVENT_InitNewSoldierAnim( MercPtrs[ gusSelectedSoldier ], CRIPPLE_BEG, 0 , TRUE );
 					}
-					else
-					{
-						HandleTacticalTakeInvItem( gGameExternalOptions.iQuickItem1 );
-					}
+				}
+				else if( fAlt )
+				{
+					HandleTacticalTakeInvItem( gGameExternalOptions.iQuickItem1 );
 				}
 				else
 					ChangeCurrentSquad( 0 );
 				break;
 
 			case '2':
-				if( fAlt )
+				if (fCtrl && fAlt)
 				{
-					if ( CHEATER_CHEAT_LEVEL( ) )
+					if (CHEATER_CHEAT_LEVEL())
 					{
-						ChangeSoldiersBodyType( INFANT_MONSTER, TRUE );
-					}
-					else
-					{
-						HandleTacticalTakeInvItem( gGameExternalOptions.iQuickItem2 );
+						ChangeSoldiersBodyType(INFANT_MONSTER, TRUE);
 					}
 				}
+				else if( fAlt )
+				{
+					HandleTacticalTakeInvItem( gGameExternalOptions.iQuickItem2 );
+				}
 				else if( fCtrl ) //toggle between the different npc debug modes
 				{
 					if ( CHEATER_CHEAT_LEVEL( ) )
@@ -3005,21 +3005,21 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				break;
 
 			case '3':
-				if( fAlt )
+				if (fCtrl && fAlt)
 				{
-					if ( CHEATER_CHEAT_LEVEL( ) )
+					if (CHEATER_CHEAT_LEVEL())
 					{
-						MercPtrs[ gusSelectedSoldier ]->EVENT_InitNewSoldierAnim( KID_SKIPPING, 0 , TRUE );
+						MercPtrs[gusSelectedSoldier]->EVENT_InitNewSoldierAnim(KID_SKIPPING, 0, TRUE);
 
 						//ChangeSoldiersBodyType( LARVAE_MONSTER, TRUE );
 						//MercPtrs[ gusSelectedSoldier ]->usAttackingWeapon = TANK_CANNON;
 						//LocateSoldier( gusSelectedSoldier, FALSE );
 						//EVENT_FireSoldierWeapon( MercPtrs[ gusSelectedSoldier ], sMapPos );
 					}
-					else
-					{
-						HandleTacticalTakeInvItem( gGameExternalOptions.iQuickItem3 );
-					}
+				}
+				else if( fAlt )
+				{
+					HandleTacticalTakeInvItem( gGameExternalOptions.iQuickItem3 );
 				}
 				else if( fCtrl ) //toggle between the different npc debug modes
 				{
@@ -3034,17 +3034,17 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				break;
 
 			case '4':
-				if( fAlt )
+				if (fCtrl && fAlt)
 				{
-					if ( CHEATER_CHEAT_LEVEL( ) )
+					if (CHEATER_CHEAT_LEVEL())
 					{
-						ChangeSoldiersBodyType( CRIPPLECIV, TRUE );
-					}
-					else
-					{
-						HandleTacticalTakeInvItem( gGameExternalOptions.iQuickItem4 );
+						ChangeSoldiersBodyType(CRIPPLECIV, TRUE);
 					}
 				}
+				else if( fAlt )
+				{
+					HandleTacticalTakeInvItem( gGameExternalOptions.iQuickItem4 );
+				}
 				else
 					ChangeCurrentSquad( 3 );
 
@@ -3052,17 +3052,17 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				break;
 
 			case '5':
-				if( fAlt )
+				if (fCtrl && fAlt)
 				{
-					if ( CHEATER_CHEAT_LEVEL( ) )
+					if (CHEATER_CHEAT_LEVEL())
 					{
-						ChangeSoldiersBodyType( YAM_MONSTER, TRUE );
-					}
-					else
-					{
-						HandleTacticalTakeInvItem( gGameExternalOptions.iQuickItem5 );
+						ChangeSoldiersBodyType(YAM_MONSTER, TRUE);
 					}
 				}
+				else if( fAlt )
+				{
+					HandleTacticalTakeInvItem( gGameExternalOptions.iQuickItem5 );
+				}
 				else
 				{
 					ChangeCurrentSquad( 4 );
@@ -3073,16 +3073,16 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				break;
 
 			case '6':
-				if( fAlt )
+				if (fCtrl && fAlt)
 				{
 					if (CHEATER_CHEAT_LEVEL())
 					{
 						ChangeSoldiersBodyType(BLOODCAT, TRUE);
 					}
-					else
-					{
-						HandleTacticalTakeInvItem(gGameExternalOptions.iQuickItem6);
-					}
+				}
+				else if( fAlt )
+				{
+					HandleTacticalTakeInvItem(gGameExternalOptions.iQuickItem6);
 				}
 				else
 				{