Common: Fix FFNx Logo when enable_lighting is enabled

Fixes #573
julianxhokaxhiu · Oct 8, 2023 · 70b3d4f · 70b3d4f
1 parent a07df2a
commit 70b3d4f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -4,6 +4,7 @@
 
 ## Common
 
+- Logo: Fix intro logo showing up when `enable_lighting = true`
 - Movie: Fix audio stream playing at the same time as the external audio
 - Movie: Add support for the AV1 codec
 

diff --git a/src/common.cpp b/src/common.cpp
@@ -3353,8 +3353,13 @@ int ffnx_logo_current_frame = 0;
 
 bool drawFFNxLogoFrame(struct game_obj* game_object)
 {
+	static int was_lighting_enabled = -1;
+
+	if (was_lighting_enabled == -1) was_lighting_enabled = enable_lighting;
+
 	if (ffnx_logo_current_frame >= FFNX_LOGO_FRAME_COUNT) {
 		newRenderer.setOverallColorGamut(enable_ntscj_gamut_mode ? COLORGAMUT_NTSCJ : COLORGAMUT_SRGB); // set the gamut back to what it was before newRenderer.drawFFNxLogo() changed it
+		enable_lighting = was_lighting_enabled;
 		return false;
 	}
 
@@ -3370,6 +3375,8 @@ bool drawFFNxLogoFrame(struct game_obj* game_object)
 	else
 		fade = 1.0f - (ffnx_logo_current_frame - 2 * fade_frame_count) / static_cast<float>(fade_frame_count);
 
+	enable_lighting = false;
+
 	newRenderer.drawFFNxLogo(fade);
 
 	common_flip(game_object);