diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2020-04-19 18:34:08 +0200 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2020-04-20 18:18:46 +0200 |
| commit | 370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96 (patch) | |
| tree | 5f5c66a542d7a121a7db88fed66e31f2a263b206 /src/vehicles/Vehicle.cpp | |
| parent | Merge pull request #474 from Nick007J/master (diff) | |
| download | re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar.gz re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar.bz2 re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar.lz re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar.xz re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.tar.zst re3-370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96.zip | |
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 0ed83f87..c09375cc 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -281,7 +281,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); } } @@ -533,7 +533,7 @@ CVehicle::DoFixedMachineGuns(void) 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()){ @@ -874,13 +874,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; |