|
@@ -70,6 +70,8 @@ public class PlayState extends GameState {
|
|
|
buttons_pressed = 0;
|
|
buttons_pressed = 0;
|
|
|
joystick_moved = 0;
|
|
joystick_moved = 0;
|
|
|
|
|
|
|
|
|
|
+ infoPanel.init(sql.getHighscore(sh.getCurrentSong(), sh.getCurrentSongInstance()).getScore());
|
|
|
|
|
+
|
|
|
for(Path p : area.paths)
|
|
for(Path p : area.paths)
|
|
|
{
|
|
{
|
|
|
p.getEnemysInPath().clear();
|
|
p.getEnemysInPath().clear();
|
|
@@ -192,19 +194,19 @@ public class PlayState extends GameState {
|
|
|
player.draw(g2);
|
|
player.draw(g2);
|
|
|
} catch (Exception e) {
|
|
} 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
|
|
@Override
|