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
This commit is contained in:
Flugente
2015-03-16 20:33:33 +00:00
parent f421eb4529
commit 38a931ed7a
2 changed files with 8 additions and 116 deletions
+5 -25
View File
@@ -29,37 +29,17 @@ extern UINT8 gubCheatLevel;
#endif #endif
// ATE: remove cheats unless we're doing a debug build
#ifdef GERMAN
// ATE: remove cheats unless we're doing a debug build
//#ifdef JA2TESTVERSION //#ifdef JA2TESTVERSION
#define INFORMATION_CHEAT_LEVEL( ) ( gubCheatLevel >= 5 ) #define INFORMATION_CHEAT_LEVEL( ) ( gubCheatLevel >= 3 )
#define CHEATER_CHEAT_LEVEL( ) ( gubCheatLevel >= 6 ) #define CHEATER_CHEAT_LEVEL( ) ( gubCheatLevel >= 5 )
#define DEBUG_CHEAT_LEVEL( ) ( gubCheatLevel >= 7 ) #define DEBUG_CHEAT_LEVEL( ) ( gubCheatLevel >= 6 )
//#else //#else
// #define INFORMATION_CHEAT_LEVEL( ) ( FALSE ) // #define INFORMATION_CHEAT_LEVEL( ) ( FALSE )
// #define CHEATER_CHEAT_LEVEL( ) ( FALSE ) // #define CHEATER_CHEAT_LEVEL( ) ( FALSE )
// #define DEBUG_CHEAT_LEVEL( ) ( FALSE ) // #define DEBUG_CHEAT_LEVEL( ) ( FALSE )
//#endif //#endif
#define RESET_CHEAT_LEVEL( ) ( gubCheatLevel = 0 ) #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
#endif #endif
+3 -91
View File
@@ -3002,24 +3002,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
if ( fCtrl ) 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 ) if ( gubCheatLevel == 1 )
{ {
gubCheatLevel++; gubCheatLevel++;
@@ -3029,7 +3011,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
{ {
RESET_CHEAT_LEVEL(); RESET_CHEAT_LEVEL();
} }
#endif
} }
else if ( fAlt ) else if ( fAlt )
{ {
@@ -3074,7 +3055,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
} }
else if( fCtrl ) else if( fCtrl )
{ {
#ifndef GERMAN
if ( gubCheatLevel == 2 ) if ( gubCheatLevel == 2 )
{ {
gubCheatLevel++; gubCheatLevel++;
@@ -3094,18 +3074,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
{ {
RESET_CHEAT_LEVEL( ); RESET_CHEAT_LEVEL( );
} }
#else
if ( gubCheatLevel == 6 )
{
gubCheatLevel++;
fGoodCheatLevelKey = TRUE;
}
else
{
RESET_CHEAT_LEVEL( );
}
#endif
//gGameSettings.fOptions[ TOPTION_HIDE_BULLETS ] ^= TRUE;
} }
else else
{ {
@@ -3384,17 +3352,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
} }
else if( fCtrl ) else if( fCtrl )
{ {
#ifdef GERMAN
if ( gubCheatLevel == 1 )
{
gubCheatLevel++;
fGoodCheatLevelKey = TRUE;
}
else
{
RESET_CHEAT_LEVEL();
}
#else
if ( gubCheatLevel == 0 ) if ( gubCheatLevel == 0 )
{ {
gubCheatLevel++; gubCheatLevel++;
@@ -3404,7 +3361,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
{ {
RESET_CHEAT_LEVEL(); RESET_CHEAT_LEVEL();
} }
#endif
} }
else if ( fAlt ) else if ( fAlt )
{ {
@@ -3492,13 +3448,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
} }
else if( fCtrl ) else if( fCtrl )
{ {
#ifdef GERMAN
if ( gubCheatLevel == 0 )
{
fGoodCheatLevelKey = TRUE;
gubCheatLevel++;
}
#else
if ( gubCheatLevel == 4 ) if ( gubCheatLevel == 4 )
{ {
gubCheatLevel++; gubCheatLevel++;
@@ -3511,7 +3460,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
{ {
RESET_CHEAT_LEVEL(); RESET_CHEAT_LEVEL();
} }
#endif
} }
else else
{ {
@@ -3927,22 +3875,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
} }
else if( fCtrl ) 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 0
if ( INFORMATION_CHEAT_LEVEL( ) ) if ( INFORMATION_CHEAT_LEVEL( ) )
{ {
@@ -4227,23 +4159,11 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
} }
else if( fCtrl ) 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 ) if ( CHEATER_CHEAT_LEVEL( ) && gusSelectedSoldier != NOBODY )
{ {
INT32 cnt;
SOLDIERTYPE *pSoldier;
for ( pSoldier = MercPtrs[ gbPlayerNum ], cnt = 0; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; cnt++,pSoldier++) for ( pSoldier = MercPtrs[ gbPlayerNum ], cnt = 0; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; cnt++,pSoldier++)
{ {
if ( pSoldier->bActive && pSoldier->stats.bLife > 0 ) 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 ) if ( !fGoodCheatLevelKey && gubCheatLevel < 4 )
{ {
RESET_CHEAT_LEVEL( ); RESET_CHEAT_LEVEL( );
} }
#endif
} }
} }
} }