From 35bc6e60ab4f3c6724502b6a34199eedf8896a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=E1=BA=BF=20H=C6=B0ng?=
 <tretrauit@gmail.com>
Date: Tue, 30 Sep 2025 08:06:20 +0700
Subject: [PATCH] chore(scene/intro): handle main menu creation in intro
 instead of game

---
 app/src/main/java/org/vibecoders/moongazer/Game.java         | 2 +-
 app/src/main/java/org/vibecoders/moongazer/scenes/Intro.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/vibecoders/moongazer/Game.java b/app/src/main/java/org/vibecoders/moongazer/Game.java
index 647e002..6218785 100644
--- a/app/src/main/java/org/vibecoders/moongazer/Game.java
+++ b/app/src/main/java/org/vibecoders/moongazer/Game.java
@@ -26,7 +26,7 @@ public class Game extends ApplicationAdapter {
         log.info("Intro assets loaded successfully.");
         batch = new SpriteBatch();
         currentScene = introScene = new Intro();
-        mainMenuScene = new MainMenu();
+        // By the end of the intro, the main menu scene will be created and assigned to Game.mainMenuScene
     }
 
     @Override
diff --git a/app/src/main/java/org/vibecoders/moongazer/scenes/Intro.java b/app/src/main/java/org/vibecoders/moongazer/scenes/Intro.java
index b1b0e0b..ff71d86 100644
--- a/app/src/main/java/org/vibecoders/moongazer/scenes/Intro.java
+++ b/app/src/main/java/org/vibecoders/moongazer/scenes/Intro.java
@@ -39,8 +39,9 @@ public class Intro extends Scene {
     @Override
     public void render(SpriteBatch batch) {
         if (System.currentTimeMillis() > endTime + 2000 && endTime != 0) {
-            Assets.waitUntilLoaded();
             if (Game.transition == null) {
+                Assets.waitUntilLoaded();
+                Game.mainMenuScene = new MainMenu();
                 Game.transition = new Transition(this, Game.mainMenuScene, State.MAIN_MENU, 1000);
             }
             batch.draw(TEXTURE_BLACK, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);