AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-07-03 03:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

CWorldCooker: Prevent signed overflow in CookMLVL

Browse Source 
Even if all 32 bits aren't used, this still eliminates a sign-conversion
warning from int to uint64.`
This commit is contained in:
Lioncash 2020-06-18 13:13:24 -04:00
parent 1d54df7185
commit 9d21516296
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Resource/Cooker/CAreaCooker.cpp
View File

@ -4,7 +4,7 @@
#include "Core/GameProject/DependencyListBuilders.h"
#include <Common/Log.h>
const bool gkForceDisableCompression = false;
constexpr bool gkForceDisableCompression = false;
CAreaCooker::CAreaCooker() = default;

4
src/Core/Resource/Cooker/CWorldCooker.cpp
View File

@ -222,13 +222,13 @@ bool CWorldCooker::CookMLVL(CWorld *pWorld, IOutputStream& rMLVL)
LayerNameOffsets.push_back(LayerNames.size());
rMLVL.WriteLong(rArea.Layers.size());
uint64 LayerActiveFlags = -1;
uint64 LayerActiveFlags = UINT64_MAX;
for (uint32 iLyr = 0; iLyr < rArea.Layers.size(); iLyr++)
{
CWorld::SArea::SLayer& rLayer = rArea.Layers[iLyr];
if (!rLayer.Active)
LayerActiveFlags &= ~(1 << iLyr);
LayerActiveFlags &= ~(UINT64_C(1) << iLyr);
LayerNames.push_back(rLayer.LayerName);
LayerStateIDs.push_back(rLayer.LayerStateID);

18
src/Core/Resource/Script/NPropertyMap.cpp
View File

@ -9,14 +9,14 @@ namespace NPropertyMap
namespace
{
/** Path to the property map file */
const char* gpkLegacyMapPath = "templates/PropertyMapLegacy.xml";
const char* gpkMapPath = "templates/PropertyMap.xml";
constexpr char gpkLegacyMapPath[] = "templates/PropertyMapLegacy.xml";
constexpr char gpkMapPath[] = "templates/PropertyMap.xml";
/** Whether to do name lookups from the legacy map */
const bool gkUseLegacyMapForNameLookups = false;
constexpr bool gkUseLegacyMapForNameLookups = false;
/** Whether to update names in the legacy map */
const bool gkUseLegacyMapForUpdates = false;
constexpr bool gkUseLegacyMapForUpdates = false;
/** Whether the map is dirty (has unsaved changes */
bool gMapIsDirty = false;
@ -150,7 +150,7 @@ void LoadMap()
ASSERT(!gMapIsLoaded);
debugf("Loading property map");
if (gkUseLegacyMapForNameLookups)
if constexpr (gkUseLegacyMapForNameLookups)
{
CXMLReader Reader(gDataDir + gpkLegacyMapPath);
ASSERT(Reader.IsValid());
@ -199,7 +199,7 @@ void SaveMap(bool Force)
if (gMapIsDirty || Force)
{
if (gkUseLegacyMapForUpdates)
if constexpr (gkUseLegacyMapForUpdates)
{
CXMLWriter Writer(gDataDir + gpkLegacyMapPath, "PropertyMap");
ASSERT(Writer.IsValid());
@ -235,7 +235,7 @@ const char* GetPropertyName(IProperty* pInProperty)
{
ConditionalLoadMap();
if (gkUseLegacyMapForNameLookups)
if constexpr (gkUseLegacyMapForNameLookups)
{
const auto MapFind = gLegacyNameMap.find(pInProperty->ID());
return MapFind == gLegacyNameMap.cend() ? "Unknown" : *MapFind->second;
@ -327,7 +327,7 @@ void RetrieveXMLsWithProperty(uint32 ID, const char* pkTypeName, std::set<TStrin
/** Updates the name of a given property in the map */
void SetPropertyName(uint32 ID, const char* pkTypeName, const char* pkNewName)
{
if (gkUseLegacyMapForUpdates)
if constexpr (gkUseLegacyMapForUpdates)
{
auto Iter = gLegacyNameMap.find(ID);
@ -475,7 +475,7 @@ void RegisterProperty(IProperty* pProperty)
SNameKey Key = CreateKey(pProperty);
auto MapFind = gNameMap.find(Key);
if (gkUseLegacyMapForNameLookups)
if constexpr (gkUseLegacyMapForNameLookups)
{
// If we are using the legacy map, gNameMap may be empty. We need to retrieve the name
// from the legacy map, and create an entry in gNameMap with it.