diff --git a/src/ei/game/gamestate/EndGameState.java b/src/ei/game/gamestate/EndGameState.java index 1a49cfd..c9b4413 100644 --- a/src/ei/game/gamestate/EndGameState.java +++ b/src/ei/game/gamestate/EndGameState.java @@ -2,6 +2,7 @@ package ei.game.gamestate; import ei.engine.LWJGLGameWindow; import ei.engine.effects.Fade; +import ei.engine.math.Vector3f; import ei.engine.scene.Sprite; import ei.engine.state.GameState; import ei.engine.state.GameStateManager; @@ -26,10 +27,16 @@ public class EndGameState extends GameState{ switch(status){ case VICTORY: Sprite v = new Sprite("Victory","data/victory.png"); + v.setLocation(new Vector3f( + (LWJGLGameWindow.getWidth()/2), + (LWJGLGameWindow.getHeight()/2),0.0f)); fade.setEntity(v); break; case DEFEAT: Sprite d = new Sprite("Defeat","data/defeat.png"); + d.setLocation(new Vector3f( + (LWJGLGameWindow.getWidth()/2), + (LWJGLGameWindow.getHeight()/2),0.0f)); fade.setEntity(d); break; } diff --git a/src/ei/game/gamestate/InGameState.java b/src/ei/game/gamestate/InGameState.java index 9430709..1a784a1 100644 --- a/src/ei/game/gamestate/InGameState.java +++ b/src/ei/game/gamestate/InGameState.java @@ -22,6 +22,8 @@ public class InGameState extends GameState{ private InGameHud hud; private static Map map; private Sound music; + private static InGameMouseInput mouse; + private static InGameKeyboardInput keyboard; public InGameState(String name){ super(name); @@ -39,8 +41,8 @@ public class InGameState extends GameState{ map.init("data/map/default"); HumanPlayer player = new HumanPlayer(); - InGameMouseInput mouse = new InGameMouseInput(map,player); - InGameKeyboardInput keyboard = new InGameKeyboardInput(); + mouse = new InGameMouseInput(map,player); + keyboard = new InGameKeyboardInput(); super.getInput().addInput(mouse); super.getInput().addInput(keyboard); @@ -101,4 +103,9 @@ public class InGameState extends GameState{ public static Map getMap() { return map; } + + public void input(boolean b){ + mouse.setEnabled(b); + keyboard.setEnabled(b); + } }