diff options
| author | aap <aap@papnet.eu> | 2020-05-10 20:51:29 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-10 20:51:29 +0200 |
| commit | 9e842f1628c273d20fb8221e8b42198880b127fe (patch) | |
| tree | a9e71674dcd33c80f54bb22b1abf482a550cb4a2 /src/vehicles/Automobile.cpp | |
| parent | force load weapons as long as we dont stream em yet (diff) | |
| download | re3-9e842f1628c273d20fb8221e8b42198880b127fe.tar re3-9e842f1628c273d20fb8221e8b42198880b127fe.tar.gz re3-9e842f1628c273d20fb8221e8b42198880b127fe.tar.bz2 re3-9e842f1628c273d20fb8221e8b42198880b127fe.tar.lz re3-9e842f1628c273d20fb8221e8b42198880b127fe.tar.xz re3-9e842f1628c273d20fb8221e8b42198880b127fe.tar.zst re3-9e842f1628c273d20fb8221e8b42198880b127fe.zip | |
Diffstat (limited to 'src/vehicles/Automobile.cpp')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 8ecea0ff..50eec49f 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -195,7 +195,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy) CMatrix mat2(RwFrameGetMatrix(m_aCarNodes[CAR_WHEEL_LF])); mat1.GetPosition() += CVector(mat2.GetPosition().x + 0.1f, 0.0f, mat2.GetPosition().z); mat1.UpdateRW(); - }else if(GetModelIndex() == MI_SPARROW || GetModelIndex() == MI_RCRAIDER){ + }else if(IsRealHeli()){ RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LF]), 0); RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RF]), 0); RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LB]), 0); @@ -672,9 +672,7 @@ CAutomobile::ProcessControl(void) acceleration /= m_fForceMultiplier; // unused - if(GetModelIndex() == MI_RCBARON || - GetModelIndex() == MI_RCRAIDER || - GetModelIndex() == MI_SPARROW) + if(GetModelIndex() == MI_RCBARON || IsRealHeli()) acceleration = 0.0f; brake = m_fBrakePedal * pHandling->fBrakeDeceleration * CTimer::GetTimeStep(); @@ -1023,18 +1021,18 @@ CAutomobile::ProcessControl(void) FlyingControl(FLIGHT_MODEL_DODO); }else if(GetModelIndex() == MI_RCBARON){ FlyingControl(FLIGHT_MODEL_RCPLANE); - }else if(GetModelIndex() == MI_RCRAIDER || GetModelIndex() == MI_SPARROW || bAllCarCheat){ + }else if(IsRealHeli() || bAllCarCheat){ #ifdef ALLCARSHELI_CHEAT if (bAllCarCheat) FlyingControl(FLIGHT_MODEL_HELI); else #endif { - if (CPad::GetPad(0)->GetCircleJustDown()) - m_aWheelSpeed[0] = Max(m_aWheelSpeed[0] - 0.03f, 0.0f); - if (m_aWheelSpeed[0] < 0.22f) - m_aWheelSpeed[0] += 0.0001f; - if (m_aWheelSpeed[0] > 0.15f) + // if (CPad::GetPad(0)->GetCircleJustDown()) + // m_aWheelSpeed[0] = Max(m_aWheelSpeed[0] - 0.03f, 0.0f); + // if (m_aWheelSpeed[0] < 0.22f) + // m_aWheelSpeed[0] += 0.0001f; + // if (m_aWheelSpeed[0] > 0.15f) FlyingControl(FLIGHT_MODEL_HELI); } } |