refactoring.

BoardModel.pde

@@ -16,8 +16,7 @@ public class BoardModel{
 
   private int numGemsAllowedAtOnce;
   private int numGemsOnBoard;
-  private ScreenGameplay screenGameplay;
-
+
   /*
       Instead of the board knowing how to draw itself, it
       instead provides an iterator for the screen to render the tokens.
@@ -49,8 +48,8 @@ public class BoardModel{
 
 	/*
 	*/
-	public BoardModel(ScreenGameplay s){
-    screenGameplay = s;
+	public BoardModel(){
+    //screenGameplay = s;
     numGemsOnBoard = 0;
     numGemsAllowedAtOnce = 0;
 		board = new Token[BOARD_ROWS][BOARD_COLS];
@@ -436,7 +435,7 @@ public class BoardModel{
     if(numTokensArrivedAtDest > 0){
       markTokensForRemoval(START_ROW_INDEX, BOARD_ROWS-1);
       if(removeMarkedTokens(true) > 2){
-        screenGameplay.test();
+        soundManager.playMatchSound();
       }
       dropTokens();
     }

Horadrix.pde

@@ -129,5 +129,5 @@ public void keyReleased(){
 }
 
 public void stop(){
-  println("STOP TEST");
+  println("Stop test");
 }

ScreenGameplay.pde

@@ -46,10 +46,6 @@ public class ScreenGameplay implements IScreen, Subject{
 
   private float opacity = 0.0;
 
-  public void test(){
-    //soundManager.playMatchSound();
-  }
-
   /**
   */
   public void addObserver(LayerObserver o){
@@ -104,7 +100,7 @@ public class ScreenGameplay implements IScreen, Subject{
 
     Keyboard.lockKeys(new int[]{KEY_M});
 
-    boardModel = new BoardModel(this);
+    boardModel = new BoardModel();
     boardModel.setNumGemsAllowedAtOnce(2);
 
     debug = new Debugger();
@@ -641,7 +637,7 @@ public class ScreenGameplay implements IScreen, Subject{
     }
 
     // Easy way to clear the dying tokens which we don't want animating in the next level.
-    boardModel = new BoardModel(this);
+    boardModel = new BoardModel();
     boardModel.setNumGemsAllowedAtOnce(2);
 
     boardModel.generateNewBoardWithDyingAnimation(false);

SoundManager.pde

@@ -60,7 +60,7 @@ public class SoundManager{
 
     successSwapPlayer = new PlayerQueue("audio/success_swap.wav");
     failSwapPlayer = new PlayerQueue("audio/fail_swap.wav");
-    matchPlayer = new PlayerQueue("audio/peg.wav");
+    matchPlayer = new PlayerQueue("audio/success_swap.wav");
   }
 
   public void setMute(boolean isMuted){