Changeset 5831 for code/branches/core5/src/orxonox/weaponsystem

Timestamp:

Sep 28, 2009, 10:48:47 PM (15 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/orxonox/weaponsystem

Files:

• Munition.cc (modified) (1 diff)
• Munition.h (modified) (1 diff)
• Weapon.cc (modified) (1 diff)
• Weapon.h (modified) (1 diff)
• WeaponMode.cc (modified) (1 diff)
• WeaponMode.h (modified) (1 diff)

code/branches/core5/src/orxonox/weaponsystem/Munition.cc

@@ -461 +461 @@
         if (bUseReloadTime && (munition->reloadTime_ > 0 || munition->bStackMunition_))
         {
-            ExecutorMember<Magazine>* executor = createExecutor(createFunctor(&Magazine::loaded));
+            Executor* executor = createExecutor(createFunctor(&Magazine::loaded, this));
             executor->setDefaultValues(munition);
 
-            this->loadTimer_.setTimer(munition->reloadTime_, false, this, executor);
+            this->loadTimer_.setTimer(munition->reloadTime_, false, executor);
         }
         else

code/branches/core5/src/orxonox/weaponsystem/Munition.h

@@ -47 +47 @@
 
                 unsigned int munition_;
-                Timer<Magazine> loadTimer_;
+                Timer loadTimer_;
                 bool bLoaded_;
 

code/branches/core5/src/orxonox/weaponsystem/Weapon.cc

@@ -50 +50 @@
         this->reloadingWeaponmode_ = WeaponSystem::WEAPON_MODE_UNASSIGNED;
 
-        this->reloadTimer_.setTimer(0.0f, false, this, createExecutor(createFunctor(&Weapon::reloaded)));
+        this->reloadTimer_.setTimer(0.0f, false, createExecutor(createFunctor(&Weapon::reloaded, this)));
         this->reloadTimer_.stopTimer();
     }

code/branches/core5/src/orxonox/weaponsystem/Weapon.h

@@ -71 +71 @@
             std::multimap<unsigned int, WeaponMode*> weaponmodes_;
 
-            Timer<Weapon> reloadTimer_;
+            Timer reloadTimer_;
             bool bReloading_;
             unsigned int reloadingWeaponmode_;

code/branches/core5/src/orxonox/weaponsystem/WeaponMode.cc

@@ -57 +57 @@
         this->bParallelReload_ = true;
 
-        this->reloadTimer_.setTimer(0.0f, false, this, createExecutor(createFunctor(&WeaponMode::reloaded)));
+        this->reloadTimer_.setTimer(0.0f, false, createExecutor(createFunctor(&WeaponMode::reloaded, this)));
         this->reloadTimer_.stopTimer();
 

code/branches/core5/src/orxonox/weaponsystem/WeaponMode.h

@@ -150 +150 @@
             std::string munitionname_;
 
-            Timer<WeaponMode> reloadTimer_;
+            Timer reloadTimer_;
             bool bReloading_;
     };