diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-05-12 23:55:52 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-12 23:55:52 +0200 |
commit | 7c2b9478d52e5122eff2e11298f31bfc1b896f94 (patch) | |
tree | 53ad6828eb1366a5dd00d9977eec330bd3d7b52f /src/render | |
parent | Merge remote-tracking branch 'origin/master' into miami (diff) | |
parent | Merge pull request #537 from ShFil119/linux_warns (diff) | |
download | re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.gz re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.bz2 re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.lz re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.xz re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.zst re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.zip |
Diffstat (limited to '')
-rw-r--r-- | src/render/Particle.cpp | 3 | ||||
-rw-r--r-- | src/render/WaterLevel.cpp | 2 | ||||
-rw-r--r-- | src/render/WaterLevel.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp index 3babbe44..e73cd9a7 100644 --- a/src/render/Particle.cpp +++ b/src/render/Particle.cpp @@ -984,6 +984,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe case PARTICLE_WATER_HYDRANT: pParticle->m_vecPosition.z += 20.0f * psystem->m_fPositionRandomError * ms_afRandTable[CGeneral::GetRandomNumber() % RAND_TABLE_SIZE]; break; + default: break; } if ( fSize != 0.0f ) @@ -1214,6 +1215,7 @@ void CParticle::Update() continue; } break; + default: break; } } } @@ -1295,6 +1297,7 @@ void CParticle::Update() continue; } break; + default: break; } } } diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp index 66debd68..f1ccccb3 100644 --- a/src/render/WaterLevel.cpp +++ b/src/render/WaterLevel.cpp @@ -49,7 +49,7 @@ const float fBlueMult = 1.4f; void -CWaterLevel::Initialise(char *pWaterDat) +CWaterLevel::Initialise(Const char *pWaterDat) { ms_nNoOfWaterLevels = 0; diff --git a/src/render/WaterLevel.h b/src/render/WaterLevel.h index 2fe2e103..435692c1 100644 --- a/src/render/WaterLevel.h +++ b/src/render/WaterLevel.h @@ -81,7 +81,7 @@ class CWaterLevel static int16 nGeomUsed; public: - static void Initialise(char *pWaterDat); + static void Initialise(Const char *pWaterDat); static void Shutdown(); static void CreateWavyAtomic(); static void DestroyWavyAtomic(); |