Changeset 2019 for code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.h

Timestamp:

Oct 27, 2008, 4:08:51 AM (16 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/worldentities/ControllableEntity.h (modified) (5 diffs)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -40 +40 @@
     {
         public:
-            ControllableEntity();
+            ControllableEntity(BaseObject* creator);
             virtual ~ControllableEntity();
 
@@ -56 +56 @@
             inline bool getDestroyWhenPlayerLeft() const
                 { return this->bDestroyWhenPlayerLeft_; }
-
-            virtual void startLocalControl();
-            virtual void stopLocalControl();
 
             virtual void moveFrontBack(float value) {}
@@ -82 +79 @@
                 { return this->hudtemplate_; }
 
-        protected:
             using WorldEntity::setPosition;
             using WorldEntity::translate;
@@ -112 +108 @@
                 { this->acceleration_.x = x; this->acceleration_.y = y; this->acceleration_.z = z; }
 
+        protected:
+            virtual void startLocalControl();
+            virtual void stopLocalControl();
+
             inline void setHudTemplate(const std::string& name)
                 { this->hudtemplate_ = name; }
@@ -130 +130 @@
             void processClientOrientation();
 
-            void updatePlayer();
+            void networkcallback_changedplayerID();
 
             unsigned int server_overwrite_;