Changeset 6111 for code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h

Timestamp:

Nov 21, 2009, 12:33:37 AM (14 years ago)

Author:

scheusso

Message:

made some changes in NewHumanController, Pawn, CE, Controller and WeaponMode preparing the synchronisation of clients target and aimPosition

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/ControllableEntity.h (modified) (2 diffs)

code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h

@@ -145 +145 @@
             inline void setController(Controller* val)
                 { this->controller_ = val; }
+            
+            virtual void setTarget( WorldEntity* target )
+                { this->target_ = target; }
+            virtual WorldEntity* getTarget()
+                { return this->target_.get(); }
 
         protected:
@@ -209 +214 @@
             Controller* controller_;
             CameraPosition* reverseCamera_;
+            WeakPtr<WorldEntity> target_;
     };
 }