birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes some usage of DEDICATED_SERVER (#5119)

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-11-01 08:46:26 -07:00
committed by GitHub
parent 43563060bc
commit 8e420dad3d
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CrySystem/CrySystem_precompiled.h
-7
View File
@@ -60,13 +60,6 @@
#include <platform.h>
#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX)
#if defined(DEDICATED_SERVER)
// enable/disable map load slicing functionality from the build
#define MAP_LOADING_SLICING
#endif
#endif
#ifdef WIN32
#include <AzCore/PlatformIncl.h>
#include <tlhelp32.h>
Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
+10 -9
View File
@@ -239,15 +239,16 @@ void UiCanvasAssetRefComponent::Activate()
////////////////////////////////////////////////////////////////////////////////////////////////////
void UiCanvasAssetRefComponent::Deactivate()
{
#if !defined(DEDICATED_SERVER)
if (m_canvasEntityId.IsValid())
if (!gEnv->IsDedicated())
{
gEnv->pLyShine->ReleaseCanvasDeferred(m_canvasEntityId);
m_canvasEntityId.SetInvalid();
}
if (m_canvasEntityId.IsValid())
{
gEnv->pLyShine->ReleaseCanvasDeferred(m_canvasEntityId);
m_canvasEntityId.SetInvalid();
}
UiCanvasAssetRefBus::Handler::BusDisconnect();
UiCanvasRefBus::Handler::BusDisconnect();
UiCanvasManagerNotificationBus::Handler::BusDisconnect();
#endif
UiCanvasAssetRefBus::Handler::BusDisconnect();
UiCanvasRefBus::Handler::BusDisconnect();
UiCanvasManagerNotificationBus::Handler::BusDisconnect();
}
}