Index: code/branches/3DPacman_FS18/src/modules/Pacman/PacmanPointSphere.h
===================================================================
--- code/branches/3DPacman_FS18/src/modules/Pacman/PacmanPointSphere.h	(revision 11844)
+++ code/branches/3DPacman_FS18/src/modules/Pacman/PacmanPointSphere.h	(revision 11859)
@@ -27,97 +27,36 @@
  */
 
-#ifndef _PacmanGhost_H__
-#define _PacmanGhost_H__
+#ifndef _PacmanPointSphere_H__
+#define _PacmanPointSphere_H__
 
 #include "OrxonoxPrereqs.h"
 
 #include "core/XMLPort.h"
-#include "controllers/PacmanGhostController.h"
 
-#include "ControllableEntity.h"
+#include "worldentities/ControllableEntity.h"
 
 namespace orxonox {
 
-    class _OrxonoxExport PacmanGhost : public ControllableEntity
+    class _OrxonoxExport PacmanPointSphere : public ControllableEntity
     {
         public:
-            PacmanGhost(Context* context);
-            virtual ~PacmanGhost();
+            PacmanPointSphere(Context* context);
+            virtual ~PacmanPointSphere();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating an AutonomousDrone through XML.
             virtual void tick(float dt); //!< Defines which actions the AutonomousDrone has to take in each tick.
 
-            virtual void moveFrontBack(const Vector2& value);
-            virtual void moveRightLeft(const Vector2& value);
-            virtual void moveUpDown(const Vector2& value);
+            bool taken(Vector3 playerpos);
+            void resetPacmanPointSphere();
 
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
-
-            /**
-            @brief Moves the Drone in the Front/Back-direction by the specifed amount.
-            @param value  The amount by which the drone is to be moved.
-            */
-            inline void moveFrontBack(float value)
-            { this->moveFrontBack(Vector2(value, 0)); }
-            /**
-            @brief Moves the Drone in the Right/Left-direction by the specifed amount.
-            @param value  The amount by which the drone is to be moved.
-            */
-            inline void moveRightLeft(float value)
-            { this->moveRightLeft(Vector2(value, 0)); }
-            /**
-            @brief Moves the Drone in the Up/Down-direction by the specifed amount.
-            @param value  The amount by which the drone is to be moved.
-            */
-            inline void moveUpDown(float value)
-            { this->moveUpDown(Vector2(value, 0)); }
-
-            /**
-            @brief Rotates the Drone around the y-axis by the specifed amount.
-            @param value  The amount by which the drone is to be rotated.
-            */
-            inline void rotateYaw(float value)
-            { this->rotateYaw(Vector2(value, 0)); }
-            /**
-            @brief Rotates the Drone around the x-axis by the specifed amount.
-            @param value  The amount by which the drone is to be rotated.
-            */
-            inline void rotatePitch(float value)
-            { this->rotatePitch(Vector2(value, 0)); }
-            /**
-            @brief Rotates the Drone around the z-axis by the specifed amount.
-            @param value  The amount by which the drone is to be rotated.
-            */
-            inline void rotateRoll(float value)
-            { this->rotateRoll(Vector2(value, 0)); }
-
-            /**
-            @brief Sets the primary thrust to the input amount.
-            @param thrust The amount of thrust.
-            */
-            inline void setPrimaryThrust( float thrust )
-                { this->primaryThrust_ = thrust; }
-            //TODO: Place your set-functions here.
-            // Hint: auxiliary thrust, rotation thrust.
+            inline void setResetPosition(Vector3 rpos)
+                { this->resetposition = rpos; }    
             
-            /**
-            @brief Gets the primary thrust to the input amount.
-            @return The amount of thrust.
-            */
-            inline float getPrimaryThrust()
-                { return this->primaryThrust_; }
-            //TODO: Place your get-functions here.
+            inline Vector3 getResetPosition()
+               { return this->resetposition; }        
 
         private:
-            PacmanGhostController *myController_; //!< The controller of the AutonomousDrone.
-
-            btVector3 localLinearAcceleration_; //!< The linear acceleration that is used to move the AutonomousDrone the next tick.
-            btVector3 localAngularAcceleration_; //!< The linear angular acceleration that is used to move the AutonomousDrone the next tick.
-            float primaryThrust_; //!< The amount of primary thrust. This is just used, when moving forward.
-            float auxiliaryThrust_; //!< The amount of auxiliary thrust. Used for all other movements (except for rotations).
-            float rotationThrust_; //!< The amount of rotation thrust. Used for rotations only.s
-        
+            
+            Vector3 resetposition;
     };
 
