Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Update Fire.cpp

Browse Source
This commit is contained in:
blingu 2020-03-26 17:11:04 +01:00 committed by GitHub
parent 853b2d0c78
commit 79822e3f7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/Fire.cpp
View File

@ -116,7 +116,7 @@ CFire::ProcessFire(void)
rand(); rand(); rand(); /* unsure why these three rands are called */ rand(); rand(); rand(); /* unsure why these three rands are called */
CParticle::AddParticle(PARTICLE_CARFLAME_SMOKE, firePos, CParticle::AddParticle(PARTICLE_CARFLAME_SMOKE, firePos,
CVector(0.0f, 0.0f, 0.0f), 0, 0.0, 0, 0, 0, 0); CVector(0.0f, 0.0f, 0.0f), 0, 0.0f, 0, 0, 0, 0);
} }
if (CTimer::GetTimeInMilliseconds() < m_nExtinguishTime || m_bIsScriptFire) { if (CTimer::GetTimeInMilliseconds() < m_nExtinguishTime || m_bIsScriptFire) {
if (CTimer::GetTimeInMilliseconds() > m_nStartTime) if (CTimer::GetTimeInMilliseconds() > m_nStartTime)
@ -129,14 +129,14 @@ CFire::ProcessFire(void)
if (!m_pEntity) { if (!m_pEntity) {
CShadows::StoreStaticShadow((uint32)this, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &lightpos, CShadows::StoreStaticShadow((uint32)this, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &lightpos,
7.0, 0.0, 0.0, -7.0, 0, nRandNumber / 2, nRandNumber / 2, 7.0f, 0.0f, 0.0f, -7.0f, 0, nRandNumber / 2, nRandNumber / 2,
0, 10.0, 1.0, 40.0, 0, 0.0); 0, 10.0f, 1.0f, 40.0f, 0, 0.0f);
} }
fGreen = nRandNumber / 128; fGreen = nRandNumber / 128;
fRed = nRandNumber / 128; fRed = nRandNumber / 128;
CPointLights::AddLight(0, m_vecPos, CVector(0.0f, 0.0f, 0.0f), CPointLights::AddLight(0, m_vecPos, CVector(0.0f, 0.0f, 0.0f),
12.0, fRed, fGreen, 0, 0, 0); 12.0f, fRed, fGreen, 0, 0, 0);
} else { } else {
Extinguish(); Extinguish();
} }
@ -312,7 +312,7 @@ CFire *
CFireManager::FindFurthestFire_NeverMindFireMen(CVector coords, float minRange, float maxRange) CFireManager::FindFurthestFire_NeverMindFireMen(CVector coords, float minRange, float maxRange)
{ {
int furthestFire = -1; int furthestFire = -1;
float lastFireDist = 0.0; float lastFireDist = 0.0f;
float fireDist; float fireDist;
for (int i = 0; i < NUM_FIRES; i++) { for (int i = 0; i < NUM_FIRES; i++) {