summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-11-25 03:25:10 +0100
committereray orçunus <erayorcunus@gmail.com>2019-11-26 00:35:05 +0100
commit680fe0f7e6d4a94d5ee7f95dd6a5926012196e19 (patch)
treeba9e97db70363916e72b630c6fd5b9c927336476 /src/render
parentMerge pull request #272 from erorcun/erorcun (diff)
downloadre3-680fe0f7e6d4a94d5ee7f95dd6a5926012196e19.tar
re3-680fe0f7e6d4a94d5ee7f95dd6a5926012196e19.tar.gz
re3-680fe0f7e6d4a94d5ee7f95dd6a5926012196e19.tar.bz2
re3-680fe0f7e6d4a94d5ee7f95dd6a5926012196e19.tar.lz
re3-680fe0f7e6d4a94d5ee7f95dd6a5926012196e19.tar.xz
re3-680fe0f7e6d4a94d5ee7f95dd6a5926012196e19.tar.zst
re3-680fe0f7e6d4a94d5ee7f95dd6a5926012196e19.zip
Diffstat (limited to 'src/render')
-rw-r--r--src/render/Particle.cpp6
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