summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorblingu <36486731+blingu@users.noreply.github.com>2020-03-26 17:11:04 +0100
committerGitHub <noreply@github.com>2020-03-26 17:11:04 +0100
commit79822e3f7c1c0255f9b0dad2d874d88a1c2b2c3f (patch)
tree50a8deb37c083858d597713495858ebb47bcdcec /src
parentUpdate Fire.cpp (diff)
downloadre3-79822e3f7c1c0255f9b0dad2d874d88a1c2b2c3f.tar
re3-79822e3f7c1c0255f9b0dad2d874d88a1c2b2c3f.tar.gz
re3-79822e3f7c1c0255f9b0dad2d874d88a1c2b2c3f.tar.bz2
re3-79822e3f7c1c0255f9b0dad2d874d88a1c2b2c3f.tar.lz
re3-79822e3f7c1c0255f9b0dad2d874d88a1c2b2c3f.tar.xz
re3-79822e3f7c1c0255f9b0dad2d874d88a1c2b2c3f.tar.zst
re3-79822e3f7c1c0255f9b0dad2d874d88a1c2b2c3f.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/Fire.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
index 63442787..c98c808d 100644
--- a/src/core/Fire.cpp
+++ b/src/core/Fire.cpp
@@ -116,7 +116,7 @@ CFire::ProcessFire(void)
rand(); rand(); rand(); /* unsure why these three rands are called */
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_nStartTime)
@@ -129,14 +129,14 @@ CFire::ProcessFire(void)
if (!m_pEntity) {
CShadows::StoreStaticShadow((uint32)this, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &lightpos,
- 7.0, 0.0, 0.0, -7.0, 0, nRandNumber / 2, nRandNumber / 2,
- 0, 10.0, 1.0, 40.0, 0, 0.0);
+ 7.0f, 0.0f, 0.0f, -7.0f, 0, nRandNumber / 2, nRandNumber / 2,
+ 0, 10.0f, 1.0f, 40.0f, 0, 0.0f);
}
fGreen = nRandNumber / 128;
fRed = nRandNumber / 128;
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 {
Extinguish();
}
@@ -312,7 +312,7 @@ CFire *
CFireManager::FindFurthestFire_NeverMindFireMen(CVector coords, float minRange, float maxRange)
{
int furthestFire = -1;
- float lastFireDist = 0.0;
+ float lastFireDist = 0.0f;
float fireDist;
for (int i = 0; i < NUM_FIRES; i++) {