diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-01-01 00:42:00 +0100 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-01-01 00:42:00 +0100 |
commit | 5b0cf80a76e49cee88e796bb8c4b53fd3ca8f3c5 (patch) | |
tree | 2e2bca559ef34473733d63a022c74a711c894830 /src/render/Particle.cpp | |
parent | some not fully tested stuff (diff) | |
parent | making particleobject compile on vs2015 (diff) | |
download | re3-5b0cf80a76e49cee88e796bb8c4b53fd3ca8f3c5.tar re3-5b0cf80a76e49cee88e796bb8c4b53fd3ca8f3c5.tar.gz re3-5b0cf80a76e49cee88e796bb8c4b53fd3ca8f3c5.tar.bz2 re3-5b0cf80a76e49cee88e796bb8c4b53fd3ca8f3c5.tar.lz re3-5b0cf80a76e49cee88e796bb8c4b53fd3ca8f3c5.tar.xz re3-5b0cf80a76e49cee88e796bb8c4b53fd3ca8f3c5.tar.zst re3-5b0cf80a76e49cee88e796bb8c4b53fd3ca8f3c5.zip |
Diffstat (limited to 'src/render/Particle.cpp')
-rw-r--r-- | src/render/Particle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp index 56ac9512..6956a887 100644 --- a/src/render/Particle.cpp +++ b/src/render/Particle.cpp @@ -12,7 +12,7 @@ #include "ParticleObject.h" #include "Particle.h" -#ifndef MASTER +#ifdef TOGGLEABLE_BETA_FEATURES bool CParticle::bEnableBannedParticles = false; #endif @@ -772,7 +772,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe { if ( CTimer::GetIsPaused() ) return NULL; -#ifndef MASTER +#ifdef TOGGLEABLE_BETA_FEATURES if(!bEnableBannedParticles) #endif if ( ( type == PARTICLE_ENGINE_SMOKE @@ -1462,7 +1462,7 @@ void CParticle::Render() tParticleType type = psystem->m_Type; -#ifndef MASTER +#ifdef TOGGLEABLE_BETA_FEATURES if (!bEnableBannedParticles) #endif if ( type == PARTICLE_ENGINE_SMOKE |