summaryrefslogtreecommitdiffstats
path: root/src/render/Particle.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-10-25 01:25:11 +0200
committereray orçunus <erayorcunus@gmail.com>2019-10-25 21:17:55 +0200
commit2d998b24163060e225481d0f9a59092fa0981db1 (patch)
tree4c2f670644db151e0afbb3d5f707e5e1457f234c /src/render/Particle.cpp
parentMerge pull request #247 from Sergeanur/3dMarkers (diff)
downloadre3-2d998b24163060e225481d0f9a59092fa0981db1.tar
re3-2d998b24163060e225481d0f9a59092fa0981db1.tar.gz
re3-2d998b24163060e225481d0f9a59092fa0981db1.tar.bz2
re3-2d998b24163060e225481d0f9a59092fa0981db1.tar.lz
re3-2d998b24163060e225481d0f9a59092fa0981db1.tar.xz
re3-2d998b24163060e225481d0f9a59092fa0981db1.tar.zst
re3-2d998b24163060e225481d0f9a59092fa0981db1.zip
Diffstat (limited to 'src/render/Particle.cpp')
-rw-r--r--src/render/Particle.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index e2db55c7..56ac9512 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -12,6 +12,10 @@
#include "ParticleObject.h"
#include "Particle.h"
+#ifndef MASTER
+bool CParticle::bEnableBannedParticles = false;
+#endif
+
#define MAX_PARTICLES_ON_SCREEN (1000)
@@ -768,7 +772,9 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
{
if ( CTimer::GetIsPaused() )
return NULL;
-
+#ifndef MASTER
+ if(!bEnableBannedParticles)
+#endif
if ( ( type == PARTICLE_ENGINE_SMOKE
|| type == PARTICLE_ENGINE_SMOKE2
|| type == PARTICLE_ENGINE_STEAM
@@ -781,7 +787,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
{
return nil;
}
-
+
CParticle *pParticle = m_pUnusedListHead;
if ( pParticle == nil )
@@ -1455,7 +1461,10 @@ void CParticle::Render()
RwRaster **frames = psystem->m_ppRaster;
tParticleType type = psystem->m_Type;
-
+
+#ifndef MASTER
+ if (!bEnableBannedParticles)
+#endif
if ( type == PARTICLE_ENGINE_SMOKE
|| type == PARTICLE_ENGINE_SMOKE2
|| type == PARTICLE_ENGINE_STEAM