[Orxonox-commit 7256] r11871 - code/branches/3DPacman_FS18/src/modules/Pacman

[dreherm at orxonox.net]

Author: dreherm
Date: 2018-04-16 23:59:53 +0200 (Mon, 16 Apr 2018)
New Revision: 11871

Modified:
   code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.cc
   code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h
Log:
Tes Game 6

Modified: code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.cc
===================================================================
--- code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.cc	2018-04-16 21:53:41 UTC (rev 11870)
+++ code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.cc	2018-04-16 21:59:53 UTC (rev 11871)
@@ -75,7 +75,7 @@
         }
 
         bcolli = false;
-        for(int nrghost = 0, (nrghost<3) && (!bcolli), ++nrghost){
+        for(int nrghost = 0; (nrghost<3) && (!bcolli); ++nrghost){
             bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition)
         }
         if(bcolli){
@@ -84,7 +84,7 @@
 
         i = 0;
         for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
-            if(collis(nextsphere.getPosition(), currentPosition)){
+            if(collis(nextsphere->getPosition(), currentPosition)){
                 takePoint(nextsphere);
             }
         }
@@ -119,9 +119,9 @@
         ++point;
         if(point == totallevelpoint) this->levelUp;
 
-        Vector3 postaken = taken.getPosition();
+        Vector3 postaken = taken->getPosition();
         postaken.y = -50;
-        taken.setPosition(postaken);
+        taken->setPosition(postaken);
     }
 
 
@@ -148,6 +148,7 @@
 
     void Pacman::playerPreSpawn(PlayerInfo* player)
     {
+        PlayerInfo* playerInfo_;
         this->playerInfo_ = player;
         if(lives <= 0)
         {

Modified: code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h
===================================================================
--- code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h	2018-04-16 21:53:41 UTC (rev 11870)
+++ code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h	2018-04-16 21:59:53 UTC (rev 11871)
@@ -39,6 +39,7 @@
 #include "PacmanGhost.h"
 #include "PacmanPointSphere.h"
 #include "Highscore.h"
+#include "PlayerInfo.h"
 
 
 #include "core/EventIncludes.h"