Second Attempt

2 files changed, 8 insertions, 1 deletions

diff --git a/src/fallTest/Driver.java b/src/fallTest/Driver.java
index 3bc7c25..08a424b 100644
--- a/src/fallTest/Driver.java
+++ b/src/fallTest/Driver.java
@@ -37,7 +37,6 @@ public class Driver extends Application
         primaryStage.setTitle("TEST");
         primaryPane.getChildren().add(player);     
         setBackground("assets/water.png");   
-        player.init();
         primaryStage.show();
 	}
 	
diff --git a/src/fallTest/newSongPlayer.java b/src/fallTest/newSongPlayer.java
index 5e7a3c6..02f828a 100644
--- a/src/fallTest/newSongPlayer.java
+++ b/src/fallTest/newSongPlayer.java
@@ -31,6 +31,8 @@ import javafx.scene.text.Text;
 import javafx.animation.*;

 import javafx.animation.KeyFrame;

 import javafx.util.*;

+import main.Difficulty;

+import main.ScoreController;

 

 public class newSongPlayer extends Pane

 {

@@ -62,6 +64,8 @@ public class newSongPlayer extends Pane
 	Queue<NoteInfo> kSends = new LinkedList<NoteInfo>();

 	ArrayList<Block> kLane = new ArrayList<Block>();

 

+

+

 	/**

      * Establishes what the chart for the song is going to look like

      */

@@ -102,6 +106,10 @@ public class newSongPlayer extends Pane
         spaceSends.add(new NoteInfo(12000));

     }

     

+	public newSongPlayer(Level lvl, Difficulty d, Pane p, ScoreController cntrl){

+		

+	}

+

 	public void init() {	    

 		loadSong();