Changeset 5831 for code/branches/core5/src/modules/weapons/projectiles

Timestamp:

Sep 28, 2009, 10:48:47 PM (16 years ago)

Author:

landauf

Message:

Realized Timer doesn't have to be a template, hence merged TimerBase, Timer and StaticTimer.
Removed the object pointer from Timer for memberfunctions, use createFunctor(f, object) instead.

Location:

code/branches/core5/src/modules/weapons/projectiles

Files:

• LightningGunProjectile.cc (modified) (1 diff)
• LightningGunProjectile.h (modified) (1 diff)
• Projectile.cc (modified) (1 diff)
• Projectile.h (modified) (1 diff)

code/branches/core5/src/modules/weapons/projectiles/LightningGunProjectile.cc

@@ -42 +42 @@
         this->textureIndex_ = 1;
         this->maxTextureIndex_ = 8;
-        this->textureTimer_.setTimer(0.01f, true, this, createExecutor(createFunctor(&LightningGunProjectile::changeTexture)));
+        this->textureTimer_.setTimer(0.01f, true, createExecutor(createFunctor(&LightningGunProjectile::changeTexture, this)));
         
         registerVariables();

code/branches/core5/src/modules/weapons/projectiles/LightningGunProjectile.h

@@ -50 +50 @@
             unsigned int textureIndex_;
             unsigned int maxTextureIndex_;
-            Timer<LightningGunProjectile> textureTimer_;
+            Timer textureTimer_;
             std::string materialBase_;
       private:

code/branches/core5/src/modules/weapons/projectiles/Projectile.cc

@@ -61 +61 @@
             this->attachCollisionShape(shape);
 
-            this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject)));
+            this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Projectile::destroyObject, this)));
         }
     }

code/branches/core5/src/modules/weapons/projectiles/Projectile.h

@@ -66 +66 @@
             float damage_;
             bool bDestroy_;
-            Timer<Projectile> destroyTimer_;
+            Timer destroyTimer_;
     };
 }