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

Timestamp:

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

Author:

sagerj

Message:

running backup

Location:

code/branches/sagerjFS16/src/orxonox

Files:

• controllers/HumanController.cc (modified) (4 diffs)
• controllers/NewHumanController.cc (modified) (3 diffs)
• weaponsystem/Weapon.cc (modified) (2 diffs)
• weaponsystem/WeaponMode.cc (modified) (2 diffs)
• weaponsystem/WeaponMode.h (modified) (1 diff)
• weaponsystem/WeaponPack.cc (modified) (2 diffs)
• weaponsystem/WeaponSet.cc (modified) (2 diffs)
• weaponsystem/WeaponSystem.cc (modified) (2 diffs)
• worldentities/ControllableEntity.cc (modified) (2 diffs)
• worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc

@@ -159 +159 @@
     void HumanController::fire(unsigned int firemode)
     {
-        orxout() << "fire hc " << firemode << endl;
         if (HumanController::localController_s)
             HumanController::localController_s->doFire(firemode);
@@ -166 +165 @@
     void HumanController::doFire(unsigned int firemode)
     {
-        orxout() << "do fire hc " << firemode << endl;
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
         {
@@ -180 +178 @@
     void HumanController::release(unsigned int firemode)
     {
-        orxout() << "release hc " << firemode << endl;
         if (HumanController::localController_s)
             HumanController::localController_s->doRelease(firemode);
@@ -187 +184 @@
     void HumanController::doRelease(unsigned int firemode)
     {
-        orxout() << "do release hc " << firemode << endl;
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
         {

code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc

@@ -285 +285 @@
         if (firemode == 1 && this->controlMode_ == 1)
         {
-            orxout() << "do fire nhc if " << firemode << endl;
             //unlocked steering, steer on right mouse click
             HumanController::yaw(Vector2(this->currentYaw_, 0));
@@ -292 +291 @@
         else
         {
-            orxout() << "do fire nhc else " << firemode << endl;
             HumanController::doFire(firemode); //call for formationflight
         }
@@ -299 +297 @@
     void NewHumanController::doRelease(unsigned int firemode)
     {
-        orxout() << "do release nhc" << firemode << endl;
         if (!this->controllableEntity_)
             return;

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)

code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc

@@ -303 +303 @@
         if(GameMode::isMaster())
         {
-            orxout() << "fire ce if " << firemode << endl;
             this->fired(firemode);
         }
         else
         {
-            orxout() << "fire ce else " << firemode << endl;
             callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
         }
@@ -317 +315 @@
         if(GameMode::isMaster())
         {
-            orxout() << "release ce if " << firemode << endl;
             this->released(firemode);
         }
         else
         {
-            orxout() << "release ce else " << firemode << endl;
             callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
         }

code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc

@@ -430 +430 @@
     void Pawn::fired(unsigned int firemode)
     {
-        orxout() << "fired pawn " << firemode << endl;
         if (this->weaponSystem_)
             this->weaponSystem_->fire(firemode);
@@ -437 +436 @@
     void Pawn::released(unsigned int firemode)
     {
-        orxout() << "released pawn " << firemode << endl;
         if (this->weaponSystem_)
             this->weaponSystem_->release(firemode);