From 0b368b5dbf18e28935c41474293cbed4ccedc784 Mon Sep 17 00:00:00 2001 From: Dofensmirtsz Date: Thu, 4 Jun 2015 14:50:48 +0200 Subject: [PATCH] SongInstanceDifficultyButtonColor fixed en display en load etc. y0l0 --- model/GameModel.java | 2 +- model/SongHandler.java | 2 ++ model/gameState/MenuState.java | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/model/GameModel.java b/model/GameModel.java index 5c894d5..3bc49fd 100644 --- a/model/GameModel.java +++ b/model/GameModel.java @@ -13,7 +13,7 @@ public class GameModel implements ActionListener{ private Timer update; - public static Color[] colors = {Color.MAGENTA,Color.RED,Color.GREEN,Color.YELLOW,Color.CYAN,Color.WHITE}; + public static Color[] colors = {Color.GREEN,Color.YELLOW,Color.RED,Color.MAGENTA,Color.CYAN,Color.WHITE}; private GameStateManager gsm; SongHandler sh; diff --git a/model/SongHandler.java b/model/SongHandler.java index 199a28a..77a817a 100644 --- a/model/SongHandler.java +++ b/model/SongHandler.java @@ -70,6 +70,8 @@ public class SongHandler { p.stop(); p.setClip(currentSong); + + System.out.println(currentSong.getSongs().size()); } public long getProgress() diff --git a/model/gameState/MenuState.java b/model/gameState/MenuState.java index ef96c51..41dab73 100644 --- a/model/gameState/MenuState.java +++ b/model/gameState/MenuState.java @@ -30,7 +30,7 @@ public class MenuState extends GameState { int z; - int yPosDiffButton = 900; + int yPosDiffButton = 400; public MenuState(GameStateManager gsm, SongHandler sh) { super(gsm, sh); @@ -77,7 +77,9 @@ public class MenuState extends GameState { buttons2.clear(); int instanceNr = 0; - for(int i = sh.getCurrentSong().getSongs().size()-1; i>0; i--){ + for(int i = sh.getCurrentSong().getSongs().size(); i>0; i--){ + if(sh.getCurrentSong().getSongs().size() == 0) + continue; SongInstance si = sh.getCurrentSong().getSongs().get(i-1); buttons2.add(new DifficultyButton(yPosDiffButton-instanceNr,si.getDifficulty(), GameModel.colors[i-1])); instanceNr += 100;