Merge branch 'miami' into miami

This commit is contained in:
erorcun
2020-10-08 01:29:35 +03:00
committed by GitHub
5 changed files with 60 additions and 46 deletions

View File

@ -504,7 +504,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;
@ -629,22 +633,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)
{
@ -1546,12 +1534,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"))
@ -3365,6 +3347,9 @@ void CPad::ResetCheats(void)
CVehicle::bCheat8 = false;
CVehicle::bCheat9 = false;
CVehicle::bCheat10 = false;
#ifdef RESTORE_ALLCARSHELI_CHEAT
bAllCarCheat = false;
#endif
gbBlackCars = false;
gbPinkCars = false;

View File

@ -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