Changeset 5929 for code/trunk/src/modules/weapons/weaponmodes

Timestamp:

Oct 12, 2009, 8:20:07 PM (15 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/EnergyDrink.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/HsW01.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/HsW01.h (modified) (1 diff)

code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -54 +54 @@
         this->setMunitionName("FusionMunition");
 
-        this->delayTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&EnergyDrink::shot)));
+        this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&EnergyDrink::shot, this)));
         this->delayTimer_.stopTimer();
     }

code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h

@@ -59 +59 @@
             float speed_;
             float delay_;
-            Timer<EnergyDrink> delayTimer_;
+            Timer delayTimer_;
     };
 }

code/trunk/src/modules/weapons/weaponmodes/HsW01.cc

@@ -54 +54 @@
         this->setMunitionName("LaserMunition");
 
-        this->delayTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&HsW01::shot)));
+        this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&HsW01::shot, this)));
         this->delayTimer_.stopTimer();
     }

code/trunk/src/modules/weapons/weaponmodes/HsW01.h

@@ -57 +57 @@
             float speed_;
             float delay_;
-            Timer<HsW01> delayTimer_;
+            Timer delayTimer_;
     };
 }