Changeset 11949

Timestamp:

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

Author:

dreherm

Message:

Afraid Test 11

Location:

code/branches/3DPacman_FS18

Files:

• data/levels/3DPacman.oxw (modified) (2 diffs)
• src/modules/pacman/PacmanGhost.cc (modified) (4 diffs)

code/branches/3DPacman_FS18/data/levels/3DPacman.oxw

@@ -105 +105 @@
 </PacmanPointSphere>
 
+
+<!-- AfraidPoints -->
 <PacmanPointAfraid position="215,10,195">
     <attached>
@@ -110 +112 @@
     </attached>
 </PacmanPointAfraid>
+
 
 <!-- Map -->

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

@@ -126 +126 @@
         }
 
+        
+        while(lock){};
+        lock = true;
         //Check on which position ghost has arrived and set new target
          else{
@@ -333 +336 @@
                 this->resetGhost(); //Shouldn't happen...
             } //End of Position table
-            }
-
+
+            }
+            look = false;
     }
 
@@ -418 +422 @@
 
     void PacmanGhost::changewith(PacmanGhost* otherghost){
+
+        while(lock){};
+        lock = true;
+
         otherghost->setPosition(this->getPosition());
         this->setPosition(0,-20,0);
@@ -426 +434 @@
         this->dontmove = true;
         otherghost->dontmove = false;
+
+        lock = false;
     }