Merge branch 'master' of github.com:jokerx3/prp

This commit is contained in:
feschi55
2014-11-07 12:37:19 +01:00
@@ -13,6 +13,7 @@ import de.heatup.mapengine.MapEngine;
import de.heatup.mapengine.SpawnAssistant;
import de.heatup.objects.StaticObject;
import de.heatup.ui.KeyBindings;
import de.heatup.ui.StatusPanelAdder;
public class GameLoopD extends JFrame implements Runnable {
@@ -79,6 +80,9 @@ public class GameLoopD extends JFrame implements Runnable {
frame.add(outerPanel);
frame.pack();
frame.setVisible(true);
// StatusPanel bauen
StatusPanelAdder.setPanel(statusPanel);
player01 = new Player();
// Query.setPlayer(player01);