summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblingu <36486731+blingu@users.noreply.github.com>2020-03-25 21:24:32 +0100
committerGitHub <noreply@github.com>2020-03-25 21:24:32 +0100
commitc3841fe5b48f3b1c567d03273a2ea23bacac89ca (patch)
tree1b33e8a964ee3dc5eee64676889aee120abbc747
parentUpdate Fire.cpp (diff)
downloadre3-c3841fe5b48f3b1c567d03273a2ea23bacac89ca.tar
re3-c3841fe5b48f3b1c567d03273a2ea23bacac89ca.tar.gz
re3-c3841fe5b48f3b1c567d03273a2ea23bacac89ca.tar.bz2
re3-c3841fe5b48f3b1c567d03273a2ea23bacac89ca.tar.lz
re3-c3841fe5b48f3b1c567d03273a2ea23bacac89ca.tar.xz
re3-c3841fe5b48f3b1c567d03273a2ea23bacac89ca.tar.zst
re3-c3841fe5b48f3b1c567d03273a2ea23bacac89ca.zip
Diffstat (limited to '')
-rw-r--r--src/core/Fire.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
index e6756884..05c4fe96 100644
--- a/src/core/Fire.cpp
+++ b/src/core/Fire.cpp
@@ -95,8 +95,8 @@ CFire::ProcessFire(void)
FindPlayerPed()->DoStuffToGoOnFire();
gFireManager.StartFire(FindPlayerPed(), m_pSource, 0.8f, 1);
}
- if (CTimer::m_snTimeInMilliseconds > m_nNextTimeToAddFlames) {
- m_nNextTimeToAddFlames = CTimer::m_snTimeInMilliseconds + 80;
+ if (CTimer::GetTimeInMilliseconds() > m_nNextTimeToAddFlames) {
+ m_nNextTimeToAddFlames = CTimer::GetTimeInMilliseconds() + 80;
firePos = m_vecPos;
if (veh && veh->IsVehicle() && veh->IsCar()) {
@@ -118,9 +118,9 @@ CFire::ProcessFire(void)
CParticle::AddParticle(PARTICLE_CARFLAME_SMOKE, firePos,
CVector(0.0f, 0.0f, 0.0f), 0, 0.0, 0, 0, 0, 0);
}
- if (CTimer::m_snTimeInMilliseconds < m_nExtinguishTime || m_bIsScriptFire) {
- if (CTimer::m_snTimeInMilliseconds > m_nStartTime)
- m_nStartTime = CTimer::m_snTimeInMilliseconds + 400;
+ if (CTimer::GetTimeInMilliseconds() < m_nExtinguishTime || m_bIsScriptFire) {
+ if (CTimer::GetTimeInMilliseconds() > m_nStartTime)
+ m_nStartTime = CTimer::GetTimeInMilliseconds() + 400;
nRandNumber = CGeneral::GetRandomNumber() & 127;
lightpos.x = m_vecPos.x;
@@ -182,8 +182,8 @@ CFireManager::StartFire(CVector pos, float size, bool propagation)
fire->m_bPropagationFlag = propagation;
fire->m_bAudioSet = true;
fire->m_vecPos = pos;
- fire->m_nExtinguishTime = CTimer::m_snTimeInMilliseconds + 10000;
- fire->m_nStartTime = CTimer::m_snTimeInMilliseconds + 400;
+ fire->m_nExtinguishTime = CTimer::GetTimeInMilliseconds() + 10000;
+ fire->m_nStartTime = CTimer::GetTimeInMilliseconds() + 400;
fire->m_pEntity = nil;
fire->m_pSource = nil;
fire->m_nNextTimeToAddFlames = 0;
@@ -251,13 +251,13 @@ CFireManager::StartFire(CEntity *entityOnFire, CEntity *fleeFrom, float strength
fire->m_vecPos = entityOnFire->GetPosition();
if (entityOnFire && entityOnFire->IsPed() && ped->IsPlayer()) {
- fire->m_nExtinguishTime = CTimer::m_snTimeInMilliseconds + 3333;
+ fire->m_nExtinguishTime = CTimer::GetTimeInMilliseconds() + 3333;
} else if (entityOnFire->IsVehicle()) {
- fire->m_nExtinguishTime = CTimer::m_snTimeInMilliseconds + CGeneral::GetRandomNumberInRange(4000, 5000);
+ fire->m_nExtinguishTime = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(4000, 5000);
} else {
- fire->m_nExtinguishTime = CTimer::m_snTimeInMilliseconds + CGeneral::GetRandomNumberInRange(10000, 11000);
+ fire->m_nExtinguishTime = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(10000, 11000);
}
- fire->m_nStartTime = CTimer::m_snTimeInMilliseconds + 400;
+ fire->m_nStartTime = CTimer::GetTimeInMilliseconds() + 400;
fire->m_pEntity = entityOnFire;
entityOnFire->RegisterReference(&fire->m_pEntity);
@@ -383,7 +383,7 @@ CFireManager::StartScriptFire(const CVector &pos, CEntity *target, float strengt
fire->m_bPropagationFlag = propagation;
fire->m_bAudioSet = true;
fire->m_vecPos = pos;
- fire->m_nStartTime = CTimer::m_snTimeInMilliseconds + 400;
+ fire->m_nStartTime = CTimer::GetTimeInMilliseconds() + 400;
fire->m_pEntity = target;
if (target)