Changeset 12003 for code/branches/3DPacman_FS18/src/modules

Timestamp:

May 24, 2018, 4:22:49 PM (7 years ago)

Author:

dreherm

Message:

Test 2

Location:

code/branches/3DPacman_FS18/src/modules/pacman

Files:

• Pacman.cc (modified) (2 diffs)
• PacmanPointSphere.cc (modified) (1 diff)

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

@@ -121 +121 @@
 
             //Check for collision with PointSpheres and PacmanPointAfraid
-            i = 0;
             for(PacmanPointSphere* nextsphere : ObjectList<PacmanPointSphere>()){
-                if(collis(nextsphere->getPosition(), currentPosition))
-                 takePoint(nextsphere);
+                 if(nextsphere->taken(currentPosition))
+                    takePoint(nextsphere);
             }
 
@@ -208 +207 @@
             return;
         }
-        //Set PointSphere under map
-        Vector3 postaken = taken->getPosition();
-        postaken.y = -50;
-        taken->setPosition(postaken);
     }
 

code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc

@@ -76 +76 @@
     {
         resetposition = this->getPosition();
-      if((abs(this->resetposition.x - playerpos.x)<5) && (abs(this->resetposition.z - playerpos.z)<5)){
+      if((abs(this->resetposition.x - playerpos.x)<5) && (abs(this->resetposition.y - playerpos.y)<5) && (abs(this->resetposition.z - playerpos.z)<5)){
         this->setPosition(Vector3(resetposition.x, -50, resetposition.z));
         return true;
       } 
-
       return false;
     }