Changeset 2362 for code/branches/objecthierarchy2/src/orxonox/objects/infos

Timestamp:

Dec 9, 2008, 2:16:49 AM (16 years ago)

Author:

landauf

Message:

• Added Bot (the artifical counterpart to HumanPlayer)
• Added ArtificialController, the baseclass of all non-human-controllers
• Added AIController, a simple reimplementation of the old AISpaceShip (but of course without the SpaceShip, just the AI)
• Added currently empty class ScriptController

• Some tweaks in PlayerInfo, ControllableEntity and Controller

• Made Spacetator speed configurable

I don't know where, but there's still an issue in the new code, maybe even caused by the previous commit. The Server seems to crash when a Client disconnects, but only if the Server runs within the debugger.

Location:

code/branches/objecthierarchy2/src/orxonox/objects/infos

Files:

• Bot.cc (added)
• Bot.h (added)
• CMakeLists.txt (modified) (1 diff)
• HumanPlayer.h (modified) (1 diff)
• PlayerInfo.cc (modified) (2 diffs)
• PlayerInfo.h (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/infos/CMakeLists.txt

@@ -1 +1 @@
 SET( SRC_FILES
+  Bot.cc
   Info.cc
   PlayerInfo.cc

code/branches/objecthierarchy2/src/orxonox/objects/infos/HumanPlayer.h

@@ -33 +33 @@
 
 #include "PlayerInfo.h"
-#include "core/Identifier.h"
-#include "objects/controllers/Controller.h"
 
 namespace orxonox

code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc

@@ -46 +46 @@
         this->bLocalPlayer_ = false;
         this->bReadyToSpawn_ = false;
+        this->bSetUnreadyAfterSpawn_ = true;
         this->controller_ = 0;
         this->controllableEntity_ = 0;
@@ -122 +123 @@
             this->controllableEntityID_ = entity->getObjectID();
             entity->setPlayer(this);
-            this->bReadyToSpawn_ = false;
+            this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
         }
         else

code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.h

@@ -73 +73 @@
         protected:
             void createController();
-            void networkcallback_changedcontrollableentityID();
 
             bool bHumanPlayer_;
             bool bLocalPlayer_;
+            bool bSetUnreadyAfterSpawn_;
+            SubclassIdentifier<Controller> defaultController_;
+            unsigned int clientID_;
+
+        private:
+            void networkcallback_changedcontrollableentityID();
+
             bool bReadyToSpawn_;
-            SubclassIdentifier<Controller> defaultController_;
             Controller* controller_;
             ControllableEntity* controllableEntity_;
             unsigned int controllableEntityID_;
-            unsigned int clientID_;
     };
 }