Changeset 6101 for code/branches/particles2/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

Nov 20, 2009, 1:02:09 AM (14 years ago)

Author:

scheusso

Message:

rocket now steerable also on client
AIController shoots again now
fire network function is now in CE instead of Pawn
some changes in PlayerInfo that allow controlling of temporary objects (such as Rocket)

File:

• code/branches/particles2/src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

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

@@ -52 +52 @@
     CreateFactory(Pawn);
 
-    registerMemberNetworkFunction( Pawn, doFire );
-
     Pawn::Pawn(BaseObject* creator) : ControllableEntity(creator)
     {
@@ -263 +261 @@
     }
 
-    void Pawn::fire(unsigned int firemode)
-    {
-        this->doFire(firemode);
-    }
-
-    void Pawn::doFire(uint8_t firemode)
-    {
-        if(GameMode::isMaster())
-        {
-            if (this->weaponSystem_)
-                this->weaponSystem_->fire(firemode);
-        }
-        else
-        {
-            callMemberNetworkFunction(Pawn, doFire, this->getObjectID(), 0, firemode);
-            if (this->weaponSystem_)
-                this->weaponSystem_->fire(firemode);
-        }
+    void Pawn::fired(unsigned int firemode)
+    {
+        if (this->weaponSystem_)
+            this->weaponSystem_->fire(firemode);
     }