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

Timestamp:

Apr 21, 2016, 3:33:48 PM (9 years ago)

Author:

sagerj

Message:

running backup

Location:

code/branches/sagerjFS16/src/orxonox/weaponsystem

Files:

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

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

@@ -114 +114 @@
         // Note: The reloading of each WeaponMode is internally handled by each A, B and C.
         //       The reloading of the weapon is only performed to avoid firing with different modes at the same time.
-        orxout() << "fire weapon " << mode << endl;
+   
+   
         if (this->bReloading_ && this->reloadingWeaponmode_ != mode)
             return;
@@ -137 +138 @@
     void Weapon::release(unsigned int mode)
     {
-        orxout() << "release weapon " << mode << endl;
         if (this->bReloading_ && this->reloadingWeaponmode_ != mode)
             return;

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

@@ -121 +121 @@
     {
         (*reloadTime) = this->reloadTime_;
-        orxout() << "fire wm " << reloadTime << endl;
         // Fireing is only possible if this weapon mode is not reloading and there is enough munition
         if (!this->bReloading_ && this->munition_ && this->munition_->takeMunition(this->munitionPerShot_, this))
@@ -171 +170 @@
     bool WeaponMode::release(float* reloadTime)
     {
-        orxout() << "release wm " << reloadTime << endl;
+        this->release();
         return false;
     }

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

@@ -165 +165 @@
 
             virtual void fire() = 0;
+            virtual void release() {};
 
             unsigned int initialMunition_;

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

@@ -76 +76 @@
     void WeaponPack::fire(unsigned int weaponmode)
     {
-        orxout() << "fire wp " << weaponmode << endl;
         for (Weapon* weapon : this->weapons_)
             weapon->fire(weaponmode);
@@ -83 +82 @@
     void WeaponPack::release(unsigned int weaponmode)
     {
-        orxout() << "release wp " << weaponmode << endl;
         for (Weapon* weapon : this->weapons_)
             weapon->release(weaponmode);

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

@@ -63 +63 @@
     {
         // Fire all WeaponPacks with their defined weaponmode
-        orxout() << "fire wset " << endl;
         for (const auto& mapEntry : this->weaponpacks_)
             if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED)
@@ -72 +71 @@
     {
         // Fire all WeaponPacks with their defined weaponmode
-        orxout() << "release wset " << endl;
         for (const auto& mapEntry : this->weaponpacks_)
             if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED)

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

@@ -289 +289 @@
     void WeaponSystem::fire(unsigned int firemode)
     {
-        orxout() << "fire wsys " << firemode << endl;
         std::map<unsigned int, WeaponSet *>::iterator it = this->weaponSets_.find(firemode);
         if (it != this->weaponSets_.end() && it->second)
@@ -297 +296 @@
     void WeaponSystem::release(unsigned int firemode)
     {
-        orxout() << "release wsys " << firemode << endl;
         std::map<unsigned int, WeaponSet *>::iterator it = this->weaponSets_.find(firemode);
         if (it != this->weaponSets_.end() && it->second)