playable game

2015-06-02 15:47:23 +02:00
parent 6a356982a6
commit 76a41dbbd1
10 changed files with 105 additions and 23 deletions
@@ -58,7 +58,7 @@ public class Window extends JFrame {
 		JoystickHandler jsh = new JoystickHandler();
 		
 		//Create Instances
-		SongHandler sh =  null; //new SongHandler();
+		SongHandler sh = new SongHandler();
 		GameStateManager gsm = new GameStateManager(sh);
 		GameView view = new GameView(led,gsm);
 		GameModel model = new GameModel(sh, gsm);
@@ -69,7 +69,7 @@ public class Window extends JFrame {
 		setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
 		addWindowListener(new WindowAdapter(){
 			public void windowClosing(WindowEvent e) {
-//				sh.close();
+				sh.close();
 				System.exit(0);
 			}
 		});