feat(loading-screens-five): option to hide busy spinner in loading sc…

…reen
citizenfx · Feb 26, 2025 · 71c56e6 · 71c56e6
1 parent 0dec7bf
commit 71c56e6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/code/components/loading-screens-five/include/LoadingScreens.h b/code/components/loading-screens-five/include/LoadingScreens.h
@@ -0,0 +1,3 @@
+#pragma once
+
+extern bool showBusySpinner;
diff --git a/code/components/loading-screens-five/src/HookLoadingScreens.cpp b/code/components/loading-screens-five/src/HookLoadingScreens.cpp
@@ -8,6 +8,7 @@
 #include <nutsnbolts.h>
 #include <CefOverlay.h>
 #include <DrawCommands.h>
+#include "LoadingScreens.h"
 
 #include <mmsystem.h>
 
@@ -479,7 +480,7 @@ static InitFunction initFunction([] ()
 {
 	OnLookAliveFrame.Connect([]()
 	{
-		if (nui::HasFrame("loadingScreen"))
+		if (nui::HasFrame("loadingScreen") && showBusySpinner)
 		{
 			if (*g_scaleformMgr)
 			{

diff --git a/code/components/loading-screens-five/src/LoadingScreens.cpp b/code/components/loading-screens-five/src/LoadingScreens.cpp
@@ -28,10 +28,7 @@
 
 #include <CfxRect.h>
 #include <DrawCommands.h>
-
-#include <CrossBuildRuntime.h>
-
-#include <Error.h>
+#include "LoadingScreens.h"
 
 static std::shared_ptr<ConVar<bool>> g_loadProfileConvar;
 static std::map<uint64_t, std::chrono::milliseconds> g_loadTiming;
@@ -117,6 +114,7 @@ class LoadsThread : public GtaThread
 static LoadsThread loadsThread;
 
 static bool autoShutdownNui = true;
+bool showBusySpinner = true;
 static fx::TNativeHandler g_origShutdown;
 
 #include <nutsnbolts.h>
@@ -195,6 +193,7 @@ static HookFunction hookFunction([]()
 		{
 			endedLoadingScreens = false;
 			autoShutdownNui = true;
+			showBusySpinner = true;
 		});
 
 		{
@@ -557,6 +556,12 @@ static InitFunction initFunction([] ()
 					autoShutdownNui = false;
 				}
 
+				entriesTwo = mdComponent->GetEntries("loadscreen_hide_busyspinner");
+				if (entriesTwo.begin() != entriesTwo.end())
+				{
+					showBusySpinner = false;
+				}
+
 				static ConVar<bool> uiLoadingCursor("ui_loadingCursor", ConVar_None, false);
 				auto useCursor = mdComponent->GetEntries("loadscreen_cursor");
 				if (useCursor.begin() != useCursor.end())