From 4cc41ea2c88a451d4e5c55f60838b79f0ab35cf5 Mon Sep 17 00:00:00 2001
From: Daniel <daan@compagner.com>
Date: Tue, 7 Jul 2015 12:18:42 +0200
Subject: [PATCH] Kleuren ovalen locatie verandert

---
 model/gameState/PlayState.java | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/model/gameState/PlayState.java b/model/gameState/PlayState.java
index bba92d1..8c88b18 100644
--- a/model/gameState/PlayState.java
+++ b/model/gameState/PlayState.java
@@ -70,6 +70,8 @@ public class PlayState extends GameState {
 		buttons_pressed = 0;
 		joystick_moved = 0;
 		
+		infoPanel.init(sql.getHighscore(sh.getCurrentSong(), sh.getCurrentSongInstance()).getScore());
+		
 		for(Path p : area.paths)
 		{
 			p.getEnemysInPath().clear();
@@ -192,19 +194,19 @@ public class PlayState extends GameState {
 				player.draw(g2);
 		} catch (Exception e) {
 		}
-		if(!Window.ON_RASP){
-			int width,height;
-			width = g2.getFontMetrics().stringWidth("");
-			height = g2.getFontMetrics().getHeight();
-			for (int i = 1; i < ButtonHandler.getButtons().size(); i++) {
-				Ellipse2D oval = new Ellipse2D.Double(880+(50*i), 0, 50, 50);
-				g2.setColor(ButtonHandler.getButton(i).getColor());
-				g2.fill(oval);
-				g2.setColor(Color.BLACK);
-				width = g2.getFontMetrics().stringWidth(""+i);
-				g2.drawString(""+i, (int)oval.getCenterX()-width/2,(int)oval.getMaxY()+height);
-			}
-		}
+//		if(!Window.ON_RASP){
+//			int width,height;
+//			width = g2.getFontMetrics().stringWidth("");
+//			height = g2.getFontMetrics().getHeight();
+//			for (int i = 1; i < ButtonHandler.getButtons().size(); i++) {
+//				Ellipse2D oval = new Ellipse2D.Double(880+(50*i), 0, 50, 50);
+//				g2.setColor(ButtonHandler.getButton(i).getColor());
+//				g2.fill(oval);
+//				g2.setColor(Color.BLACK);
+//				width = g2.getFontMetrics().stringWidth(""+i);
+//				g2.drawString(""+i, (int)oval.getCenterX()-width/2,(int)oval.getMaxY()+height);
+//			}
+//		}
 	}
 
 	@Override