Changeset 11954 for code/branches/3DPacman_FS18/src

Timestamp:

May 8, 2018, 1:20:49 PM (7 years ago)

Author:

dreherm

Message:

Added Ghostchange

Location:

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

Files:

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

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

@@ -66 +66 @@
         SUPER(Pacman, tick, dt);
 
-        if(!timer){
+        //orxout() << timer << endl;
+        //orxout() << afraid << endl;
+
+
+        if(afraid){
             timer = timer - dt;
             if(timer<=0){
-                afraid = false;
-                this->setNormal();
+                setNormal();
             }
         }
@@ -105 +108 @@
 
         for(PacmanPointAfraid* next : ObjectList<PacmanPointAfraid>()){
-            if(collis(next->getPosition(), currentPosition)){
+            if(next->taken(currentPosition)){
                 setAfraid();
             }
@@ -155 +158 @@
 
         //Change normal Ghosts with afraid ones
-        if(afraid){
             ghosts[4]->changewith(ghosts[0]);
             ghosts[5]->changewith(ghosts[1]);
             ghosts[6]->changewith(ghosts[2]);
             ghosts[7]->changewith(ghosts[3]);
-        }
 
         afraid = false; 
@@ -198 +199 @@
     {
         Deathmatch::start();
+
+        int i = 0;
+        for(PacmanGhost* nextghost : ObjectList<PacmanGhost>()){
+            if(3<i){ 
+                nextghost->setPosition(0,-20,0);
+                nextghost->dontmove =  true;
+            };
+            
+            i++;
+        }
     }
 

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

@@ -74 +74 @@
     bool PacmanPointAfraid::taken(Vector3 playerpos)
     {
-      if((abs(this->resetposition.x - playerpos.x)<0.1) && (abs(this->resetposition.z - playerpos.z)<0.1)){
+      Vector3 resetposition = this->getPosition();  
+      
+      if((abs(resetposition.x - playerpos.x)<1) && (abs(resetposition.z - playerpos.z)<1)){
         this->setPosition(Vector3(resetposition.x, -50, resetposition.z));
         return true;