mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-28 04:25:40 +00:00
Code Issues Projects Releases Wiki Activity

better flying cars, some refractoring and fixes

Browse source
This commit is contained in:
Roman Masanin 2020-10-01 02:20:09 +03:00
parent db0758690e
commit fe46aa5cc2
6 changed files with 47 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/ControllerConfig.cpp
View file

@ -733,6 +733,9 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_Driving(int32
FindPlayerVehicle()->GetModelIndex() == MI_DODO FindPlayerVehicle()->GetModelIndex() == MI_DODO
#ifdef FIX_BUGS #ifdef FIX_BUGS
|| (CVehicle::bAllDodosCheat && !FindPlayerVehicle()->IsRealHeli()) || (CVehicle::bAllDodosCheat && !FindPlayerVehicle()->IsRealHeli())
#endif
#ifdef BETTER_ALLCARSAREDODO_CHEAT
|| (CVehicle::bAltDodoCheat && !FindPlayerVehicle()->IsRealHeli())
#endif #endif
))) )))
{ {

20
src/core/Pad.cpp
View file

@ -542,8 +542,8 @@ void AllCarsHeliCheat(void)
} }
#endif #endif
#ifdef ALT_DODO_CHEAT #ifdef BETTER_ALLCARSAREDODO_CHEAT
void AltDodoCheat(void) void AllCarsPlaneCheat(void)
{ {
wchar* string; wchar* string;
if (CVehicle::bAltDodoCheat) { if (CVehicle::bAltDodoCheat) {
@ -1444,10 +1444,10 @@ void CPad::AddToPCCheatString(char c)
AllCarsHeliCheat(); AllCarsHeliCheat();
#endif #endif
#ifdef ALT_DODO_CHEAT #ifdef BETTER_ALLCARSAREDODO_CHEAT
// "IWANTTOMASTERDODO" // "CARSAREPLANE"
if (!_CHEATCMP("ODODRETSAMOTTNAWI")) if (!_CHEATCMP("ENALPERASRAC"))
AltDodoCheat(); AllCarsPlaneCheat();
#endif #endif
#ifdef WALLCLIMB_CHEAT #ifdef WALLCLIMB_CHEAT
@ -3166,6 +3166,14 @@ void CPad::ResetCheats(void)
CVehicle::bCheat4 = false; CVehicle::bCheat4 = false;
CVehicle::bCheat5 = false; CVehicle::bCheat5 = false;
CVehicle::bCheat8 = false; CVehicle::bCheat8 = false;
#ifdef RESTORE_ALLCARSHELI_CHEAT
bAllCarCheat = false;
#endif
#ifdef BETTER_ALLCARSAREDODO_CHEAT
CVehicle::bAltDodoCheat = false;
#endif
gbBlackCars = false; gbBlackCars = false;
gbPinkCars = false; gbPinkCars = false;
CCarCtrl::bMadDriversCheat = false; CCarCtrl::bMadDriversCheat = false;

2
src/core/config.h
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 DETECT_PAD_INPUT_SWITCH // Adds automatic switch of pad related stuff between controller and kb/m
#define KANGAROO_CHEAT #define KANGAROO_CHEAT
#define RESTORE_ALLCARSHELI_CHEAT #define RESTORE_ALLCARSHELI_CHEAT
#define ALT_DODO_CHEAT #define BETTER_ALLCARSAREDODO_CHEAT
#define WALLCLIMB_CHEAT #define WALLCLIMB_CHEAT
#define REGISTER_START_BUTTON #define REGISTER_START_BUTTON
//#define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls //#define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls

18
src/vehicles/Automobile.cpp
View file

@ -1375,6 +1375,13 @@ CAutomobile::ProcessControl(void)
// Flying // Flying
bool playRotorSound = false; bool playRotorSound = false;
bool isPlane = GetModelIndex() == MI_DODO || bAllDodosCheat;
#ifdef BETTER_ALLCARSAREDODO_CHEAT
isPlane = isPlane || bAltDodoCheat;
#endif
#ifdef FIX_BUGS
isPlane = isPlane && !IsRealHeli();
#endif
if(GetStatus() != STATUS_PLAYER && GetStatus() != STATUS_PLAYER_REMOTE && GetStatus() != STATUS_PHYSICS){ if(GetStatus() != STATUS_PLAYER && GetStatus() != STATUS_PLAYER_REMOTE && GetStatus() != STATUS_PHYSICS){
if(IsRealHeli()){ if(IsRealHeli()){
bEngineOn = false; bEngineOn = false;
@ -1383,16 +1390,7 @@ CAutomobile::ProcessControl(void)
if(m_aWheelSpeed[1] < 0.154f && m_aWheelSpeed[1] > 0.0044f) if(m_aWheelSpeed[1] < 0.154f && m_aWheelSpeed[1] > 0.0044f)
playRotorSound = true; playRotorSound = true;
} }
}else if((GetModelIndex() == MI_DODO || CVehicle::bAllDodosCheat) && }else if(isPlane && m_vecMoveSpeed.Magnitude() > 0.0f && CTimer::GetTimeStep() > 0.0f){
#ifdef FIX_BUGS
!IsRealHeli() &&
#endif
m_vecMoveSpeed.Magnitude() > 0.0f && CTimer::GetTimeStep() > 0.0f){
#ifdef ALT_DODO_CHEAT
if (bAltDodoCheat)
FlyingControl(FLIGHT_MODEL_PLANE_UNUSED);
else
#endif
if(GetModelIndex() == MI_DODO) if(GetModelIndex() == MI_DODO)
FlyingControl(FLIGHT_MODEL_DODO); FlyingControl(FLIGHT_MODEL_DODO);
else else

35
src/vehicles/Vehicle.cpp
View file

@ -41,7 +41,7 @@ bool CVehicle::bCheat3;
bool CVehicle::bCheat4; bool CVehicle::bCheat4;
bool CVehicle::bCheat5; bool CVehicle::bCheat5;
bool CVehicle::bCheat8; bool CVehicle::bCheat8;
#ifdef ALT_DODO_CHEAT #ifdef BETTER_ALLCARSAREDODO_CHEAT
bool CVehicle::bAltDodoCheat; bool CVehicle::bAltDodoCheat;
#endif #endif
bool CVehicle::bHoverCheat; bool CVehicle::bHoverCheat;
@ -351,25 +351,26 @@ CVehicle::FlyingControl(eFlightModel flightModel)
fSteerUD *= -fSteerMult; fSteerUD *= -fSteerMult;
// thrust // thrust
float fHandlingThrust = pFlyingHandling->fThrust; float fThrust = pFlyingHandling->fThrust;
float fThrustFallOff = pFlyingHandling->fThrustFallOff; float fThrustFallOff = pFlyingHandling->fThrustFallOff;
float fThrustFallOffBack = pFlyingHandling->fThrustFallOff * 8.0f; float fThrustFallOffBack = pFlyingHandling->fThrustFallOff * 8.0f;
#ifdef ALT_DODO_CHEAT #ifdef BETTER_ALLCARSAREDODO_CHEAT
if (bAltDodoCheat && !IsRealPlane()) { if (bAltDodoCheat && !IsRealPlane()) {
fHandlingThrust = pHandling->Transmission.fEngineAcceleration; fThrust = pHandling->Transmission.fEngineAcceleration
fHandlingThrust *= pHandling->Transmission.nDriveType == '4' ? 4 : 2; * pHandling->Transmission.nDriveType == '4' ? 4.0f : 2.0f;
fThrustFallOff = 0.7f / pHandling->Transmission.fMaxVelocity; fThrust = 5.0f * Max(fThrust, pFlyingHandling->fThrust);
fThrustFallOffBack = 0.7f / pHandling->Transmission.fMaxReverseVelocity; fThrustFallOff = Min(1.0f / pHandling->Transmission.fMaxVelocity, fThrustFallOff);
fThrustFallOffBack = -1.0f / pHandling->Transmission.fMaxReverseVelocity;
} }
#endif // ALT_DOOD_CHEAT #endif
float fForwSpeed = DotProduct(GetMoveSpeed(), GetForward()); float fForwSpeed = DotProduct(GetMoveSpeed(), GetForward());
CVector vecTail = GetColModel()->boundingBox.min.y * 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; float fThrustAccel;
if(fForwSpeed > 0.0f || fThrust > 0.0f) if(fForwSpeed > 0.0f || fPedalState > 0.0f)
fThrustAccel = (fThrust - fThrustFallOff * fForwSpeed) * fHandlingThrust; fThrustAccel = (fPedalState - fThrustFallOff * fForwSpeed) * fThrust;
else else
fThrustAccel = Min(fThrust - fThrustFallOffBack * fForwSpeed, 0.0f) * fHandlingThrust; fThrustAccel = Min(fPedalState - fThrustFallOffBack * fForwSpeed, 0.0f) * fThrust;
if(flightModel == FLIGHT_MODEL_PLANE_UNUSED) if(flightModel == FLIGHT_MODEL_PLANE_UNUSED)
fThrustAccel *= 0.3f; fThrustAccel *= 0.3f;
else if(flightModel == FLIGHT_MODEL_PLANE) else if(flightModel == FLIGHT_MODEL_PLANE)
@ -407,14 +408,18 @@ CVehicle::FlyingControl(eFlightModel flightModel)
float fPitchAccel = pFlyingHandling->fPitchStab * fTail * Abs(fTail) + pFlyingHandling->fPitch * fSteerUD * fForwSpeed; float fPitchAccel = pFlyingHandling->fPitchStab * fTail * Abs(fTail) + pFlyingHandling->fPitch * fSteerUD * fForwSpeed;
ApplyTurnForce(fPitchAccel * m_fTurnMass * GetUp() * CTimer::GetTimeStep(), vecTail); ApplyTurnForce(fPitchAccel * m_fTurnMass * GetUp() * CTimer::GetTimeStep(), vecTail);
float fLift = -DotProduct(GetMoveSpeed(), GetUp()) / Max(0.01f, GetMoveSpeed().Magnitude()); float fLift = DotProduct(GetMoveSpeed(), GetUp()) / Max(0.01f, GetMoveSpeed().Magnitude()); //accel*angle
float fLiftAccel = (pFlyingHandling->fAttackLift * fLift + pFlyingHandling->fFormLift) * fForwSpeed * fForwSpeed; float fLiftAccel = (pFlyingHandling->fFormLift - pFlyingHandling->fAttackLift * fLift) * SQR(fForwSpeed);
float fLiftImpulse = fLiftAccel * m_fMass * CTimer::GetTimeStep(); float fLiftImpulse = fLiftAccel * m_fMass * CTimer::GetTimeStep();
if (GRAVITY * CTimer::GetTimeStep() * m_fMass < fLiftImpulse) { if (GRAVITY * CTimer::GetTimeStep() * m_fMass < fLiftImpulse) {
if (flightModel == FLIGHT_MODEL_RCPLANE && GetPosition().z > 50.0f) if (flightModel == FLIGHT_MODEL_RCPLANE && GetPosition().z > 50.0f)
fLiftImpulse = CTimer::GetTimeStep() * 0.9f*GRAVITY * m_fMass; fLiftImpulse = CTimer::GetTimeStep() * 0.9f*GRAVITY * m_fMass;
else if (flightModel == FLIGHT_MODEL_SEAPLANE && GetPosition().z > 80.0f) else if (flightModel == FLIGHT_MODEL_SEAPLANE && GetPosition().z > 80.0f)
fLiftImpulse = CTimer::GetTimeStep() * 0.9f*GRAVITY * m_fMass; fLiftImpulse = CTimer::GetTimeStep() * 0.9f*GRAVITY * m_fMass;
#ifdef BETTER_ALLCARSAREDODO_CHEAT
else if(GetPosition().z > 180.0f)
fLiftImpulse = CTimer::GetTimeStep() * 0.9f * GRAVITY * m_fMass;
#endif
} }
ApplyMoveForce(fLiftImpulse * GetUp()); ApplyMoveForce(fLiftImpulse * GetUp());
@ -444,7 +449,7 @@ CVehicle::FlyingControl(eFlightModel flightModel)
case FLIGHT_MODEL_HELI: case FLIGHT_MODEL_HELI:
{ {
#ifdef RESTORE_ALLCARSHELI_CHEAT #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 #else
tFlyingHandlingData* flyingHandling = pFlyingHandling; tFlyingHandlingData* flyingHandling = pFlyingHandling;
#endif #endif

2
src/vehicles/Vehicle.h
View file

@ -400,7 +400,7 @@ public:
static bool bCheat4; static bool bCheat4;
static bool bCheat5; static bool bCheat5;
static bool bCheat8; static bool bCheat8;
#ifdef ALT_DODO_CHEAT #ifdef BETTER_ALLCARSAREDODO_CHEAT
static bool bAltDodoCheat; static bool bAltDodoCheat;
#endif #endif
static bool bHoverCheat; static bool bHoverCheat;