Changeset 8734

Timestamp:

Jul 6, 2011, 10:50:18 PM (13 years ago)

Author:

dafrick

Message:

Fix for AI and rockets.

Location:

code/branches/ai2/src

Files:

• modules/weapons/projectiles/SimpleRocket.cc (modified) (1 diff)
• modules/weapons/projectiles/SimpleRocket.h (modified) (7 diffs)
• orxonox/infos/PlayerInfo.cc (modified) (2 diffs)

code/branches/ai2/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -100 +100 @@
         if ( GameMode::isMaster() )
         {
-
-
             this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
             this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );

code/branches/ai2/src/modules/weapons/projectiles/SimpleRocket.h

@@ -75 +75 @@
             */
             inline void moveFrontBack(float value)
-            { this->moveFrontBack(Vector2(value, 0)); }
+                { this->moveFrontBack(Vector2(value, 0)); }
             /**
             @brief Moves the SimpleRocket in the Right/Left-direction by the specifed amount.
@@ -81 +81 @@
             */
             inline void moveRightLeft(float value)
-            { this->moveRightLeft(Vector2(value, 0)); }
+                { this->moveRightLeft(Vector2(value, 0)); }
             /**
             @brief Moves the SimpleRocket in the Up/Down-direction by the specifed amount.
@@ -87 +87 @@
             */
             inline void moveUpDown(float value)
-            { this->moveUpDown(Vector2(value, 0)); }
+                { this->moveUpDown(Vector2(value, 0)); }
 
             /**
@@ -94 +94 @@
             */
             inline void rotateYaw(float value)
-            { this->rotateYaw(Vector2(value, 0)); }
+                { this->rotateYaw(Vector2(value, 0)); }
             /**
             @brief Rotates the SimpleRocket around the x-axis by the specifed amount.
@@ -100 +100 @@
             */
             inline void rotatePitch(float value)
-            {
-                this->rotatePitch(Vector2(value, 0)); }
+                { this->rotatePitch(Vector2(value, 0)); }
             /**
             @brief Rotates the SimpleRocket around the z-axis by the specifed amount.
@@ -107 +106 @@
             */
             inline void rotateRoll(float value)
-            {
-                this->rotateRoll(Vector2(value, 0)); }
+                { this->rotateRoll(Vector2(value, 0)); }
 
             void setOwner(Pawn* owner);
@@ -115 +113 @@
 
             inline bool hasFuel() const
-            { return this->fuel_; }
+                { return this->fuel_; }
 
 

code/branches/ai2/src/orxonox/infos/PlayerInfo.cc

@@ -235 +235 @@
 
         this->controllableEntity_->setController(0);
-        this->controllableEntity_->destroyHud(); // HACK-ish
+        if(this->isHumanPlayer()) // TODO: Multiplayer?
+            this->controllableEntity_->destroyHud(); // HACK-ish
         
 //        this->controllableEntity_ = this->previousControllableEntity_.back();
@@ -248 +249 @@
 
          // HACK-ish
-        if(this->controllableEntity_ != NULL)
+        if(this->controllableEntity_ != NULL && this->isHumanPlayer())
             this->controllableEntity_->createHud();