Integrated Turret selection screen with other starting screens

UQcsse3200 · Sep 10, 2023 · 7746e59 · 7746e59
1 parent d5ff441
commit 7746e59
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuActions.java b/source/core/src/main/com/csse3200/game/components/mainmenu/MainMenuActions.java
@@ -30,7 +30,7 @@ public void create() {
    */
   private void onStart() {
     logger.info("Start game");
-    game.setScreen(GdxGame.ScreenType.TURRET_SELECTION);
+    game.setScreen(GdxGame.ScreenType.STORY_SCREEN);
 //    game.setScreen(GdxGame.ScreenType.LEVEL_SELECT);
   }
 

diff --git a/source/core/src/main/com/csse3200/game/screens/LevelSelectScreen.java b/source/core/src/main/com/csse3200/game/screens/LevelSelectScreen.java
@@ -99,7 +99,7 @@ private void spawnPlanetBorders() {
                 if (Gdx.input.justTouched()) {
                     dispose();
                     logger.info("Loading level {}", planet[4]);
-                    game.setScreen(new MainGameScreen(game));
+                    game.setScreen(new TurretSelectionScreen(game));
                 } else {
                     Sprite planetBorder = new Sprite(new Texture("planets/planetBorder.png"));
                     batch.draw(planetBorder, planet[0] - 2, planet[1] - 2, planet[2] + 3, planet[3] + 3);

diff --git a/source/core/src/main/com/csse3200/game/screens/TurretSelectionScreen.java b/source/core/src/main/com/csse3200/game/screens/TurretSelectionScreen.java
@@ -54,8 +54,8 @@ public TurretSelectionScreen(GdxGame game) {
 
         // Set up the background
         batch = new SpriteBatch();
-        Texture introImage = new Texture(TEXTURE);
-        introSprite = new Sprite(introImage);
+        Texture backgroundImage = new Texture(TEXTURE);
+        introSprite = new Sprite(backgroundImage);
         introSprite.setSize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());