diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2019-08-02 17:43:40 +0200 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 21:14:28 +0200 |
| commit | 458fc63f0196dc92362b44d5cf7ebf67bbc903e1 (patch) | |
| tree | aa190341ec4d5ee449c80c20fea3c09e4f655532 /src/vehicles/Vehicle.cpp | |
| parent | More audio ped (diff) | |
| download | re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.gz re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.bz2 re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.lz re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.xz re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.zst re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.zip | |
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index dd15d910..4795a29f 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -97,8 +97,8 @@ CVehicle::CVehicle(uint8 CreatedBy) DMAudio.SetEntityStatus(m_audioEntityId, true); m_nRadioStation = CGeneral::GetRandomNumber() % USERTRACK; m_pCurGroundEntity = nil; - field_22A = 0; - field_22B = 0; + m_bRainAudioCounter = 0; + m_bRainSamplesCounter = 0; m_comedyControlState = 0; m_aCollPolys[0].valid = false; m_aCollPolys[1].valid = false; @@ -273,7 +273,7 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon right = -contactSpeedRight/wheelsOnGround; if(wheelStatus == WHEEL_STATUS_BURST){ - float fwdspeed = Min(contactSpeedFwd, 0.3f); + float fwdspeed = min(contactSpeedFwd, 0.3f); right += fwdspeed * CGeneral::GetRandomNumberInRange(-0.1f, 0.1f); } } @@ -363,7 +363,7 @@ CVehicle::ProcessWheelRotation(tWheelState state, const CVector &fwd, const CVec void CVehicle::ExtinguishCarFire(void) { - m_fHealth = Max(m_fHealth, 300.0f); + m_fHealth = max(m_fHealth, 300.0f); if(m_pCarFire) m_pCarFire->Extinguish(); if(IsCar()){ @@ -638,13 +638,13 @@ CVehicle::SetDriver(CPed *driver) if(bFreebies && driver == FindPlayerPed()){ if(GetModelIndex() == MI_AMBULAN) - FindPlayerPed()->m_fHealth = Min(FindPlayerPed()->m_fHealth + 20.0f, 100.0f); + FindPlayerPed()->m_fHealth = min(FindPlayerPed()->m_fHealth + 20.0f, 100.0f); else if(GetModelIndex() == MI_TAXI) CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 25; else if(GetModelIndex() == MI_POLICE) driver->GiveWeapon(WEAPONTYPE_SHOTGUN, 5); else if(GetModelIndex() == MI_ENFORCER) - driver->m_fArmour = Max(driver->m_fArmour, 100.0f); + driver->m_fArmour = max(driver->m_fArmour, 100.0f); else if(GetModelIndex() == MI_CABBIE || GetModelIndex() == MI_BORGNINE) CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 25; bFreebies = false; |