FF7: Fix the time and lighting init logic

Sometimes they were not triggered as expected
julianxhokaxhiu · Jan 21, 2023 · ccae6b2 · ccae6b2
1 parent a7a8c18
commit ccae6b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/common.cpp b/src/common.cpp
@@ -847,6 +847,7 @@ int common_create_window(HINSTANCE hInstance, struct game_obj* game_object)
 				music_init();
 				sfx_init();
 				voice_init();
+
 				if (enable_ffmpeg_videos)
 				{
 					movie_init();
@@ -857,6 +858,12 @@ int common_create_window(HINSTANCE hInstance, struct game_obj* game_object)
 					vibration_init();
 				}
 
+				// Init Day Night Cycle
+				if (!ff8 && enable_time_cycle) ff7::time.init();
+
+				// Init Lighting
+				if (!ff8 && enable_lighting) lighting.init();
+
 				if(aspect_ratio == AR_WIDESCREEN) widescreen.init();
 
 				// enable verbose logging for FFMpeg

diff --git a/src/renderer.cpp b/src/renderer.cpp
@@ -788,12 +788,6 @@ void Renderer::init()
         overlay.init(backendProgramHandles[RendererProgram::OVERLAY], window_size_x, window_size_y);
     }
 
-    // Init Lighting
-    lighting.init();
-
-    // Init Day Night Cycle
-    if (enable_time_cycle) ff7::time.init();
-
     // Set defaults
     show();
 };