Changeset 6623 in orxonox.OLD for trunk/src/lib/particles/sprite_particles.cc

Timestamp:

Jan 20, 2006, 12:54:20 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: particle Systems and Emitters are loaded and cleaned up nicely

File:

• trunk/src/lib/particles/sprite_particles.cc (modified) (2 diffs)

trunk/src/lib/particles/sprite_particles.cc

@@ -53 +53 @@
 {
   this->init();
-
-  this->loadParams(root);
+  if (root != NULL)
+    this->loadParams(root);
 }
 
@@ -96 +96 @@
 void SpriteParticles::loadParams(const TiXmlElement* root)
 {
-  SpriteParticles::loadParams(root);
+  ParticleSystem::loadParams(root);
 
   LoadParam(root, "texture", this, SpriteParticles, setMaterialTexture);