Added songs, new libraries and more code

This commit is contained in:
2015-05-29 12:47:25 +02:00
parent 4f4b10fd89
commit 7b21aa1e09
67 changed files with 388 additions and 75 deletions
+4 -5
View File
@@ -15,14 +15,13 @@ public class GameModel implements ActionListener{
private Timer update;
public static Color[] colors = {Color.MAGENTA,Color.RED,Color.GREEN,Color.YELLOW,Color.CYAN,Color.WHITE};
private GameStateManager gsm;
private SongHandler sh;
SongHandler sh;
public GameModel(GameStateManager gsm)
public GameModel(SongHandler sh, GameStateManager gsm)
{
this.gsm = gsm;
sh = new SongHandler();
this.sh = sh;
update = new Timer(1000/30, this);
update.start();
@@ -34,6 +33,6 @@ public class GameModel implements ActionListener{
@Override
public void actionPerformed(ActionEvent e) {
gsm.update();
gsm.update();
}
}