Merge pull request #23 from ProjectGroepA2/feature/sorting

Feature/sorting
2015-07-07 12:21:42 +02:00
parent e349ec9fa6 18d6a9dcbd
commit 5480476837
7 changed files with 108 additions and 26 deletions
@@ -76,11 +76,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());
 		
@@ -160,7 +155,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();