diff --git a/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java b/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java index 86af79d70b1..826a4559ff9 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java @@ -1,6 +1,7 @@ package forge.adventure.scene; import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.Input; import com.badlogic.gdx.scenes.scene2d.Event; import com.badlogic.gdx.scenes.scene2d.EventListener; import com.badlogic.gdx.scenes.scene2d.ui.Image; @@ -171,7 +172,13 @@ public class NewGameScene extends UIScene { @Override public void enter() { Gdx.input.setInputProcessor(stage); //Start taking input from the ui + } - + @Override + public boolean keyPressed(int keycode) { + if (keycode == Input.Keys.ESCAPE || keycode == Input.Keys.BACK) { + back(); + } + return true; } } diff --git a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java index 9b58e216194..08b7c78bc2b 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java @@ -5,6 +5,7 @@ import com.badlogic.gdx.Input; import com.badlogic.gdx.scenes.scene2d.Actor; import forge.Forge; import forge.adventure.stage.GameHUD; +import forge.adventure.stage.MapStage; import forge.adventure.world.WorldSave; import forge.gui.GuiBase; @@ -39,7 +40,10 @@ public class StartScene extends UIScene { } public boolean Resume() { - Forge.switchToLast(); + if (MapStage.getInstance().isInMap()) + Forge.switchScene(SceneType.TileMapScene.instance); + else + Forge.switchScene(SceneType.GameScene.instance); GameHUD.getInstance().getTouchpad().setVisible(false); return true; }