Changeset 11862 for code/branches/3DPacman_FS18/src/modules/Pacman/3DPacman.cc

Timestamp:

Apr 13, 2018, 1:08:46 PM (6 years ago)

Author:

dreherm

Message:

Work on player

File:

• code/branches/3DPacman_FS18/src/modules/Pacman/3DPacman.cc (modified) (6 diffs)

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

@@ -49 +49 @@
         point = 0:
         level = 1;
+        Vector3 startposplayer = Vector3(0,10,245);
 
     }
@@ -70 +71 @@
         }
 
-        i = 0:
-        for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
-            spheres[i] = nextsphere;
-            i++;
-        }
-
         player = this->getPlayer();
         if (player != nullptr)
@@ -90 +85 @@
         }
 
+        i = 0;
+        for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
+            if(collis(nextsphere.getPosition(), currentPosition)){
+                takePoint(nextsphere);
+            }
+        }
+
         SUPER(3DPacman, tick, dt);
 
     }
-
 
 
@@ -103 +104 @@
 
     void 3DPacman::catched(){
-        if(lives) this->end();
+        if(!lives) this->end();
         --lives;
         this->posreset();
@@ -111 +112 @@
         int i = 0;
         for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
-            ghosts[i] = nextghost;
+            nextghost.resetGhost();
             i++;
         }
-        
+        player.setPosition(startposplayer);
+    }
+
+    void 3DPacman::takePoint(PacmanPointSphere* taken){
+        ++point;
+        if(point == totallevelpoint) this->levelUp;
+
+        Vector3 postaken = taken.getPosition();
+        postaken.y = -50;
+        taken.setPosition(postaken);
     }
 
@@ -147 +157 @@
     void 3DPacman::end()
     {
-        // DON'T CALL THIS!
-        //      Deathmatch::end();
-        // It will misteriously crash the game!
-        // Instead startMainMenu, this won't crash.
         if (Highscore::exists())
         {