Changeset 11956 for code/branches/3DPacman_FS18/src

Timestamp:

May 11, 2018, 1:44:20 PM (6 years ago)

Author:

dreherm

Message:

Collisionshapes and Powerpoints

Location:

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

Files:

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

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

@@ -45 +45 @@
 
        // firstGame = true;                   //needed for the HUD
-        lives = 10;
+        lives = 3;
         point = 0;
         level = 1;
@@ -68 +68 @@
         //orxout() << timer << endl;
         //orxout() << afraid << endl;
+        //orxout() << totallevelpoint << endl;
 
 
@@ -167 +168 @@
 
     void Pacman::posreset(){
-        for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
-            nextghost->resetGhost();
+        for(int i = 0; i<4; ++i){
+            ghosts[i]->resetGhost();
         }
         player->setPosition(startposplayer);
@@ -206 +207 @@
                 nextghost->dontmove =  true;
             };
-            
             i++;
         }
+
+        totallevelpoint = ObjectList<PacmanPointSphere>().size();
+
     }
 

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

@@ -96 +96 @@
             bool bcolli = false;
             float timer = 0;
-            Vector3 startposplayer = Vector3(0,10,245);
-            int totallevelpoint = 3;
+            Vector3 startposplayer = Vector3(0,10,150);
+            int totallevelpoint;
             //bool firstGame;
             bool afraid = false;

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

@@ -45 +45 @@
     {
         RegisterObject(PacmanPointAfraid);
-        this->setCollisionType(CollisionType::None); 
+        this->setCollisionType(CollisionType::None);
     }
 
@@ -73 +73 @@
 
     bool PacmanPointAfraid::taken(Vector3 playerpos)
-    {
-      Vector3 resetposition = this->getPosition();  
-      
+    { 
+        resetposition = this->getPosition();
       if((abs(resetposition.x - playerpos.x)<1) && (abs(resetposition.z - playerpos.z)<1)){
         this->setPosition(Vector3(resetposition.x, -50, resetposition.z));

code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.h

@@ -50 +50 @@
             void resetPacmanPointAfraid();
         private:
-            
             Vector3 resetposition;
     };

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

@@ -45 +45 @@
     {
         RegisterObject(PacmanPointSphere);
-        this->setCollisionType(CollisionType::None); 
+        this->setCollisionType(CollisionType::None);
     }
 
@@ -74 +74 @@
     bool PacmanPointSphere::taken(Vector3 playerpos)
     {
-      if((abs(this->resetposition.x - playerpos.x)<0.1) && (abs(this->resetposition.z - playerpos.z)<0.1)){
+        resetposition = this->getPosition();
+      if((abs(this->resetposition.x - playerpos.x)<5) && (abs(this->resetposition.z - playerpos.z)<5)){
         this->setPosition(Vector3(resetposition.x, -50, resetposition.z));
         return true;