Changeset 6823 in orxonox.OLD for trunk/src/lib/particles/particle_system.cc

Timestamp:

Jan 29, 2006, 2:20:46 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: BoxEmitter

File:

• trunk/src/lib/particles/particle_system.cc (modified) (1 diff)

trunk/src/lib/particles/particle_system.cc

@@ -140 +140 @@
   {
     BaseObject* emitter = Factory::fabricate(element);
-    if (emitter->isA(CL_PARTICLE_EMITTER))
-      this->addEmitter(dynamic_cast<ParticleEmitter*>(emitter));
+    if (emitter != NULL)
+    {
+      if (emitter->isA(CL_PARTICLE_EMITTER))
+        this->addEmitter(dynamic_cast<ParticleEmitter*>(emitter));
+      else
+      {
+        PRINTF(2)("Tried to load an Element of type '%s' that should be a ParticleEmitter onto '%s::%s'.\n",
+                  emitter->getClassName(), this->getClassName(), this->getName());
+        delete emitter;
+      }
+    }
     else
     {
-      PRINTF(2)("Tried to load an Element of type '%s' that should be a ParticleEmitter onto '%s::%s'.\n",
-                emitter->getClassName(), this->getClassName(), this->getName());
-      delete emitter;
+      PRINTF(2)("Could not Generate Emitter for system %s::%s (wrong type in XML-format)\n", this->getClassName(), getName());
     }
   }