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

Timestamp:

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

Author:

sagerj

Message:

running backup

Location:

code/branches/sagerjFS16/src/orxonox/worldentities

Files:

• ControllableEntity.cc (modified) (2 diffs)
• pawns/Pawn.cc (modified) (2 diffs)

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);