diff options
author | majestic <majesticcoding@gmail.com> | 2020-10-08 03:07:15 +0200 |
---|---|---|
committer | majestic <majesticcoding@gmail.com> | 2020-10-08 03:07:15 +0200 |
commit | f5e6a3a274eb74a8996223c2e875842faaf729f1 (patch) | |
tree | 4a0fd8df8835de36d252de5fefb796b07edac4a4 /src/core | |
parent | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff) | |
parent | Merge pull request #735 from theR4K/miami (diff) | |
download | re3-f5e6a3a274eb74a8996223c2e875842faaf729f1.tar re3-f5e6a3a274eb74a8996223c2e875842faaf729f1.tar.gz re3-f5e6a3a274eb74a8996223c2e875842faaf729f1.tar.bz2 re3-f5e6a3a274eb74a8996223c2e875842faaf729f1.tar.lz re3-f5e6a3a274eb74a8996223c2e875842faaf729f1.tar.xz re3-f5e6a3a274eb74a8996223c2e875842faaf729f1.tar.zst re3-f5e6a3a274eb74a8996223c2e875842faaf729f1.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/Pad.cpp | 29 | ||||
-rw-r--r-- | src/core/config.h | 2 |
2 files changed, 8 insertions, 23 deletions
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index 36e14e55..910a8c52 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -412,7 +412,11 @@ void OnlyRenderWheelsCheat() void ChittyChittyBangBangCheat() { +#ifdef BETTER_ALLCARSAREDODO_CHEAT + CHud::SetHelpMessage(TheText.Get(!CVehicle::bAllDodosCheat ? "CHEAT1" : "CHEATOF"), true); +#else CHud::SetHelpMessage(TheText.Get("CHEAT1"), true); +#endif CVehicle::bAllDodosCheat = !CVehicle::bAllDodosCheat; CStats::CheatedCount += 1000; CPad::bHasPlayerCheated = true; @@ -542,22 +546,6 @@ void AllCarsHeliCheat(void) } #endif -#ifdef ALT_DODO_CHEAT -void AltDodoCheat(void) -{ - wchar* string; - if (CVehicle::bAltDodoCheat) { - string = TheText.Get("CHEATOF"); - CVehicle::bAltDodoCheat = false; - } - else { - string = TheText.Get("CHEAT1"); - CVehicle::bAltDodoCheat = true; - } - CHud::SetHelpMessage(string, true); -} -#endif - #ifdef WALLCLIMB_CHEAT void WallClimbingCheat(void) { @@ -1444,12 +1432,6 @@ void CPad::AddToPCCheatString(char c) AllCarsHeliCheat(); #endif -#ifdef ALT_DODO_CHEAT - // "IWANTTOMASTERDODO" - if (!_CHEATCMP("ODODRETSAMOTTNAWI")) - AltDodoCheat(); -#endif - #ifdef WALLCLIMB_CHEAT // "SPIDERCAR" if (!_CHEATCMP("RACREDIPS")) @@ -3166,6 +3148,9 @@ void CPad::ResetCheats(void) CVehicle::bCheat4 = false; CVehicle::bCheat5 = false; CVehicle::bCheat8 = false; +#ifdef RESTORE_ALLCARSHELI_CHEAT + bAllCarCheat = false; +#endif gbBlackCars = false; gbPinkCars = false; CCarCtrl::bMadDriversCheat = false; diff --git a/src/core/config.h b/src/core/config.h index 327230d0..475a63f8 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -251,7 +251,7 @@ enum Config { #define DETECT_PAD_INPUT_SWITCH // Adds automatic switch of pad related stuff between controller and kb/m #define KANGAROO_CHEAT #define RESTORE_ALLCARSHELI_CHEAT -#define ALT_DODO_CHEAT +#define BETTER_ALLCARSAREDODO_CHEAT #define WALLCLIMB_CHEAT #define REGISTER_START_BUTTON //#define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls |