Changeset 11992 for code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h

Timestamp:

May 24, 2018, 3:36:40 PM (7 years ago)

Author:

dreherm

Message:

Testversion 1

File:

• code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) (5 diffs)

code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h

@@ -21 +21 @@
  *
  *   Author:
- *      Oli Scheuss
+ *      Marc Dreher
  *   Co-authors:
- *      Damian 'Mozork' Frick
+ *      ..
  *
  */
@@ -35 +35 @@
 
 #include "worldentities/ControllableEntity.h"
-//Test 
+
 namespace orxonox {
 
@@ -51 +51 @@
             void resetGhost();
 
-            void setnewTarget(int firstdec);
-            void setnewTarget(int firstdec, int seconddec);
-            void setnewTarget(int firstdec, int seconddec, int thirddec);
-            void setnewTarget(int firstdec, int seconddec, int thirddec, int fourthdec);
             void changewith(PacmanGhost* otherghost);
             void levelupvelo();
@@ -61 +57 @@
             void changemovability();
             bool dontmove = false;
-            bool lockmove = false;
+
+        private:
+            int decision = 0; 
+            Vector3 resetposition = Vector3(0,10,15);
+            Vector3 velocity;
+            int speed = 20;
 
             Vector3 actuelposition;
@@ -67 +68 @@
             int target_x = 0; 
             int target_z = 0;
-            Vector3 velocity;
-            Vector3 oldvelocity = Vector3(2,0,0);
-            int speed = 20;
+            bool lockmove = false;
 
-        private:
-            int decision = 0; //Gives the random which way information to the ghost.
-            Vector3 resetposition = Vector3(0,10,15);
+            void setnewTarget(int firstdec);
+            void setnewTarget(int firstdec, int seconddec);
+            void setnewTarget(int firstdec, int seconddec, int thirddec);
+            void setnewTarget(int firstdec, int seconddec, int thirddec, int fourthdec);
     };