Changeset 8891 for code/trunk/src/orxonox/infos

Timestamp:

Oct 12, 2011, 7:50:43 PM (13 years ago)

Author:

jo

Message:

Ai and tutorial improvements merged back to the trunk. AI features: all weapons are used, the ai-firestrength is configurable, bots are able to collect pickups . I've set the tutorial level as default level.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/infos/PlayerInfo.cc (modified) (2 diffs)

code/trunk/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();