From 5b0cb9cdff34288d1e6aae2e2f4e8cfba12c1b77 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Mon, 3 Jan 2022 16:44:48 -0800
Subject: [PATCH] refactors some code to better pickup
 AZ_LOADSCREENCOMPONENT_ENABLED's value

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp          | 2 +-
 Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp | 2 +-
 Code/Legacy/CrySystem/System.h                             | 2 +-
 Code/Legacy/CrySystem/SystemInit.cpp                       | 2 +-
 Gems/LmbrCentral/Code/Source/LmbrCentral.cpp               | 6 ------
 Gems/LyShine/Code/Source/LyShineModule.cpp                 | 2 ++
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
index dbe92ee6aa..0b90e73bc0 100644
--- a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
+++ b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
@@ -15,7 +15,7 @@
 #include <ILocalizationManager.h>
 #include "CryPath.h"
 
-#include <LoadScreenBus.h>
+#include <CryCommon/LoadScreenBus.h>
 #include <CryCommon/StaticInstance.h>
 
 #include <AzCore/Time/ITime.h>
diff --git a/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
index 095d296373..a890b76662 100644
--- a/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
+++ b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
@@ -10,7 +10,7 @@
 #include "SpawnableLevelSystem.h"
 #include "IMovieSystem.h"
 
-#include <LoadScreenBus.h>
+#include <CryCommon/LoadScreenBus.h>
 
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/IO/FileOperations.h>
diff --git a/Code/Legacy/CrySystem/System.h b/Code/Legacy/CrySystem/System.h
index 9b76e94eb4..63a24c9f9c 100644
--- a/Code/Legacy/CrySystem/System.h
+++ b/Code/Legacy/CrySystem/System.h
@@ -17,7 +17,7 @@
 #include "CmdLine.h"
 
 #include <AzFramework/Archive/ArchiveVars.h>
-#include <LoadScreenBus.h>
+#include <CryCommon/LoadScreenBus.h>
 
 #include <AzCore/Module/DynamicModuleHandle.h>
 #include <AzCore/Math/Crc.h>
diff --git a/Code/Legacy/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp
index 19d94ba6ec..600a799bc1 100644
--- a/Code/Legacy/CrySystem/SystemInit.cpp
+++ b/Code/Legacy/CrySystem/SystemInit.cpp
@@ -51,7 +51,7 @@
 #include <AzFramework/Archive/INestedArchive.h>
 #include <AzFramework/Archive/ArchiveFileIO.h>
 
-#include <LoadScreenBus.h>
+#include <CryCommon/LoadScreenBus.h>
 #include <AzFramework/Logging/MissingAssetLogger.h>
 #include <AzFramework/Platform/PlatformDefaults.h>
 #include <AzCore/Interface/Interface.h>
diff --git a/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp b/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
index 76f50b5ea6..9062e7552c 100644
--- a/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
+++ b/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp
@@ -219,9 +219,6 @@ namespace LmbrCentral
             PolygonPrismShapeDebugDisplayComponent::CreateDescriptor(),
             TubeShapeDebugDisplayComponent::CreateDescriptor(),
             AssetSystemDebugComponent::CreateDescriptor(),
-#if AZ_LOADSCREENCOMPONENT_ENABLED
-            LoadScreenComponent::CreateDescriptor(),
-#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
             });
 
         // This is an internal Amazon gem, so register it's components for metrics tracking, otherwise the name of the component won't get sent back.
@@ -248,9 +245,6 @@ namespace LmbrCentral
                    azrtti_typeid<AudioSystemComponent>(),
                    azrtti_typeid<BundlingSystemComponent>(),
                    azrtti_typeid<AssetSystemDebugComponent>(),
-#if AZ_LOADSCREENCOMPONENT_ENABLED
-                   azrtti_typeid<LoadScreenComponent>(),
-#endif // if AZ_LOADSCREENCOMPONENT_ENABLED
         };
     }
 
diff --git a/Gems/LyShine/Code/Source/LyShineModule.cpp b/Gems/LyShine/Code/Source/LyShineModule.cpp
index 1a6b2cdbda..604cd09e22 100644
--- a/Gems/LyShine/Code/Source/LyShineModule.cpp
+++ b/Gems/LyShine/Code/Source/LyShineModule.cpp
@@ -55,6 +55,8 @@
 #include "Pipeline/LyShineBuilder/LyShineBuilderComponent.h"
 #endif // LYSHINE_BUILDER
 
+#include <CryCommon/LoadScreenBus.h>
+
 namespace LyShine
 {
     LyShineModule::LyShineModule()