diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index 785927ce..aa6e5cc8 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -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; 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 diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 05596e75..01a4f094 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -1375,6 +1375,10 @@ CAutomobile::ProcessControl(void) // Flying bool playRotorSound = false; + bool isPlane = GetModelIndex() == MI_DODO || bAllDodosCheat; +#ifdef FIX_BUGS + isPlane = isPlane && !IsRealHeli(); +#endif if(GetStatus() != STATUS_PLAYER && GetStatus() != STATUS_PLAYER_REMOTE && GetStatus() != STATUS_PHYSICS){ if(IsRealHeli()){ bEngineOn = false; @@ -1383,16 +1387,7 @@ CAutomobile::ProcessControl(void) if(m_aWheelSpeed[1] < 0.154f && m_aWheelSpeed[1] > 0.0044f) playRotorSound = true; } - }else if((GetModelIndex() == MI_DODO || CVehicle::bAllDodosCheat) && -#ifdef FIX_BUGS - !IsRealHeli() && -#endif - m_vecMoveSpeed.Magnitude() > 0.0f && CTimer::GetTimeStep() > 0.0f){ -#ifdef ALT_DODO_CHEAT - if (bAltDodoCheat) - FlyingControl(FLIGHT_MODEL_PLANE); - else -#endif + }else if(isPlane && m_vecMoveSpeed.Magnitude() > 0.0f && CTimer::GetTimeStep() > 0.0f){ if(GetModelIndex() == MI_DODO) FlyingControl(FLIGHT_MODEL_DODO); else @@ -2594,6 +2589,10 @@ CAutomobile::PreRender(void) CGeneral::GetRandomNumberInRange(0.0f, 90.0f), CGeneral::GetRandomNumberInRange(0.0f, 10.0f), 1); } +#ifdef BETTER_ALLCARSAREDODO_CHEAT + } else if (bAllDodosCheat && m_nDriveWheelsOnGround == 0 && m_nDriveWheelsOnGroundPrev == 0) { + mat.RotateY(-HALFPI); +#endif }else{ // tilt wheel depending oh how much it presses on ground float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale; @@ -2631,6 +2630,10 @@ CAutomobile::PreRender(void) CGeneral::GetRandomNumberInRange(0.0f, 90.0f), CGeneral::GetRandomNumberInRange(0.0f, 10.0f), 1); } +#ifdef BETTER_ALLCARSAREDODO_CHEAT + } else if (bAllDodosCheat && m_nDriveWheelsOnGround == 0 && m_nDriveWheelsOnGroundPrev == 0) { + mat.RotateY(HALFPI); +#endif }else{ // tilt wheel depending oh how much it presses on ground float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale; @@ -2660,6 +2663,10 @@ CAutomobile::PreRender(void) m_aWheelColPoints[CARWHEEL_REAR_RIGHT].surfaceB == SURFACE_WATER){ // hovering on water mat.RotateY(-HALFPI); +#ifdef BETTER_ALLCARSAREDODO_CHEAT + } else if (bAllDodosCheat && m_nDriveWheelsOnGround == 0 && m_nDriveWheelsOnGroundPrev == 0) { + mat.RotateY(-HALFPI); +#endif }else{ // tilt wheel depending oh how much it presses on ground float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale; @@ -2690,6 +2697,10 @@ CAutomobile::PreRender(void) m_aWheelColPoints[CARWHEEL_REAR_LEFT].surfaceB == SURFACE_WATER){ // hovering on water mat.RotateY(HALFPI); +#ifdef BETTER_ALLCARSAREDODO_CHEAT + } else if (bAllDodosCheat && m_nDriveWheelsOnGround == 0 && m_nDriveWheelsOnGroundPrev == 0) { + mat.RotateY(HALFPI); +#endif }else{ // tilt wheel depending oh how much it presses on ground float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale; @@ -2820,6 +2831,10 @@ CAutomobile::PreRender(void) CGeneral::GetRandomNumberInRange(0.0f, 90.0f), CGeneral::GetRandomNumberInRange(0.0f, 10.0f), 1); } +#ifdef BETTER_ALLCARSAREDODO_CHEAT + } else if (bAllDodosCheat && m_nDriveWheelsOnGround == 0 && m_nDriveWheelsOnGroundPrev == 0) { + mat.RotateY(-HALFPI); +#endif }else{ // tilt wheel depending oh how much it presses on ground float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale; @@ -2857,6 +2872,10 @@ CAutomobile::PreRender(void) CGeneral::GetRandomNumberInRange(0.0f, 90.0f), CGeneral::GetRandomNumberInRange(0.0f, 10.0f), 1); } +#ifdef BETTER_ALLCARSAREDODO_CHEAT + } else if (bAllDodosCheat && m_nDriveWheelsOnGround == 0 && m_nDriveWheelsOnGroundPrev == 0) { + mat.RotateY(HALFPI); +#endif }else{ // tilt wheel depending oh how much it presses on ground float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale; diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 66676869..6e86dbe4 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -43,9 +43,6 @@ bool CVehicle::bCheat5; bool CVehicle::bCheat8; bool CVehicle::bCheat9; bool CVehicle::bCheat10; -#ifdef ALT_DODO_CHEAT -bool CVehicle::bAltDodoCheat; -#endif bool CVehicle::bHoverCheat; bool CVehicle::bAllTaxisHaveNitro; bool CVehicle::m_bDisableMouseSteering = true; @@ -353,14 +350,26 @@ CVehicle::FlyingControl(eFlightModel flightModel) fSteerUD *= -fSteerMult; // thrust + float fThrust = pFlyingHandling->fThrust; + float fThrustFallOff = pFlyingHandling->fThrustFallOff; + float fThrustFallOffBack = pFlyingHandling->fThrustFallOff * 8.0f; +#ifdef BETTER_ALLCARSAREDODO_CHEAT + if (bAllDodosCheat && !IsRealPlane()) { + fThrust = pHandling->Transmission.fEngineAcceleration + * (pHandling->Transmission.nDriveType == '4' ? 4.0f : 2.0f); + fThrust = 5.0f * Max(fThrust, pFlyingHandling->fThrust); //tweak: (cars engines too weak to thrust car on air) + fThrustFallOff = Min(0.7f / pHandling->Transmission.fMaxVelocity, fThrustFallOff); //tweak: (use 0.7 instead of 1.0 to make cars 30% faster) + fThrustFallOffBack = -1.0f / pHandling->Transmission.fMaxReverseVelocity; + } +#endif float fForwSpeed = DotProduct(GetMoveSpeed(), GetForward()); CVector vecTail = GetColModel()->boundingBox.min.y * GetForward(); - float fThrust = (CPad::GetPad(0)->GetAccelerate() - CPad::GetPad(0)->GetBrake()) / 255.0f; + float fPedalState = (CPad::GetPad(0)->GetAccelerate() - CPad::GetPad(0)->GetBrake()) / 255.0f; float fThrustAccel; - if(fForwSpeed > 0.0f || fThrust > 0.0f) - fThrustAccel = (fThrust - pFlyingHandling->fThrustFallOff * fForwSpeed) * pFlyingHandling->fThrust; + if(fForwSpeed > 0.0f || fPedalState > 0.0f) + fThrustAccel = (fPedalState - fThrustFallOff * fForwSpeed) * fThrust; else - fThrustAccel = Min(fThrust - 8.0f * pFlyingHandling->fThrustFallOff * fForwSpeed, 0.0f) * pFlyingHandling->fThrust; + fThrustAccel = Min(fPedalState - fThrustFallOffBack * fForwSpeed, 0.0f) * fThrust; if(flightModel == FLIGHT_MODEL_PLANE_UNUSED) fThrustAccel *= 0.3f; else if(flightModel == FLIGHT_MODEL_PLANE) @@ -398,14 +407,18 @@ CVehicle::FlyingControl(eFlightModel flightModel) float fPitchAccel = pFlyingHandling->fPitchStab * fTail * Abs(fTail) + pFlyingHandling->fPitch * fSteerUD * fForwSpeed; ApplyTurnForce(fPitchAccel * m_fTurnMass * GetUp() * CTimer::GetTimeStep(), vecTail); - float fLift = -DotProduct(GetMoveSpeed(), GetUp()) / Max(0.01f, GetMoveSpeed().Magnitude()); - float fLiftAccel = (pFlyingHandling->fAttackLift * fLift + pFlyingHandling->fFormLift) * fForwSpeed * fForwSpeed; + float fLift = DotProduct(GetMoveSpeed(), GetUp()) / Max(0.01f, GetMoveSpeed().Magnitude()); //accel*angle + float fLiftAccel = (pFlyingHandling->fFormLift - pFlyingHandling->fAttackLift * fLift) * SQR(fForwSpeed); float fLiftImpulse = fLiftAccel * m_fMass * CTimer::GetTimeStep(); if (GRAVITY * CTimer::GetTimeStep() * m_fMass < fLiftImpulse) { if (flightModel == FLIGHT_MODEL_RCPLANE && GetPosition().z > 50.0f) fLiftImpulse = CTimer::GetTimeStep() * 0.9f*GRAVITY * m_fMass; else if (flightModel == FLIGHT_MODEL_SEAPLANE && GetPosition().z > 80.0f) fLiftImpulse = CTimer::GetTimeStep() * 0.9f*GRAVITY * m_fMass; +#ifdef BETTER_ALLCARSAREDODO_CHEAT + else if(bAllDodosCheat && GetPosition().z > 170.0f) + fLiftImpulse = CTimer::GetTimeStep() * 0.9f * GRAVITY * m_fMass; +#endif } ApplyMoveForce(fLiftImpulse * GetUp()); @@ -435,7 +448,7 @@ CVehicle::FlyingControl(eFlightModel flightModel) case FLIGHT_MODEL_HELI: { #ifdef RESTORE_ALLCARSHELI_CHEAT - tFlyingHandlingData* flyingHandling = bAllCarCheat && GetStatus() == STATUS_PLAYER && !IsRealHeli() ? mod_HandlingManager.GetFlyingPointer(HANDLING_MAVERICK) : pFlyingHandling; + tFlyingHandlingData* flyingHandling = bAllCarCheat && !IsRealHeli() ? mod_HandlingManager.GetFlyingPointer(HANDLING_MAVERICK) : pFlyingHandling; #else tFlyingHandlingData* flyingHandling = pFlyingHandling; #endif diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index b40882d6..705fca3a 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -402,9 +402,6 @@ public: static bool bCheat8; static bool bCheat9; static bool bCheat10; -#ifdef ALT_DODO_CHEAT - static bool bAltDodoCheat; -#endif static bool bHoverCheat; static bool bAllTaxisHaveNitro; static bool m_bDisableMouseSteering;