refactors some code to better pickup AZ_LOADSCREENCOMPONENT_ENABLED's value

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
monroegm-disable-blank-issue-2
Esteban Papp 4 years ago
parent 70ffece2a9
commit 5b0cb9cdff

@ -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>

@ -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>

@ -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>

@ -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>

@ -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
};
}

@ -55,6 +55,8 @@
#include "Pipeline/LyShineBuilder/LyShineBuilderComponent.h"
#endif // LYSHINE_BUILDER
#include <CryCommon/LoadScreenBus.h>
namespace LyShine
{
LyShineModule::LyShineModule()

Loading…
Cancel
Save