Changeset 6101 for code/branches/particles2/src/orxonox/controllers

Timestamp:

Nov 20, 2009, 1:02:09 AM (15 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)

Location:

code/branches/particles2/src/orxonox/controllers

Files:

• AIController.cc (modified) (1 diff)
• HumanController.cc (modified) (1 diff)

code/branches/particles2/src/orxonox/controllers/AIController.cc

@@ -109 +109 @@
 
         if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(Ogre::Math::PI / 20.0f))
-//             this->getControllableEntity()->fire(0);
+            this->getControllableEntity()->fire(0);
 
         SUPER(AIController, tick, dt);

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

@@ -145 +145 @@
     void HumanController::fire(unsigned int firemode)
     {
-        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+        if( HumanController::localController_s && HumanController::localController_s->controllableEntity_ )
             HumanController::localController_s->controllableEntity_->fire(firemode);
     }