diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-08-22 04:10:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-08-22 04:10:33 +0300 |
| commit | b4d4598ff0e21ebf7a68030ac6b7e9d0f227cca2 (patch) | |
| tree | 275f2a2e80d1e89d66fc5db4e73129e44b6468e3 /src | |
| parent | 42768dd5dde30fce927b5582c97dc31a7903f29a (diff) | |
| download | manaverse-b4d4598ff0e21ebf7a68030ac6b7e9d0f227cca2.tar.gz manaverse-b4d4598ff0e21ebf7a68030ac6b7e9d0f227cca2.tar.bz2 manaverse-b4d4598ff0e21ebf7a68030ac6b7e9d0f227cca2.tar.xz manaverse-b4d4598ff0e21ebf7a68030ac6b7e9d0f227cca2.zip | |
Fix compilation with old compilers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/localconsts.h | 6 | ||||
| -rw-r--r-- | src/particle/particleengine.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/localconsts.h b/src/localconsts.h index dc7723ae3..5b53d364c 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -300,11 +300,11 @@ #endif // ENABLE_CHECKS -#if __cpp_if_constexpr >= 201606 +#if defined(__cpp_if_constexpr) && __cpp_if_constexpr >= 201606 #define ifconstexpr if constexpr -#else // __cpp_if_constexpr >= 201606 +#else // defined(__cpp_if_constexpr) && __cpp_if_constexpr >= 201606 #define ifconstexpr if -#endif // __cpp_if_constexpr >= 201606 +#endif // defined(__cpp_if_constexpr) && __cpp_if_constexpr >= 201606 #ifdef USE_SDL2 PRAGMA45(GCC diagnostic push) diff --git a/src/particle/particleengine.cpp b/src/particle/particleengine.cpp index b54e36d27..25e85fe94 100644 --- a/src/particle/particleengine.cpp +++ b/src/particle/particleengine.cpp @@ -69,7 +69,7 @@ void ParticleEngine::setupEngine() restrict2 ParticleEngine::maxCount = config.getIntValue("particleMaxCount"); ParticleEngine::fastPhysics = fromInt(config.getIntValue( "particleFastPhysics"), - ParticlePhysics); + ParticlePhysicsT); ParticleEngine::emitterSkip = config.getIntValue("particleEmitterSkip") + 1; if (ParticleEngine::emitterSkip == 0) |