Changeset 11153 for code/branches/sagerjFS16/src/orxonox/weaponsystem

Timestamp:

Mar 24, 2016, 3:56:35 PM (9 years ago)

Author:

sagerj

Message:

added release functions in various classes: weaponmode, weaponsystem, humancontroller, newhumancontroller, discharger

Location:

code/branches/sagerjFS16/src/orxonox/weaponsystem

Files:

• WeaponMode.cc (modified) (1 diff)
• WeaponSystem.cc (modified) (1 diff)
• WeaponSystem.h (modified) (1 diff)

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

@@ -169 +169 @@
     }
 
+    void WeaponMode::release()
+
     bool WeaponMode::reload()
     {

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

@@ -294 +294 @@
     }
 
+    void WeaponSystem::release(unsigned int firemode)
+    {
+        std::map<unsigned int, WeaponSet *>::iterator it = this->weaponSets_.find(firemode);
+        if (it != this->weaponSets_.end() && it->second)
+            it->second->release();
+    }
+
     void WeaponSystem::reload()
     {

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

@@ -76 +76 @@
             void fire(unsigned int firemode);
             void reload();
+            void release(unsigned int firemode);
 
             Munition * getMunition(SubclassIdentifier<Munition> * identifier);