Logo: Allow opening the settings after one logo is shown

The engine objects are created by then so this is safe
EasyRPG · Oct 21, 2023 · 42ab89e · 42ab89e
1 parent 0c3b3ea
commit 42ab89e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/scene_gamebrowser.cpp b/src/scene_gamebrowser.cpp
@@ -219,7 +219,7 @@ void Scene_GameBrowser::BootGame() {
 
 	if (!FileFinder::FindImage("Logo", "LOGO1").empty()) {
 		// Delegate to Scene_Logo when a startup graphic was found
-		Scene::Push(std::make_shared<Scene_Logo>(1), true);
+		Scene::Push(std::make_shared<Scene_Logo>(1));
 		return;
 	}
 

diff --git a/src/scene_logo.cpp b/src/scene_logo.cpp
@@ -26,6 +26,7 @@
 #include "player.h"
 #include "scene_title.h"
 #include "scene_gamebrowser.h"
+#include "scene_settings.h"
 #include "output.h"
 #include "generated/logo.h"
 #include "generated/logo2.h"
@@ -42,10 +43,12 @@ Scene_Logo::Scene_Logo(unsigned current_logo_index) :
 	if (current_logo_index > 0) {
 		detected_game = true;
 	}
+
+	skip_logos = Player::debug_flag || Game_Battle::battle_test.enabled;
 }
 
 void Scene_Logo::Start() {
-	if (!Player::debug_flag && !Game_Battle::battle_test.enabled) {
+	if (!skip_logos) {
 		logo_img = LoadLogo();
 		DrawTextOnLogo(false);
 		DrawLogo(logo_img);
@@ -67,20 +70,26 @@ void Scene_Logo::vUpdate() {
 		--frame_counter;
 	}
 
+	// Allow calling the settings when the first logo was shown (startup completed)
+	if (current_logo_index > 0 && Input::IsTriggered(Input::SETTINGS_MENU)) {
+		Scene::Push(std::make_shared<Scene_Settings>());
+	}
+
 	// other logos do not invoke the slow CreateGameObjects: display them longer
 	bool frame_limit_reached = (frame_counter == (current_logo_index == 0 ? 60 : 90));
 
-	if (Player::debug_flag ||
-		Game_Battle::battle_test.enabled ||
+	if (skip_logos ||
 		frame_limit_reached ||
 		Input::IsTriggered(Input::DECISION) ||
 		Input::IsTriggered(Input::CANCEL)) {
 
 		if (detected_game) {
-			// Check for another logo
-			if (!FileFinder::FindImage("Logo", "LOGO" + std::to_string(current_logo_index + 1)).empty()) {
-				Scene::Push(std::make_shared<Scene_Logo>(current_logo_index + 1), true);
-				return;
+			if (!skip_logos) {
+				// Check for another logo
+				if (!FileFinder::FindImage("Logo", "LOGO" + std::to_string(current_logo_index + 1)).empty()) {
+					Scene::Push(std::make_shared<Scene_Logo>(current_logo_index + 1), true);
+					return;
+				}
 			}
 
 			if (!Player::startup_language.empty()) {

diff --git a/src/scene_logo.h b/src/scene_logo.h
@@ -51,6 +51,7 @@ class Scene_Logo : public Scene {
 	BitmapRef logo_img;
 	int frame_counter;
 	unsigned current_logo_index;
+	bool skip_logos = false;
 	bool detected_game = false;
 
 	void OnIndexReady(FileRequestResult* result);