From 334fbed6f7c63ebd130437a4b68ac78ef139d76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Latner?= <matyas.latner@nic.cz> Date: Thu, 13 Aug 2015 12:41:58 +0200 Subject: [PATCH] Start screen moved back to GameMenu --- core/src/cz/nic/tablexia/TablexiaSettings.java | 3 +-- core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/cz/nic/tablexia/TablexiaSettings.java b/core/src/cz/nic/tablexia/TablexiaSettings.java index 32254f00a..f7d0a159b 100644 --- a/core/src/cz/nic/tablexia/TablexiaSettings.java +++ b/core/src/cz/nic/tablexia/TablexiaSettings.java @@ -9,7 +9,6 @@ import cz.nic.tablexia.bus.ApplicationBus; import cz.nic.tablexia.bus.event.LocaleChangedEvent; import cz.nic.tablexia.game.GameDefinition; import cz.nic.tablexia.game.difficulty.GameDifficulty; -import cz.nic.tablexia.game.games.pursuit.PursuitGame; import cz.nic.tablexia.loader.application.ApplicationTextManager; import cz.nic.tablexia.screen.AbstractTablexiaScreen; import cz.nic.tablexia.screen.gamemenu.GameMenuScreen; @@ -22,7 +21,7 @@ public class TablexiaSettings { private static final int MIN_SCREEN_HEIGHT = (int) (DEFAULT_SCREEN_WIDTH * MAXIMUM_RATIO); private static final boolean DEBUG_SHOW_BOUNDING_BOXES = true; - public static final Class<? extends AbstractTablexiaScreen<?>> INITIAL_SCREEN = PursuitGame.class; + public static final Class<? extends AbstractTablexiaScreen<?>> INITIAL_SCREEN = GameMenuScreen.class; public static final int AVATAR_COUNT = 8; private static final String PREFERENCES_KEY = "cz.nic.tablexia."; diff --git a/core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java b/core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java index 08f36f298..2aadd3765 100644 --- a/core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java +++ b/core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java @@ -1,6 +1,5 @@ package cz.nic.tablexia.game.games.pursuit; -import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.scenes.scene2d.Action; import com.badlogic.gdx.scenes.scene2d.Actor; @@ -15,12 +14,12 @@ import cz.nic.tablexia.game.AbstractTablexiaGame; import cz.nic.tablexia.game.games.pursuit.action.RotateAndMovePieceInPosition; import cz.nic.tablexia.game.games.pursuit.action.RotatePieceToClosestAngle; import cz.nic.tablexia.game.games.pursuit.helper.ArithmeticsHelper; +import cz.nic.tablexia.game.games.pursuit.helper.GameRulesHelper; +import cz.nic.tablexia.game.games.pursuit.helper.TextureHelper; import cz.nic.tablexia.game.games.pursuit.listener.VehicleDragListener; import cz.nic.tablexia.game.games.pursuit.model.Grid; import cz.nic.tablexia.game.games.pursuit.model.Point; import cz.nic.tablexia.game.games.pursuit.model.PuzzlePiece; -import cz.nic.tablexia.game.games.pursuit.helper.GameRulesHelper; -import cz.nic.tablexia.game.games.pursuit.helper.TextureHelper; import cz.nic.tablexia.game.games.pursuit.model.Vehicle; import cz.nic.tablexia.game.games.pursuit.model.VehicleType; import cz.nic.tablexia.util.Log; -- GitLab