Changeset 6985 in orxonox.OLD for trunk/src/world_entities/player.h

Timestamp:

Feb 2, 2006, 4:09:46 PM (19 years ago)

Author:

bensch

Message:

trunk: rename of setControllable

File:

• trunk/src/world_entities/player.h (modified) (4 diffs)

trunk/src/world_entities/player.h

@@ -1 +1 @@
 /*!
  * @file player.h
- * Implements a basic controllable WorldEntity
+ * Implements a basic playable WorldEntity
  */
 
@@ -15 +15 @@
 
 
-//! Basic controllable WorldEntity
+//! Basic playable WorldEntity
 /**
   *  this is the debug player - actualy we would have to make a new
@@ -28 +28 @@
     virtual ~Player();
 
-    bool              setControllable(Playable* controllalble);
-    inline Playable*  getControllable() { return this->controllable; };
-    bool              disconnectControllable();
+    bool              setPlayable(Playable* controllalble);
+    inline Playable*  getPlayable() { return this->playable; };
+    bool              disconnectPlayable();
 
     void              weaponConfigChanged();
@@ -38 +38 @@
 
   private:
-    Playable*         controllable;                  //!< The one we controll or NULL if none
+    Playable*         playable;                  //!< The one we controll or NULL if none
     Hud               hud;                           //!< The HUD to be displayed for this Player.
 };