[Orxonox-commit 7392] r12009 - code/branches/3DPacman_FS18/src/modules/pacman

[dreherm at orxonox.net]

Author: dreherm
Date: 2018-05-25 10:17:11 +0200 (Fri, 25 May 2018)
New Revision: 12009

Modified:
   code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc
   code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc
Log:
FinalVersion

Modified: code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc
===================================================================
--- code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc	2018-05-24 15:25:09 UTC (rev 12008)
+++ code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc	2018-05-25 08:17:11 UTC (rev 12009)
@@ -122,7 +122,7 @@
                 move(dt, actuelposition, velocity);
             }
         }
-        //Check on which position ghost has arrived and set new target
+        //Check on which position the ghost has arrived and set new target
          else{
             while(lockmove){};
             lockmove = true;

Modified: code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc
===================================================================
--- code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc	2018-05-24 15:25:09 UTC (rev 12008)
+++ code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc	2018-05-25 08:17:11 UTC (rev 12009)
@@ -75,7 +75,7 @@
     bool PacmanPointSphere::taken(Vector3 playerpos)
     {
         resetposition = this->getPosition();
-      if((abs(this->resetposition.x - playerpos.x)<10) && (abs(this->resetposition.y - playerpos.y)<10) && (abs(this->resetposition.z - playerpos.z)<10)){
+      if((abs(this->resetposition.x - playerpos.x)<10) && (abs(this->resetposition.y - playerpos.y)<10) && (abs(this->resetposition.z - playerpos.z)<5)){
         this->setPosition(Vector3(resetposition.x, -50, resetposition.z));
         return true;
       }