From 38a931ed7a6707da3e92be1ffa00a946d5d463e9 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 16 Mar 2015 20:33:33 +0000
Subject: [PATCH] When using a german exe, cheats are no longer activated by
 'Alt' + 'IGUANA' but 'Alt' + 'GABBI' instead, like in all other languages.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7786 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Cheats.h                      | 30 ++---------
 Tactical/Turn Based Input.cpp | 94 ++---------------------------------
 2 files changed, 8 insertions(+), 116 deletions(-)

diff --git a/Cheats.h b/Cheats.h
index 738ff7b9..c72c434e 100644
--- a/Cheats.h
+++ b/Cheats.h
@@ -29,37 +29,17 @@ extern	UINT8			gubCheatLevel;
 #endif
 
 
-
-#ifdef GERMAN
-
-	// ATE: remove cheats unless we're doing a debug build
+// ATE: remove cheats unless we're doing a debug build
 //#ifdef JA2TESTVERSION
-	#define						INFORMATION_CHEAT_LEVEL( )			( gubCheatLevel >= 5 )
-	#define						CHEATER_CHEAT_LEVEL( )					( gubCheatLevel >= 6 )
-	#define						DEBUG_CHEAT_LEVEL( )					( gubCheatLevel >= 7 )
+#define						INFORMATION_CHEAT_LEVEL( )			( gubCheatLevel >= 3 )
+#define						CHEATER_CHEAT_LEVEL( )				( gubCheatLevel >= 5 )
+#define						DEBUG_CHEAT_LEVEL( )				( gubCheatLevel >= 6 )
 //#else
 //	#define						INFORMATION_CHEAT_LEVEL( )			( FALSE )
 //	#define						CHEATER_CHEAT_LEVEL( )					( FALSE )
 //	#define						DEBUG_CHEAT_LEVEL( )					( FALSE )
 //#endif
 
-	#define						RESET_CHEAT_LEVEL( )						( gubCheatLevel = 0 )
-
-#else
-
-	// ATE: remove cheats unless we're doing a debug build
-//#ifdef JA2TESTVERSION
-	#define						INFORMATION_CHEAT_LEVEL( )			( gubCheatLevel >= 3 )
-	#define						CHEATER_CHEAT_LEVEL( )					( gubCheatLevel >= 5 )
-	#define						DEBUG_CHEAT_LEVEL( )					( gubCheatLevel >= 6 )
-//#else
-//	#define						INFORMATION_CHEAT_LEVEL( )			( FALSE )
-//	#define						CHEATER_CHEAT_LEVEL( )					( FALSE )
-//	#define						DEBUG_CHEAT_LEVEL( )					( FALSE )
-//#endif
-
-	#define						RESET_CHEAT_LEVEL( )						( gubCheatLevel = 0 )
-#endif
-
+#define						RESET_CHEAT_LEVEL( )				( gubCheatLevel = 0 )
 
 #endif
\ No newline at end of file
diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp
index ba4cdb54..3795a739 100644
--- a/Tactical/Turn Based Input.cpp	
+++ b/Tactical/Turn Based Input.cpp	
@@ -3002,24 +3002,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 
 				if ( fCtrl )
 				{
-#ifdef GERMAN
-					if ( gubCheatLevel == 3 )
-					{
-						gubCheatLevel++;
-						fGoodCheatLevelKey = TRUE;
-					}
-					else if ( gubCheatLevel == 5 )
-					{
-						gubCheatLevel++;
-						// ATE; We're done.... start cheat mode....
-						ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, pMessageStrings[ MSG_CHEAT_LEVEL_TWO ] );
-						SetHistoryFact( HISTORY_CHEAT_ENABLED, 0, GetWorldTotalMin(), -1, -1 );
-					}
-					else
-					{
-						RESET_CHEAT_LEVEL();
-					}
-#else
 					if ( gubCheatLevel == 1 )
 					{
 						gubCheatLevel++;
@@ -3029,7 +3011,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 					{
 						RESET_CHEAT_LEVEL();
 					}
-#endif
 				}
 				else if ( fAlt )
 				{
@@ -3074,7 +3055,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				}
 				else if( fCtrl )
 				{
-#ifndef GERMAN
 					if ( gubCheatLevel == 2 )
 					{
 						gubCheatLevel++;
@@ -3094,18 +3074,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 					{
 						RESET_CHEAT_LEVEL( );
 					}
-#else
-					if ( gubCheatLevel == 6 )
-					{
-						gubCheatLevel++;
-						fGoodCheatLevelKey = TRUE;
-					}
-					else
-					{
-						RESET_CHEAT_LEVEL( );
-					}
-#endif
-					//gGameSettings.fOptions[ TOPTION_HIDE_BULLETS ] ^= TRUE;
 				}
 				else
 				{
@@ -3384,17 +3352,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				}
 				else if( fCtrl )
 				{
-#ifdef GERMAN
-					if ( gubCheatLevel == 1 )
-					{
-						gubCheatLevel++;
-						fGoodCheatLevelKey = TRUE;
-					}
-					else
-					{
-						RESET_CHEAT_LEVEL();
-					}
-#else
 					if ( gubCheatLevel == 0 )
 					{
 						gubCheatLevel++;
@@ -3404,7 +3361,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 					{
 						RESET_CHEAT_LEVEL();
 					}
-#endif
 				}
 				else if ( fAlt )
 				{
@@ -3492,13 +3448,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				}
 				else if( fCtrl )
 				{
-#ifdef GERMAN
-					if ( gubCheatLevel == 0 )
-					{
-						fGoodCheatLevelKey = TRUE;
-						gubCheatLevel++;
-					}
-#else
 					if ( gubCheatLevel == 4 )
 					{
 						gubCheatLevel++;
@@ -3511,7 +3460,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 					{
 						RESET_CHEAT_LEVEL();						
 					}
-#endif
 				}
 				else
 				{
@@ -3927,22 +3875,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				}
 				else if( fCtrl )
 				{
-#ifdef GERMAN
-					if ( gubCheatLevel == 4 )
-					{
-						fGoodCheatLevelKey = TRUE;
-						gubCheatLevel++;
-#if 0
-						// ATE: Level one reached.....
-						ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, pMessageStrings[ MSG_CHEAT_LEVEL_ONE ] );
-#endif
-					}
-					else
-					{
-						RESET_CHEAT_LEVEL();
-					}
-#endif
-
 #if 0
 					if ( INFORMATION_CHEAT_LEVEL( ) )
 					{
@@ -4227,23 +4159,11 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				}
 				else if( fCtrl )
 				{
-					INT32 cnt;
-					SOLDIERTYPE *pSoldier;
-
-#ifdef GERMAN
-					if ( gubCheatLevel == 2 )
-					{
-						fGoodCheatLevelKey = TRUE;
-						gubCheatLevel++;
-					}
-					else
-					{
-						RESET_CHEAT_LEVEL();
-					}
-#endif
-
 					if ( CHEATER_CHEAT_LEVEL( ) && gusSelectedSoldier != NOBODY )
 					{
+						INT32 cnt;
+						SOLDIERTYPE *pSoldier;
+
 						for ( pSoldier = MercPtrs[ gbPlayerNum ], cnt = 0; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; cnt++,pSoldier++)
 						{
 							if ( pSoldier->bActive && pSoldier->stats.bLife > 0 )
@@ -4499,18 +4419,10 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 
 			}
 
-#ifdef GERMAN
-			if ( !fGoodCheatLevelKey && gubCheatLevel < 5 )
-			{
-				RESET_CHEAT_LEVEL( );
-			}
-#else
 			if ( !fGoodCheatLevelKey && gubCheatLevel < 4 )
 			{
 				RESET_CHEAT_LEVEL( );
 			}
-#endif
-
 		}
 	}
 }