[Orxonox-commit 7797] r12389 - code/branches/3DPacman_FS19/src/modules/pacman

[pemil at orxonox.net]

Author: pemil
Date: 2019-05-16 16:37:19 +0200 (Thu, 16 May 2019)
New Revision: 12389

Modified:
   code/branches/3DPacman_FS19/src/modules/pacman/Pacman.cc
   code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.cpp
Log:
final 1.2

Modified: code/branches/3DPacman_FS19/src/modules/pacman/Pacman.cc
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/Pacman.cc	2019-05-16 14:24:32 UTC (rev 12388)
+++ code/branches/3DPacman_FS19/src/modules/pacman/Pacman.cc	2019-05-16 14:37:19 UTC (rev 12389)
@@ -58,6 +58,12 @@
         	nextsphere->resetPacmanPointSphere();
         }
 
+        
+        PacmanLaser* pos = *(ObjectList<PacmanLaser>().begin());
+        pos->resetPacmanLaser();
+
+
+
         for(PacmanPointAfraid* next : ObjectList<PacmanPointAfraid>()){
             next->resetPacmanPointAfraid();
         }
@@ -96,7 +102,7 @@
         else{
 
             //support by laser
-            if(point > laser){
+            if(point > laser + 240*(level-1)){
               
                 for(PacmanPointSphere* pointer : ObjectList<PacmanPointSphere>()){
                     Vector3 pointSpherePosition = pointer->getPosition();
@@ -287,7 +293,6 @@
             };
             i++;
         }
-        
 
         //Set maximum of points of first level
         totallevelpoint = ObjectList<PacmanPointSphere>().size();

Modified: code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.cpp
===================================================================
--- code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.cpp	2019-05-16 14:24:32 UTC (rev 12388)
+++ code/branches/3DPacman_FS19/src/modules/pacman/PacmanLaser.cpp	2019-05-16 14:37:19 UTC (rev 12389)
@@ -45,7 +45,7 @@
 
     void PacmanLaser::resetPacmanLaser(){
     	resetposition = this->getPosition();
-        resetposition.y = -50;
+        resetposition.y = -20000;
         this->setPosition(resetposition);
     }
 }
\ No newline at end of file