From a528aea320279528dad866229a08a9c26ba51a70 Mon Sep 17 00:00:00 2001 From: shebang Date: Wed, 14 Jan 2015 07:58:43 +0100 Subject: [PATCH] HeatUp/src/de/heatup/ui/PanelBuilder.java --- HeatUp/src/de/heatup/ui/PanelBuilder.java | 28 +++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/HeatUp/src/de/heatup/ui/PanelBuilder.java b/HeatUp/src/de/heatup/ui/PanelBuilder.java index 487b37a..1310917 100644 --- a/HeatUp/src/de/heatup/ui/PanelBuilder.java +++ b/HeatUp/src/de/heatup/ui/PanelBuilder.java @@ -31,6 +31,8 @@ public class PanelBuilder { private static Player player01; + private static MapEngine me; + private static InstancedObjects instancedObjects; private static ImageLoader imageLoader; @@ -149,7 +151,7 @@ public class PanelBuilder { kb = new KeyBindings(player01); outerPanel.addKeyListener(kb); - MapEngine me; + //MapEngine me; if (map > 0) { me = new MapEngine(map); } else { @@ -161,11 +163,13 @@ public class PanelBuilder { * Highscore tests */ -// for (ScoreEntry score : me.getHighscoreHandler().getHighscores(me.getMapHash())) { -// Logger.write(score.getName()+" "+score.getScore()); -// } -// me.getHighscoreHandler().setHighscore(me.getMapHash(), "Daniel", 3134); -// me.getHighscoreHandler().saveHighscores(); + /** + * for (ScoreEntry score : me.getHighscoreHandler().getHighscores(me.getMapHash())) { + * Logger.write(score.getName()+" "+score.getScore()); + * } + * me.getHighscoreHandler().setHighscore(me.getMapHash(), "Daniel", 3134); + * me.getHighscoreHandler().saveHighscores(); + */ /** * Ende Highscore tests @@ -180,7 +184,17 @@ public class PanelBuilder { gameLoaded = true; } - + + public static MapEngine getMapEngine() { + MapEngine m; + + if(gameState == 1) { + m = new MapEngine(1); + return m; + } + return me; + } + public static ImageLoader getImageLoader() { return imageLoader; }