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

Timestamp:

Apr 21, 2016, 4:47:39 PM (9 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/WeaponSystem.cc (modified) (1 diff)

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

@@ -287 +287 @@
         Fires the @ref orxonox::WeaponSet with the specified firemode.
     */
-    void WeaponSystem::fire(unsigned int firemode)
+    void WeaponSystem::push(unsigned int firemode)
     {
         std::map<unsigned int, WeaponSet *>::iterator it = this->weaponSets_.find(firemode);
         if (it != this->weaponSets_.end() && it->second)
-            it->second->fire();
+            it->second->push();
     }