Changeset 11174 for code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc

Timestamp:

Apr 21, 2016, 4:47:39 PM (8 years ago)

Author:

sagerj

Message:

everything beneath weaponmode changed to push/release - wm modified only need to implement timer/ticker

File:

• code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc (modified) (2 diffs)

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

@@ -99 +99 @@
         Fire this Weapon with the the WeaponMode defined by @param mode
     */
-    void Weapon::fire(unsigned int mode)
+    void Weapon::push(unsigned int mode)
     {
         // To avoid firing with more than one mode at the same time, we lock the weapon (reloading) for
@@ -125 +125 @@
         {
             float reloading_time = 0;
-            if (it->second->fire(&reloading_time))
+            if (it->second->push(&reloading_time))
             {
                 this->bReloading_ = true;