Changeset 5935 for code/branches/pickup/src/modules/weapons/munitions

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/modules/weapons/munitions/ReplenishingMunition.cc (modified) (2 diffs)
• src/modules/weapons/munitions/ReplenishingMunition.h (modified) (1 diff)

code/branches/pickup/src/modules/weapons/munitions/ReplenishingMunition.cc

@@ -44 +44 @@
         // replenishIntervall_ and replenishMunitionAmount_ will be set in the constructor of the
         // inheriting class, which comes after this constructor)
-        this->replenishingTimer_.setTimer(0.0f, false, this, createExecutor(createFunctor(&ReplenishingMunition::initializeTimer)));
+        this->replenishingTimer_.setTimer(0.0f, false, createExecutor(createFunctor(&ReplenishingMunition::initializeTimer, this)));
     }
 
@@ -50 +50 @@
     {
         // Initialize the timer
-        this->replenishingTimer_.setTimer(this->replenishIntervall_, true, this, createExecutor(createFunctor(&ReplenishingMunition::replenish)));
+        this->replenishingTimer_.setTimer(this->replenishIntervall_, true, createExecutor(createFunctor(&ReplenishingMunition::replenish, this)));
     }
 

code/branches/pickup/src/modules/weapons/munitions/ReplenishingMunition.h

@@ -51 +51 @@
             void initializeTimer();
 
-            Timer<ReplenishingMunition> replenishingTimer_;
+            Timer replenishingTimer_;
     };
 }