summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRoman Masanin <36927roma@gmail.com>2020-10-05 18:05:13 +0200
committerRoman Masanin <36927roma@gmail.com>2020-10-05 18:05:13 +0200
commita6a1de5006134212a631087ec5a366e005d27043 (patch)
treea183206f46ebd411880554d8653c17eb3b61d838 /src
parentfix mistakes (diff)
downloadre3-a6a1de5006134212a631087ec5a366e005d27043.tar
re3-a6a1de5006134212a631087ec5a366e005d27043.tar.gz
re3-a6a1de5006134212a631087ec5a366e005d27043.tar.bz2
re3-a6a1de5006134212a631087ec5a366e005d27043.tar.lz
re3-a6a1de5006134212a631087ec5a366e005d27043.tar.xz
re3-a6a1de5006134212a631087ec5a366e005d27043.tar.zst
re3-a6a1de5006134212a631087ec5a366e005d27043.zip
Diffstat (limited to 'src')
-rw-r--r--src/weapons/Explosion.cpp6
-rw-r--r--src/weapons/Explosion.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/weapons/Explosion.cpp b/src/weapons/Explosion.cpp
index d53e15ca..515dff94 100644
--- a/src/weapons/Explosion.cpp
+++ b/src/weapons/Explosion.cpp
@@ -56,7 +56,7 @@ CExplosion::ClearAllExplosions()
gaExplosion[i].m_nIteration = 0;
gaExplosion[i].m_fStartTime = 0.0f;
gaExplosion[i].m_bIsBoat = false;
- gaExplosion[i].m_bIsMakeSound = true;
+ gaExplosion[i].m_bMakeSound = true;
}
}
@@ -92,7 +92,7 @@ CExplosion::GetExplosionType(uint8 id)
bool
CExplosion::DoesExplosionMakeSound(uint8 id)
{
- return gaExplosion[id].m_bIsMakeSound;
+ return gaExplosion[id].m_bMakeSound;
};
CVector *
@@ -140,7 +140,7 @@ CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionT
explosion.m_nIteration = 1;
explosion.m_nActiveCounter = 1;
explosion.m_bIsBoat = false;
- explosion.m_bIsMakeSound = makeSound;
+ explosion.m_bMakeSound = makeSound;
explosion.m_nParticlesExpireTime = lifetime != 0 ? CTimer::GetTimeInMilliseconds() + lifetime : 0;
switch (type)
{
diff --git a/src/weapons/Explosion.h b/src/weapons/Explosion.h
index 8fbfe63e..7aa02b63 100644
--- a/src/weapons/Explosion.h
+++ b/src/weapons/Explosion.h
@@ -31,7 +31,7 @@ class CExplosion
uint8 m_nIteration;
uint8 m_nActiveCounter;
bool m_bIsBoat;
- bool m_bIsMakeSound;
+ bool m_bMakeSound;
float m_fStartTime;
uint32 m_nParticlesExpireTime;
float m_fPower;