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

Timestamp:

Apr 14, 2016, 4:02:00 PM (8 years ago)

Author:

sagerj

Message:

today I got pawn'ed

Location:

code/branches/sagerjFS16/src/orxonox/worldentities

Files:

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

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

@@ -303 +303 @@
         if(GameMode::isMaster())
         {
-            orxout() << "f CE IF " << firemode << endl;
+            orxout() << "fire ce if " << firemode << endl;
             this->fired(firemode);
         }
         else
         {
-            orxout() << "f CE EL " << firemode << endl;
+            orxout() << "fire ce else " << firemode << endl;
             callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
         }
@@ -317 +317 @@
         if(GameMode::isMaster())
         {
-            orxout() << "r CE IF " << firemode << endl;
+            orxout() << "release ce if " << firemode << endl;
             this->released(firemode);
         }
         else
         {
-            orxout() << "r CE EL " << firemode << endl;
+            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);
+    }
+
+    void Pawn::released(unsigned int firemode)
+    {
+        orxout() << "released pawn " << firemode << endl;
+        if (this->weaponSystem_)
+            this->weaponSystem_->release(firemode);
     }
 

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

@@ -158 +158 @@
 
             virtual void fired(unsigned int firemode) override;
+            virtual void released(unsigned int firemode) override;
             virtual void postSpawn();