Changeset 2836 for code/branches/netp2/src/orxonox

Timestamp:

Mar 23, 2009, 5:00:54 PM (16 years ago)

Author:

scheusso

Message:

merge old netp branch to netp2 (still because of multiplayer pong…)

Location:

code/branches/netp2/src/orxonox/objects

Files:

• controllers/AIController.cc (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/netp2/src/orxonox/objects/controllers/AIController.cc

@@ -101 +101 @@
     void AIController::tick(float dt)
     {
-        if (!this->isActive())
-            return;
-
-        if (this->target_)
-            this->aimAtTarget();
-
-        if (this->bHasTargetPosition_)
-            this->moveToTargetPosition(dt);
-
-        if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(500) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
-            this->getControllableEntity()->fire(WeaponMode::fire);
+        if(Core::isMaster())
+        {
+            if (!this->isActive())
+                return;
+    
+            if (this->target_)
+                this->aimAtTarget();
+    
+            if (this->bHasTargetPosition_)
+                this->moveToTargetPosition(dt);
+    
+            if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(500) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
+                this->getControllableEntity()->fire(WeaponMode::fire);
+        }
 
         SUPER(AIController, tick, dt);

code/branches/netp2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -129 +129 @@
         this->firehack_ = 0x0;
 
-        if (this->health_ <= 0)
+        if (Core::isMaster())
+          if (this->health_ <= 0)
             this->death();
     }