Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
-10
View File
@@ -68,11 +68,7 @@ struct IRenderer;
struct IProcess;
struct I3DEngine;
struct ITimer;
struct INetwork;
struct IOnline;
struct ICryLobby;
struct ICryFont;
class ICrypto;
struct IMovieSystem;
struct IMemoryManager;
namespace Audio
@@ -197,7 +193,6 @@ enum ESystemConfigPlatform
CONFIG_OSX_METAL = 3,
CONFIG_ANDROID = 4,
CONFIG_IOS = 5,
CONFIG_XENIA = 6,
CONFIG_PROVO = 7,
CONFIG_SALEM = 8,
CONFIG_JASPER = 9,
@@ -879,7 +874,6 @@ struct SSystemUpdateStats
struct SSystemGlobalEnvironment
{
I3DEngine* p3DEngine;
INetwork* pNetwork;
AZ::IO::IArchive* pCryPak;
AZ::IO::FileIOBase* pFileIO;
IFileChangeMonitor* pFileChangeMonitor;
@@ -1323,7 +1317,6 @@ struct ISystem
virtual I3DEngine* GetI3DEngine() = 0;
virtual ::IConsole* GetIConsole() = 0;
virtual IRemoteConsole* GetIRemoteConsole() = 0;
virtual ICrypto* GetCrypto() = 0;
// Returns:
// Can be NULL, because it only exists when running through the editor, not in pure game mode.
virtual IResourceManager* GetIResourceManager() = 0;
@@ -1341,9 +1334,6 @@ struct ISystem
//irtual IThreadManager* GetIThreadManager() = 0;
virtual INetwork* GetINetwork() = 0;
virtual void SetLoadingProgressListener(ILoadingProgressListener* pListener) = 0;
virtual ISystem::ILoadingProgressListener* GetLoadingProgressListener() const = 0;