Changeset 5935 for code/branches/pickup/src/orxonox/worldentities/BigExplosion.h

Timestamp:

Oct 13, 2009, 5:05:17 PM (16 years ago)

Author:

dafrick

Message:

Hopefully merged trunk successfully into pickup branch.

Location:

code/branches/pickup

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/BigExplosion.h (modified) (2 diffs)

code/branches/pickup/src/orxonox/worldentities/BigExplosion.h

@@ -57 +57 @@
             void checkStop();
             void stop();
-            void destroy();
             void init();
             void initZero();
@@ -98 +97 @@
             ParticleInterface*    explosionFire_;
 
-            LODParticle::Value      LOD_;
-            Timer<BigExplosion> destroyTimer_;
+            LODParticle::Value    LOD_;
+            Timer                 destroyTimer_;
     };
 }