Changeset 11871 for code/branches

Timestamp:

Apr 16, 2018, 11:59:53 PM (7 years ago)

Author:

dreherm

Message:

Tes Game 6

Location:

code/branches/3DPacman_FS18/src/modules/Pacman

Files:

• Pacman.cc (modified) (4 diffs)
• Pacman.h (modified) (1 diff)

code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.cc

@@ -76 +76 @@
 
         bcolli = false;
-        for(int nrghost = 0, (nrghost<3) && (!bcolli), ++nrghost){
+        for(int nrghost = 0; (nrghost<3) && (!bcolli); ++nrghost){
             bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition)
         }
@@ -85 +85 @@
         i = 0;
         for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
-            if(collis(nextsphere.getPosition(), currentPosition)){
+            if(collis(nextsphere->getPosition(), currentPosition)){
                 takePoint(nextsphere);
             }
@@ -120 +120 @@
         if(point == totallevelpoint) this->levelUp;
 
-        Vector3 postaken = taken.getPosition();
+        Vector3 postaken = taken->getPosition();
         postaken.y = -50;
-        taken.setPosition(postaken);
+        taken->setPosition(postaken);
     }
 
@@ -149 +149 @@
     void Pacman::playerPreSpawn(PlayerInfo* player)
     {
+        PlayerInfo* playerInfo_;
         this->playerInfo_ = player;
         if(lives <= 0)

code/branches/3DPacman_FS18/src/modules/Pacman/Pacman.h

@@ -40 +40 @@
 #include "PacmanPointSphere.h"
 #include "Highscore.h"
+#include "PlayerInfo.h"