From fc86051f04447b4c8002206af2b530fb3bb5a702 Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Mon, 6 Jul 2015 17:00:02 +0200 Subject: [PATCH] Bugfixes --- model/gameState/PlayState.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/model/gameState/PlayState.java b/model/gameState/PlayState.java index bba92d1..bf9c29b 100644 --- a/model/gameState/PlayState.java +++ b/model/gameState/PlayState.java @@ -74,11 +74,6 @@ public class PlayState extends GameState { { p.getEnemysInPath().clear(); } - - for (int i = 1; i < ButtonHandler.getButtons().size(); i++) { - Button b = ButtonHandler.getButton(i); - b.setColor(Color.BLACK); - } ButtonHandler.getButton(1).setColor(sh.getCurrentSongInstance().getButtons().get(0).getColor()); @@ -158,7 +153,7 @@ public class PlayState extends GameState { } private void endGame() { - if(sh.getProgress()/1000 < 5000) + if(sh.getProgress()/1000 > 5000) { sql.addPlaydata(sh.getCurrentSong(), sh.getCurrentSongInstance(), sh.getProgress()/1000, enemies_missed, enemies_hit, buttons_pressed, joystick_moved); sh.getCurrentSongInstance().played();