The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-11-23 17:49:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Fire.cpp

Browse Source
This commit is contained in:
blingu 2020-03-25 21:13:06 +01:00 committed by GitHub
parent 08e1c869a4
commit 96802f9b95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/Fire.cpp
View File

@ -31,7 +31,7 @@ CFire::CFire()
m_nExtinguishTime = 0; m_nExtinguishTime = 0;
m_nStartTime = 0; m_nStartTime = 0;
field_20 = 1; field_20 = 1;
field_24 = 0; m_nNextTimeToAddFlames = 0;
m_fStrength = 0.8f; m_fStrength = 0.8f;
} }
@ -95,8 +95,8 @@ CFire::ProcessFire(void)
FindPlayerPed()->DoStuffToGoOnFire(); FindPlayerPed()->DoStuffToGoOnFire();
gFireManager.StartFire(FindPlayerPed(), m_pSource, 0.8f, 1); gFireManager.StartFire(FindPlayerPed(), m_pSource, 0.8f, 1);
} }
if (CTimer::m_snTimeInMilliseconds > field_24) { /* set to 0 when a newfire starts, related to time */ if (CTimer::m_snTimeInMilliseconds > m_nNextTimeToAddFlames) {
field_24 = CTimer::m_snTimeInMilliseconds + 80; m_nNextTimeToAddFlames = CTimer::m_snTimeInMilliseconds + 80;
firePos = m_vecPos; firePos = m_vecPos;
if (veh && veh->IsVehicle() && veh->IsCar()) { if (veh && veh->IsVehicle() && veh->IsCar()) {
@ -122,7 +122,7 @@ CFire::ProcessFire(void)
if (CTimer::m_snTimeInMilliseconds > m_nStartTime) if (CTimer::m_snTimeInMilliseconds > m_nStartTime)
m_nStartTime = CTimer::m_snTimeInMilliseconds + 400; m_nStartTime = CTimer::m_snTimeInMilliseconds + 400;
nRandNumber = CGeneral::GetRandomNumber(); nRandNumber = CGeneral::GetRandomNumber() & 127;
lightpos.x = m_vecPos.x; lightpos.x = m_vecPos.x;
lightpos.y = m_vecPos.y; lightpos.y = m_vecPos.y;
lightpos.z = m_vecPos.z + 5.0f; lightpos.z = m_vecPos.z + 5.0f;
@ -162,7 +162,7 @@ CFire::Extinguish(void)
if (m_pEntity) { if (m_pEntity) {
if (m_pEntity->IsPed()) { if (m_pEntity->IsPed()) {
((CPed *)m_pEntity)->RestorePreviousState(); ((CPed *)m_pEntity)->RestorePreviousState();
((CPed *)m_pEntity)->m_pFire = 0; ((CPed *)m_pEntity)->m_pFire = nil;
} else if (m_pEntity->IsVehicle()) { } else if (m_pEntity->IsVehicle()) {
((CVehicle *)m_pEntity)->m_pCarFire = nil; ((CVehicle *)m_pEntity)->m_pCarFire = nil;
} }
@ -186,7 +186,7 @@ CFireManager::StartFire(CVector pos, float size, bool propagation)
fire->m_nStartTime = CTimer::m_snTimeInMilliseconds + 400; fire->m_nStartTime = CTimer::m_snTimeInMilliseconds + 400;
fire->m_pEntity = nil; fire->m_pEntity = nil;
fire->m_pSource = nil; fire->m_pSource = nil;
fire->field_24 = 0; fire->m_nNextTimeToAddFlames = 0;
fire->ReportThisFire(); fire->ReportThisFire();
fire->m_fStrength = size; fire->m_fStrength = size;
} }