more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -517,7 +517,7 @@ namespace AZ
|
||||
bool result = GetTypeId() == id;
|
||||
|
||||
using dummy = bool[];
|
||||
dummy{ true, (IsTypeOfInternal<TArgs>(result, id), true)... };
|
||||
[[maybe_unused]] dummy d = { true, (IsTypeOfInternal<TArgs>(result, id), true)... };
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -2330,7 +2330,6 @@ namespace AZ::IO
|
||||
// we only want to record ASSET access
|
||||
// assets are identified as things which start with no alias, or with the @assets@ alias
|
||||
auto assetPath = AZ::IO::FileIOBase::GetInstance()->ConvertToAlias(szFilename);
|
||||
constexpr AZStd::string_view assetsAlias{ "@assets@" };
|
||||
if (assetPath && assetPath->Native().starts_with("@assets@"))
|
||||
{
|
||||
IResourceList* pList = GetResourceList(m_eRecordFileOpenList);
|
||||
|
||||
@@ -887,7 +887,6 @@ namespace AZ::IO::ZipDir
|
||||
{
|
||||
FileRecordList arrFiles(GetRoot());
|
||||
arrFiles.SortByFileOffset();
|
||||
FileRecordList::ZipStats Stats = arrFiles.GetStats();
|
||||
|
||||
// we back up our file entries, because we'll need to restore them
|
||||
// in case the operation fails
|
||||
|
||||
@@ -290,7 +290,7 @@ namespace AzFramework
|
||||
namespace Internal
|
||||
{
|
||||
|
||||
static AZStd::string PrintLuaValue(lua_State* lua, int stackIdx, int depth = 0)
|
||||
AZStd::string PrintLuaValue(lua_State* lua, int stackIdx, int depth = 0)
|
||||
{
|
||||
constexpr int MaxDepth = 4;
|
||||
if (depth > MaxDepth)
|
||||
|
||||
@@ -118,7 +118,7 @@ namespace AzNetworking
|
||||
const int32_t connectionLength = aznumeric_cast<int32_t>(sizeof(newConnection));
|
||||
memset(&newConnection, 0, connectionLength);
|
||||
|
||||
auto readCallback = [this, newConnection, connectionLength](SocketFd socketFd)
|
||||
auto readCallback = [this, newConnection](SocketFd socketFd)
|
||||
{
|
||||
auto visitor = [this, newConnection, socketFd](ListenPort& listenPort)
|
||||
{
|
||||
|
||||
@@ -51,10 +51,10 @@ public:
|
||||
|
||||
static bool IsCryLogReady()
|
||||
{
|
||||
static bool hasSetCVar = false;
|
||||
bool ready = gEnv && gEnv->pSystem && gEnv->pLog;
|
||||
|
||||
#ifdef _RELEASE
|
||||
static bool hasSetCVar = false;
|
||||
if(!hasSetCVar && ready)
|
||||
{
|
||||
// AZ logging only has a concept of 3 levels (error, warning, info) but cry logging has 4 levels (..., messaging). If info level is set, we'll turn on messaging as well
|
||||
|
||||
@@ -56,7 +56,6 @@ namespace LegacyLevelSystem
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
SpawnableLevelSystem::SpawnableLevelSystem(ISystem* pSystem)
|
||||
: m_pSystem(pSystem)
|
||||
{
|
||||
CRY_ASSERT(pSystem);
|
||||
|
||||
|
||||
@@ -66,8 +66,6 @@ class SpawnableLevelSystem
|
||||
|
||||
void LogLoadingTime();
|
||||
|
||||
ISystem* m_pSystem{nullptr};
|
||||
|
||||
AZStd::string m_lastLevelName;
|
||||
float m_fLastLevelLoadTime{0.0f};
|
||||
float m_fLastTime{0.0f};
|
||||
|
||||
@@ -1259,9 +1259,6 @@ ILocalizationManager* CSystem::GetLocalizationManager()
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void CSystem::debug_GetCallStackRaw(void** callstack, uint32& callstackLength)
|
||||
{
|
||||
uint32 callstackCapacity = callstackLength;
|
||||
uint32 nNumStackFramesToSkip = 1;
|
||||
|
||||
memset(callstack, 0, sizeof(void*) * callstackLength);
|
||||
|
||||
#if !defined(ANDROID)
|
||||
@@ -1269,6 +1266,8 @@ void CSystem::debug_GetCallStackRaw(void** callstack, uint32& callstackLength)
|
||||
#endif
|
||||
|
||||
#if AZ_LEGACY_CRYSYSTEM_TRAIT_CAPTURESTACK
|
||||
uint32 nNumStackFramesToSkip = 1;
|
||||
uint32 callstackCapacity = callstackLength;
|
||||
if (callstackCapacity > 0x40)
|
||||
{
|
||||
callstackCapacity = 0x40;
|
||||
|
||||
@@ -1858,19 +1858,6 @@ void CSystem::CreateSystemVars()
|
||||
"Usage: e_EntitySuppressionLevel [0-infinity]\n"
|
||||
"Default is 0 (off)");
|
||||
|
||||
#if defined(WIN32) || defined(WIN64)
|
||||
const uint32 nJobSystemDefaultCoreNumber = 8;
|
||||
#define AZ_RESTRICTED_SECTION_IMPLEMENTED
|
||||
#elif defined(AZ_RESTRICTED_PLATFORM)
|
||||
#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_11
|
||||
#include AZ_RESTRICTED_FILE(SystemInit_cpp)
|
||||
#endif
|
||||
#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED)
|
||||
#undef AZ_RESTRICTED_SECTION_IMPLEMENTED
|
||||
#else
|
||||
const uint32 nJobSystemDefaultCoreNumber = 4;
|
||||
#endif
|
||||
|
||||
m_sys_firstlaunch = REGISTER_INT("sys_firstlaunch", 0, 0,
|
||||
"Indicates that the game was run for the first time.");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user