Changeset 2019 for code/branches/objecthierarchy/src/orxonox/objects/controllers/Controller.h

Timestamp:

Oct 27, 2008, 4:08:51 AM (17 years ago)

Author:

landauf

Message:

many changes, most important: BaseObject takes now a pointer to it's creator which is needed to build a level hierarchy (with different scenes)

File:

• code/branches/objecthierarchy/src/orxonox/objects/controllers/Controller.h (modified) (2 diffs)

code/branches/objecthierarchy/src/orxonox/objects/controllers/Controller.h

@@ -39 +39 @@
     {
         public:
-            Controller();
+            Controller(BaseObject* creator);
             virtual ~Controller();
 
@@ -47 +47 @@
                 { return this->player_; }
 
-            inline void setPawn(ControllableEntity* pawn)
-                { this->pawn_ = pawn; }
-            inline ControllableEntity* getPawn() const
-                { return this->pawn_; }
+            virtual inline void setControllableEntity(ControllableEntity* entity)
+                { this->controllableEntity_ = entity; }
+            virtual inline ControllableEntity* getControllableEntity() const
+                { return this->controllableEntity_; }
 
         protected:
             PlayerInfo* player_;
-            ControllableEntity* pawn_;
+            ControllableEntity* controllableEntity_;
     };
 }