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

Merge branch 'development' into cmake/warn_virtual

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-10 20:27:01 -07:00
parent 5ce7b76ca5 72cd282ad2
commit 5965760612
156 changed files with 35196 additions and 34784 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp
+2 -9
View File
@@ -125,7 +125,7 @@ bool CBinaryXmlNode::getAttr(const char* key, int64& value) const
const char* svalue = GetValue(key);
if (svalue)
{
azsscanf(svalue, "%" PRId64, &value);
value = strtoll(svalue, nullptr, 10);
return true;
}
return false;
@@ -137,14 +137,7 @@ bool CBinaryXmlNode::getAttr(const char* key, uint64& value, bool useHexFormat)
const char* svalue = GetValue(key);
if (svalue)
{
if (useHexFormat)
{
azsscanf(svalue, "%" PRIX64, &value);
}
else
{
azsscanf(svalue, "%" PRIu64, &value);
}
value = strtoull(svalue, nullptr, useHexFormat ? 16 : 10);
return true;
}
return false;
Code/Legacy/CrySystem/XML/xml.cpp
+2 -9
View File
@@ -400,7 +400,7 @@ bool CXmlNode::getAttr(const char* key, int64& value) const
const char* svalue = GetValue(key);
if (svalue)
{
azsscanf(svalue, "%" PRId64, &value);
value = strtoll(key, nullptr, 10);
return true;
}
return false;
@@ -412,14 +412,7 @@ bool CXmlNode::getAttr(const char* key, uint64& value, bool useHexFormat) const
const char* svalue = GetValue(key);
if (svalue)
{
if (useHexFormat)
{
azsscanf(svalue, "%" PRIX64, &value);
}
else
{
azsscanf(svalue, "%" PRIu64, &value);
}
value = strtoull(key, nullptr, useHexFormat ? 16 : 10);
return true;
}
return false;