Bugfix things

This commit is contained in:
2015-06-08 12:50:51 +02:00
parent 8766037def
commit a3069af5c0
5 changed files with 46 additions and 24 deletions
+5 -4
View File
@@ -66,8 +66,6 @@ public class PlayState extends GameState {
ButtonHandler.getButton(1).setColor(sh.getCurrentSongInstance().getButtons().get(0).getColor());
// System.out.println("Diff" +
// sh.getCurrentSongInstance().getDifficulty());
}
@Override
@@ -78,8 +76,6 @@ public class PlayState extends GameState {
for (ButtonInstance bu : sh.getCurrentSongInstance().getButtonsBetween(oldProgress, progress)) {
Button b = ButtonHandler.getButton(bu.getButtonID());
b.setColor(bu.getColor());
// System.out.println(bu.getButtonID() + " - " + bu.getColor()+
// " / " + b.getColor());
}
for (ObjectInstance ob : sh.getCurrentSongInstance().getObjectsBetween(oldProgress, progress)) {
@@ -168,6 +164,11 @@ public class PlayState extends GameState {
lifePoints -= 1.5;
}
}
if(e.getButton().getButtonID() == 0)
{
gsm.setState(State.MENU_STATE);
}
}
@Override