Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 328 vs 331 for /trunk/Source Code/Core/Resources/ConcreteLoaders/ParticleEmitterLoaderImpl.cpp

Diff revisions: vs.
  @@ -5,15 +5,16 @@
5 5 namespace Divide {
6 6
7 7 ParticleEmitter* ImplResourceLoader<ParticleEmitter>::operator()(){
8 - DIVIDE_ASSERT( _descriptor.hasPropertyDescriptor(), "ImplResourceLoader<ParticleEmitter> error: No property descriptor specified!" );
9 - ParticleEmitter* ptr = New ParticleEmitter();
8 + DIVIDE_ASSERT(_descriptor.hasPropertyDescriptor(),
9 + "ImplResourceLoader<ParticleEmitter> error: No property descriptor specified!" );
10 + ParticleEmitter* ptr = MemoryManager_NEW ParticleEmitter();
10 11
11 12 if ( !load( ptr, _descriptor.getName() ) ) {
12 - MemoryManager::SAFE_DELETE( ptr );
13 + MemoryManager::DELETE( ptr );
13 14 } else {
14 15 ptr->renderState().useDefaultMaterial( false );
15 16 if ( !ptr->initData() ) {
16 - MemoryManager::SAFE_DELETE( ptr );
17 + MemoryManager::DELETE( ptr );
17 18 } else {
18 19 ptr->setDescriptor( *_descriptor.getPropertyDescriptor<ParticleEmitterDescriptor>() );
19 20 }