OnBlock

4 files changed, 19 insertions, 7 deletions

diff --git a/app/src/main/java/com/camilstaps/rushhour/Board.java b/app/src/main/java/com/camilstaps/rushhour/Board.java
index eeb2580..cfd3774 100644
--- a/app/src/main/java/com/camilstaps/rushhour/Board.java
+++ b/app/src/main/java/com/camilstaps/rushhour/Board.java
@@ -23,10 +23,16 @@ public class Board {
         @Override
         public void onMove(Car car, int offset) {
             Coordinate newC = car.wouldMoveTo(offset);
-            if (newC.getY() > DIMENSION - 1 || newC.getX() > DIMENSION - 1 || newC.getX() < 0 || newC.getY() < 0) return;
-            for (Car iter : cars)
-                if (iter.occupies(newC))
+            if (newC.getY() > DIMENSION - 1 || newC.getX() > DIMENSION - 1 || newC.getX() < 0 || newC.getY() < 0) {
+                driveListener.onBlocked();
+                return;
+            }
+            for (Car iter : cars) {
+                if (iter.occupies(newC)) {
+                    driveListener.onBlocked();
                     return;
+                }
+            }
             car.move(offset);
             driveListener.onDrive();
         }
diff --git a/app/src/main/java/com/camilstaps/rushhour/DriveListener.java b/app/src/main/java/com/camilstaps/rushhour/DriveListener.java
index f3a83e7..bfb1eb3 100644
--- a/app/src/main/java/com/camilstaps/rushhour/DriveListener.java
+++ b/app/src/main/java/com/camilstaps/rushhour/DriveListener.java
@@ -5,4 +5,5 @@ package com.camilstaps.rushhour;
  */
 public abstract class DriveListener {
     public abstract void onDrive();
+    public abstract void onBlocked();
 }
diff --git a/app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java b/app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java
index f0dd4af..22532f2 100755
--- a/app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java
+++ b/app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java
@@ -1,7 +1,6 @@
 package com.camilstaps.rushhour;
 
 import android.app.Activity;
-import android.graphics.Color;
 import android.media.AudioManager;
 import android.media.SoundPool;
 import android.os.Bundle;
@@ -13,7 +12,7 @@ import java.io.InputStream;
 public class GamePlayActivity extends Activity {
 
     private SoundPool soundPool;
-    private int soundBackgroundId, soundCarDriveId;
+    private int soundBackgroundId, soundCarDriveId, soundCantMoveId;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,8 +47,9 @@ public class GamePlayActivity extends Activity {
                 }
             }
         });
-        soundCarDriveId = soundPool.load(this, R.raw.car_drive, 1);
         soundBackgroundId = soundPool.load(this, R.raw.tune, 2);
+        soundCarDriveId = soundPool.load(this, R.raw.car_drive, 1);
+        soundCantMoveId = soundPool.load(this, R.raw.cantmove, 1);
 
         final RelativeLayout boardLayout = (RelativeLayout) findViewById(R.id.board);
         ViewTreeObserver vto = boardLayout.getViewTreeObserver();
@@ -66,6 +66,11 @@ public class GamePlayActivity extends Activity {
             public void onDrive() {
                 soundPool.play(soundCarDriveId, 1, 1, 1, 0, 1);
             }
+
+            @Override
+            public void onBlocked() {
+                soundPool.play(soundCantMoveId, 1, 1, 1, 0, 1);
+            }
         });
     }
 }
diff --git a/app/src/main/java/com/camilstaps/rushhour/HighScoreList.java b/app/src/main/java/com/camilstaps/rushhour/HighScoreList.java
index c0a7e67..6afeb23 100644
--- a/app/src/main/java/com/camilstaps/rushhour/HighScoreList.java
+++ b/app/src/main/java/com/camilstaps/rushhour/HighScoreList.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package rushhour;
+package com.camilstaps.rushhour;
 
 import java.util.Collections;
 import java.util.List;