archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-03 07:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miami' of https://github.com/GTAmodding/re3 into new

Browse Source
This commit is contained in:
eray orçunus
2020-10-08 22:45:37 +03:00
parent a252e3a02a b3b21e0af3
commit 570ccb7db1
23 changed files with 630 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vehicles/Automobile.cpp
View File

@ -841,8 +841,8 @@ CAutomobile::ProcessControl(void)
m_nBusDoorTimerEnd -= CTimer::GetTimeStepInMilliseconds();
}
if(m_aSuspensionSpringRatio[0] < 1.0f || m_aSuspensionSpringRatio[1] < 1.0f ||
m_aSuspensionSpringRatio[2] < 1.0f || m_aSuspensionSpringRatio[3] < 1.0f)
if((m_aSuspensionSpringRatio[0] < 1.0f || m_aSuspensionSpringRatio[2] < 1.0f) &&
(m_aSuspensionSpringRatio[1] < 1.0f || m_aSuspensionSpringRatio[3] < 1.0f))
ApplyTurnForce(-GRAVITY*Min(m_fTurnMass, 2500.0f)*GetUp(), -1.0f*GetForward());
}

11
src/vehicles/Boat.cpp
View File

@ -959,17 +959,24 @@ CBoat::PreRender(void)
matrix.Translate(pos);
matrix.UpdateRW();
}
// FIX: Planes can also be controlled with GetCarGunUpDown
#ifdef FIX_BUGS
static float steeringUpDown = 0.0f;
steeringUpDown += ((Abs(CPad::GetPad(0)->GetCarGunUpDown()) > 1.0f ? (-CPad::GetPad(0)->GetCarGunUpDown() / 128.0f) : (-CPad::GetPad(0)->GetSteeringUpDown() / 128.0f)) - steeringUpDown) * Min(1.f, CTimer::GetTimeStep() / 5.f);
#else
float steeringUpDown = -CPad::GetPad(0)->GetSteeringUpDown()/128.0f;
#endif
if(m_aBoatNodes[BOAT_REARFLAP_LEFT]){
matrix.Attach(RwFrameGetMatrix(m_aBoatNodes[BOAT_REARFLAP_LEFT]));
pos = matrix.GetPosition();
matrix.SetRotateX(-CPad::GetPad(0)->GetSteeringUpDown()/128.0f);
matrix.SetRotateX(steeringUpDown);
matrix.Translate(pos);
matrix.UpdateRW();
}
if(m_aBoatNodes[BOAT_REARFLAP_RIGHT]){
matrix.Attach(RwFrameGetMatrix(m_aBoatNodes[BOAT_REARFLAP_RIGHT]));
pos = matrix.GetPosition();
matrix.SetRotateX(-CPad::GetPad(0)->GetSteeringUpDown()/128.0f);
matrix.SetRotateX(steeringUpDown);
matrix.Translate(pos);
matrix.UpdateRW();
}

2
src/vehicles/Vehicle.cpp
View File

@ -41,6 +41,8 @@ bool CVehicle::bCheat3;
bool CVehicle::bCheat4;
bool CVehicle::bCheat5;
bool CVehicle::bCheat8;
bool CVehicle::bCheat9;
bool CVehicle::bCheat10;
bool CVehicle::bHoverCheat;
bool CVehicle::bAllTaxisHaveNitro;
bool CVehicle::m_bDisableMouseSteering = true;

2
src/vehicles/Vehicle.h
View File

@ -400,6 +400,8 @@ public:
static bool bCheat4;
static bool bCheat5;
static bool bCheat8;
static bool bCheat9;
static bool bCheat10;
static bool bHoverCheat;
static bool bAllTaxisHaveNitro;
static bool m_bDisableMouseSteering;