1 files changed, 6 insertions, 6 deletions
diff --git a/Week14 Route 66/src/com/camilstaps/route66/Crossing.java b/Week14 Route 66/src/com/camilstaps/route66/Crossing.java
index eba5bfe..65e2527 100644
--- a/Week14 Route 66/src/com/camilstaps/route66/Crossing.java
+++ b/Week14 Route 66/src/com/camilstaps/route66/Crossing.java
@@ -16,7 +16,7 @@ public class Crossing {
     
     private final Model model;
     private Direction allowed;
-    private boolean waiting = false;
+    private boolean crossingWaiting = false;
     private int requests = 0;
     
     public Crossing(Model model, Direction allowed) {
@@ -29,8 +29,8 @@ public class Crossing {
     }
     
     public synchronized void doSwitch() {
-        waiting = true;
-        while (!model.isNoCarsOnCrossing());
+        crossingWaiting = true;
+        while (!model.isCarsOnCrossing());
         System.err.println("Switching");
         if (allowed == Direction.East || allowed == Direction.West) {
             allowed = Direction.North;
@@ -39,17 +39,17 @@ public class Crossing {
         }
         requests = 0;
         System.err.println("Switched to " + allowed);
-        waiting = false;
+        crossingWaiting = false;
         //notifyAll();
     }
     
     public boolean isAllowed(Direction direction) {
-        return !waiting && (direction == allowed || Direction.opposite(direction) == allowed);
+        return !crossingWaiting && (direction == allowed || Direction.opposite(direction) == allowed);
     }
     
     public boolean doRequest() {
         //if (++requests >= 2) {
-        if (waiting) {
+        if (crossingWaiting) {
             return false;
         }
             doSwitch();