Changeset 1263 for code/branches/merge/src/orxonox/objects/Explosion.cc

Timestamp:

May 13, 2008, 3:45:19 PM (16 years ago)

Author:

rgrieder

Message:

• merged ogre branch into merge branch

File:

• code/branches/merge/src/orxonox/objects/Explosion.cc (modified) (1 diff)

code/branches/merge/src/orxonox/objects/Explosion.cc

@@ -45 +45 @@
     CreateFactory(Explosion);
 
-    Explosion::Explosion(WorldEntity* owner)
+    Explosion::Explosion(WorldEntity* owner) :
+      particle_(0),
+      lifetime_(0.4)
     {
         RegisterObject(Explosion);
-
-        this->particle_ = 0;
-        this->lifetime_ = 0.4;
 
         if (owner)