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

Timestamp:

Apr 14, 2016, 1:11:00 PM (9 years ago)

Author:

sagerj

Message:

added orxout() for every release lvl for debug purpose

Location:

code/branches/sagerjFS16/src/orxonox/weaponsystem

Files:

• Weapon.cc (modified) (1 diff)
• Weapon.h (modified) (1 diff)
• WeaponMode.cc (modified) (1 diff)
• WeaponMode.h (modified) (1 diff)
• WeaponPack.cc (modified) (1 diff)
• WeaponPack.h (modified) (1 diff)
• WeaponSet.cc (modified) (1 diff)
• WeaponSet.h (modified) (1 diff)
• WeaponSystem.cc (modified) (1 diff)
• WeaponSystem.h (modified) (1 diff)

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

@@ -134 +134 @@
     }
 
+    void Weapon::release(unsigned int mode)
+    {orxout() << "release weapon " << mode << endl;}
+
     /**
     @brief

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

@@ -53 +53 @@
 
             void fire(unsigned int mode);
+            void release(unsigned int mode);
             void reload();
 

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

@@ -169 +169 @@
     }
 
-    void WeaponMode::release()
+    void WeaponMode::release(float* reloadTime)
+    {orxout() << "release wmode " << reloadTime << endl;}
 
     bool WeaponMode::reload()

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

@@ -58 +58 @@
 
             virtual bool fire(float* reloadTime);
+            virtual void release(float* reloadTime);
             bool reload();
 

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

@@ -78 +78 @@
         for (Weapon* weapon : this->weapons_)
             weapon->fire(weaponmode);
+    }
+
+    void WeaponPack::release(unsigned int weaponmode)
+    {
+        for (Weapon* weapon : this->weapons_)
+            weapon->release(weaponmode);
+        orxout() << "release wpack " << weaponmode << endl;
     }
 

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

@@ -47 +47 @@
 
             void fire(unsigned int weaponmode);
+            void release(unsigned int weaponmode);
             void reload();
 

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

@@ -68 +68 @@
     }
 
+    void WeaponSet::release()
+    {
+        
+        // Fire all WeaponPacks with their defined weaponmode
+        for (const auto& mapEntry : this->weaponpacks_)
+            if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED)
+                mapEntry.first->release(mapEntry.second);
+        orxout() << "release wset " << endl;
+        
+    }
+
     void WeaponSet::reload()
     {

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

@@ -47 +47 @@
 
             void fire();
+            void release();
             void reload();
 

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

@@ -299 +299 @@
         if (it != this->weaponSets_.end() && it->second)
             it->second->release();
+        orxout() << "release wsys " << firemode << endl;
     }
 

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

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