Changeset 5899 in orxonox.OLD for branches

Timestamp:

Dec 3, 2005, 5:43:42 PM (19 years ago)

Author:

bensch

Message:

controll: better player

Location:

branches/spaceshipcontrol/src

Files:

• story_entities/world.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/player.h (modified) (2 diffs)

branches/spaceshipcontrol/src/story_entities/world.cc

@@ -69 +69 @@
 #include "npcs/npc_test1.h"
 #include "shader.h"
+
+#include "playable.h"
 
 SHELL_COMMAND(speed, World, setSpeed);

branches/spaceshipcontrol/src/world_entities/player.cc

@@ -15 +15 @@
 
 #include "player.h"
+#include "playable.h"
 
 #include "event_handler.h"
-#include "event.h"
 
 using namespace std;

branches/spaceshipcontrol/src/world_entities/player.h

@@ -7 +7 @@
 #define _PLAYER_H
 
-#include "world_entity.h"
-#include "physics_interface.h"
 #include "event_listener.h"
-#include "playable.h"
 
+/* Forward Declaration */
+class Playable;
 
 //! Basic controllable WorldEntity
@@ -26 +25 @@
     virtual ~Player();
 
-    void          init();
+    bool              setControllable(Playable* controllalble);
+    void              disconnectControllable();
+    inline Playable*  getControllable() { return this->controllable; };
 
+    // eventListener extension.
+    virtual void      process(const Event &event);
 
-    virtual void  process(const Event &event);
-
-    bool          setControllable(Playable* controllalble);
-    void          disconnectControllable();
-    Playable*     getControllable() { return this->controllable; };
+  private:
+    void              init();
 
 
   private:
-    Playable*          controllable;
-
-
+    Playable*         controllable;                  //!< The one we controll or NULL if none
 };