Fixing initialization of LyShin and removing a macro and ISystemEventListner that were not doing anything
This commit is contained in:
@@ -50,10 +50,6 @@
|
||||
#include <AzCore/Memory/OSAllocator.h> // memalign
|
||||
#endif // defined(APPLE)
|
||||
|
||||
#ifndef STLALLOCATOR_CLEANUP
|
||||
#define STLALLOCATOR_CLEANUP
|
||||
#endif
|
||||
|
||||
#define _CRY_DEFAULT_MALLOC_ALIGNMENT 4
|
||||
|
||||
#if CRYMEMORYMANAGER_H_TRAIT_INCLUDE_MALLOC_H
|
||||
|
||||
@@ -90,7 +90,6 @@ public:
|
||||
case ESYSTEM_EVENT_LEVEL_POST_UNLOAD:
|
||||
{
|
||||
CryCleanup();
|
||||
STLALLOCATOR_CLEANUP;
|
||||
gEnv->pSystem->SetThreadState(ESubsys_Physics, true);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1393,11 +1393,6 @@ bool CSystem::InitShine([[maybe_unused]] const SSystemInitParams& initParams)
|
||||
|
||||
EBUS_EVENT(UiSystemBus, InitializeSystem);
|
||||
|
||||
if (!m_env.pLyShine)
|
||||
{
|
||||
AZ_Error(AZ_TRACE_SYSTEM_WINDOW, false, "LYShine System did not initialize correctly. Please check that the LyShine gem is enabled for this project in ProjectConfigurator.");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -272,7 +272,6 @@ void CXmlUtils::OnSystemEvent(ESystemEvent event, [[maybe_unused]] UINT_PTR wpar
|
||||
case ESYSTEM_EVENT_LEVEL_POST_UNLOAD:
|
||||
case ESYSTEM_EVENT_LEVEL_LOAD_END:
|
||||
g_pCXmlNode_PoolAlloc->FreeMemoryIfEmpty();
|
||||
STLALLOCATOR_CLEANUP;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user