Changeset 11945 for code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc

Timestamp:

May 5, 2018, 12:12:36 AM (7 years ago)

Author:

dreherm

Message:

Afraid Test 7

File:

• code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) (4 diffs)

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

@@ -70 +70 @@
             if(timer<=0){
                 afraid = false;
-                timer = 0;
+                this->setNormal();
             }
         }
@@ -88 +88 @@
 
         bcolli = false;
-        for(int nrghost = 0; (nrghost<3) && (!bcolli); ++nrghost){
+        for(int nrghost = 0; (nrghost<8) && (!bcolli); ++nrghost){
             bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition);
             //orxout() << "GHOST" << nrghost << ghosts[nrghost]->getPosition() << endl;
@@ -127 +127 @@
         }
     else{
-        for(int nrghost = 0; nrghost<3; ++nrghost){
+        for(int nrghost = 0; nrghost<8; ++nrghost){
         bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition);
         if(bcolli) ghosts[nrghost]->resetGhost();
@@ -136 +136 @@
 
     void Pacman::setAfraid(){
-        afraid = true;
+
         timer = 10; //Set timer to 10 seconds
+
+        //Change normal Ghosts with afraid ones
+        if(!afraid){
+            ghosts[0]->changewith(ghosts[4]);
+            ghosts[1]->changewith(ghosts[5]);
+            ghosts[2]->changewith(ghosts[6]);
+            ghosts[3]->changewith(ghosts[7]);
+        }
+
+        afraid = true; 
+    } 
+
+    void Pacman::setNormal(){
+
+        timer = 0;
+
+        //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; 
     }