summaryrefslogtreecommitdiffstats
path: root/src/render/ParticleMgr.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-06-30 15:21:58 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-06-30 15:21:58 +0200
commit7c6b291860fd415f79067fc7058f11ffa58fdf10 (patch)
tree15ccabed4c8c5d7c5c2f7a636035876cbd183e4d /src/render/ParticleMgr.cpp
parentReactivated Store(Restore)StuffIn(From)Mem, fixed bugs (diff)
parentMerge pull request #78 from ShFil119/cleanup (diff)
downloadre3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.gz
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.bz2
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.lz
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.xz
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.zst
re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.zip
Diffstat (limited to 'src/render/ParticleMgr.cpp')
-rw-r--r--src/render/ParticleMgr.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/render/ParticleMgr.cpp b/src/render/ParticleMgr.cpp
index 440ea9cb..7a1804de 100644
--- a/src/render/ParticleMgr.cpp
+++ b/src/render/ParticleMgr.cpp
@@ -19,7 +19,7 @@ void cParticleSystemMgr::Initialise()
LoadParticleData();
for ( int32 i = 0; i < MAX_PARTICLES; i++ )
- m_aParticles[i].m_pParticles = NULL;
+ m_aParticles[i].m_pParticles = nil;
}
void cParticleSystemMgr::LoadParticleData()
@@ -28,7 +28,7 @@ void cParticleSystemMgr::LoadParticleData()
CFileMgr::LoadFile(ParticleFilename, work_buff, ARRAY_SIZE(work_buff), "r");
CFileMgr::SetDir("");
- tParticleSystemData *entry = NULL;
+ tParticleSystemData *entry = nil;
int32 type = PARTICLE_FIRST;
char *lineStart = (char *)work_buff;
@@ -39,8 +39,8 @@ void cParticleSystemMgr::LoadParticleData()
while ( true )
{
- ASSERT(lineStart != NULL);
- ASSERT(lineEnd != NULL);
+ ASSERT(lineStart != nil);
+ ASSERT(lineEnd != nil);
while ( *lineEnd != '\n' )
++lineEnd;
@@ -64,7 +64,7 @@ void cParticleSystemMgr::LoadParticleData()
char *value = strtok(line, delims);
- ASSERT(value != NULL);
+ ASSERT(value != nil);
do
{
@@ -73,7 +73,7 @@ void cParticleSystemMgr::LoadParticleData()
case CFG_PARAM_PARTICLE_TYPE_NAME:
ASSERT(type < MAX_PARTICLES);
entry = &m_aParticles[type];
- ASSERT(entry != NULL);
+ ASSERT(entry != nil);
entry->m_Type = (tParticleType)type++;
strcpy(entry->m_aName, value);
break;
@@ -227,14 +227,14 @@ void cParticleSystemMgr::LoadParticleData()
break;
}
- value = strtok(NULL, delims);
+ value = strtok(nil, delims);
param++;
if ( param > CFG_PARAM_LAST )
param = CFG_PARAM_FIRST;
- } while ( value != NULL );
+ } while ( value != nil );
}
lineEnd++;