summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorRoman Masanin <36927roma@gmail.com>2020-10-03 01:26:49 +0200
committerRoman Masanin <36927roma@gmail.com>2020-10-03 01:26:49 +0200
commit063a80ecfb3ccede8b2e5efc135abd2c48f285d2 (patch)
treef69358f331007e86d3c257046cfb741ed44aee7e /src/core
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
downloadre3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar
re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar.gz
re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar.bz2
re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar.lz
re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar.xz
re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar.zst
re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/ControllerConfig.cpp3
-rw-r--r--src/core/Pad.cpp31
2 files changed, 4 insertions, 30 deletions
diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index 222e9e34..51e942d0 100644
--- a/src/core/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
@@ -742,9 +742,6 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_Driving(int32
#ifdef FIX_BUGS
|| (CVehicle::bAllDodosCheat && !FindPlayerVehicle()->IsRealHeli())
#endif
-#ifdef BETTER_ALLCARSAREDODO_CHEAT
- || (CVehicle::bAltDodoCheat && !FindPlayerVehicle()->IsRealHeli())
-#endif
)))
{
isDodo = true;
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 6e9a37b3..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 BETTER_ALLCARSAREDODO_CHEAT
-void AllCarsPlaneCheat(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 BETTER_ALLCARSAREDODO_CHEAT
- // "CARSAREPLANE"
- if (!_CHEATCMP("ENALPERASRAC"))
- AllCarsPlaneCheat();
-#endif
-
#ifdef WALLCLIMB_CHEAT
// "SPIDERCAR"
if (!_CHEATCMP("RACREDIPS"))
@@ -3169,11 +3151,6 @@ void CPad::ResetCheats(void)
#ifdef RESTORE_ALLCARSHELI_CHEAT
bAllCarCheat = false;
#endif
-#ifdef BETTER_ALLCARSAREDODO_CHEAT
- CVehicle::bAltDodoCheat = false;
-#endif
-
-
gbBlackCars = false;
gbPinkCars = false;
CCarCtrl::bMadDriversCheat = false;