diff options
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Automobile.h | 2 | ||||
| -rw-r--r-- | src/entities/Ped.h | 10 | ||||
| -rw-r--r-- | src/entities/Physical.cpp | 2 | ||||
| -rw-r--r-- | src/entities/Vehicle.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/entities/Automobile.h b/src/entities/Automobile.h index b6617f4b..b1463936 100644 --- a/src/entities/Automobile.h +++ b/src/entities/Automobile.h @@ -26,7 +26,7 @@ public: RwFrame *m_aCarNodes[NUM_CAR_NODES]; CColPoint m_aWheelColPoints[4]; float m_aWheelDist[4]; - float m_aWheelDist_2[4]; + float m_aWheelDistPrev[4]; float m_aWheelSkidThing[4]; int field_49C; bool m_aWheelSkidmarkMuddy[4]; diff --git a/src/entities/Ped.h b/src/entities/Ped.h index 3888c076..95731e15 100644 --- a/src/entities/Ped.h +++ b/src/entities/Ped.h @@ -522,11 +522,11 @@ public: void SetPedStats(ePedStats); bool IsGangMember(void); - inline bool HasWeapon(uint8 weaponType) { return m_weapons[weaponType].m_eWeaponType == weaponType; } - inline CWeapon &GetWeapon(uint8 weaponType) { return m_weapons[weaponType]; } - inline CWeapon *GetWeapon(void) { return &m_weapons[m_currentWeapon]; } - inline RwFrame *GetNodeFrame(int nodeId) { return m_pFrames[nodeId]->frame; } - inline static uint8 GetVehEnterExitFlag(eVehEnter vehEnter) { + bool HasWeapon(uint8 weaponType) { return m_weapons[weaponType].m_eWeaponType == weaponType; } + CWeapon &GetWeapon(uint8 weaponType) { return m_weapons[weaponType]; } + CWeapon *GetWeapon(void) { return &m_weapons[m_currentWeapon]; } + RwFrame *GetNodeFrame(int nodeId) { return m_pFrames[nodeId]->frame; } + static uint8 GetVehEnterExitFlag(eVehEnter vehEnter) { switch (vehEnter) { case VEHICLE_ENTER_FRONT_RIGHT: return 4; diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index 14891cd9..b7ca1904 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -346,7 +346,7 @@ CPhysical::ProcessControl(void) IsPed() && !bPedPhysics){ m_vecMoveSpeedAvg = (m_vecMoveSpeedAvg + m_vecMoveSpeed)/2.0f; m_vecTurnSpeedAvg = (m_vecTurnSpeedAvg + m_vecTurnSpeed)/2.0f; - float step = CTimer::GetTimeStep() * 0.003; + float step = CTimer::GetTimeStep() * 0.003f; if(m_vecMoveSpeedAvg.MagnitudeSqr() < step*step && m_vecTurnSpeedAvg.MagnitudeSqr() < step*step){ m_nStaticFrames++; diff --git a/src/entities/Vehicle.cpp b/src/entities/Vehicle.cpp index 25bede65..dccd9195 100644 --- a/src/entities/Vehicle.cpp +++ b/src/entities/Vehicle.cpp @@ -429,7 +429,7 @@ CVehicle::ProcessCarAlarm(void) if(m_nAlarmState == 0 || m_nAlarmState == -1) return; - step = CTimer::GetTimeStep()/50.0f * 1000.0f; + step = CTimer::GetTimeStepInMilliseconds(); if((uint16)m_nAlarmState < step) m_nAlarmState = 0; else |