[Orxonox-commit 7327] r11944 - code/branches/3DPacman_FS18/src/modules/pacman

[dreherm at orxonox.net]

Author: dreherm
Date: 2018-05-04 23:42:09 +0200 (Fri, 04 May 2018)
New Revision: 11944

Modified:
   code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc
   code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h
   code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc
Log:
Afraid Test 6

Modified: code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc
===================================================================
--- code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc	2018-05-04 21:39:18 UTC (rev 11943)
+++ code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc	2018-05-04 21:42:09 UTC (rev 11944)
@@ -47,8 +47,6 @@
         lives = 10;
         point = 0;
         level = 1;
-        afraid = false;
-        timer = 0;
 
        // setHUDTemplate("PacmanOrxHUD");
        // scoreboardTemplate_ = "";
@@ -136,9 +134,9 @@
       }
     }
 
-    void setAfraid(){
-        this->afraid = true;
-        this->timer = 10; //Set timer to 10 seconds
+    void Pacman::setAfraid(){
+        afraid = true;
+        timer = 10; //Set timer to 10 seconds
     } 
 
     void Pacman::posreset(){

Modified: code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h
===================================================================
--- code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h	2018-05-04 21:39:18 UTC (rev 11943)
+++ code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h	2018-05-04 21:42:09 UTC (rev 11944)
@@ -93,11 +93,11 @@
             Vector3 currentPosition;
             PacmanGelb* player;
             bool bcolli = false;
-            float timer;
+            float timer = 0;
             Vector3 startposplayer = Vector3(0,10,245);
             int totallevelpoint = 3;
             //bool firstGame;
-            bool afraid;
+            bool afraid = false;
             
        private:
 

Modified: code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc
===================================================================
--- code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc	2018-05-04 21:39:18 UTC (rev 11943)
+++ code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc	2018-05-04 21:42:09 UTC (rev 11944)
@@ -425,7 +425,7 @@
         return false;
     }
 
-    void changemovability(){
+    void PacmanGhost::changemovability(){
         if(dontmove){
          dontmove = false;}
         else{