mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00
Code Issues Releases Wiki Activity

add function and line info to guards

Browse Source
This commit is contained in:
Ted John
2016-07-16 14:17:36 +01:00
parent d25baf7bd3
commit 5f41e3a0eb
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/object/ObjectFactory.cpp
View File

@@ -166,8 +166,8 @@ namespace ObjectFactory
Object * CreateObjectFromLegacyData(const rct_object_entry * entry, const void * data, size_t dataSize)
{
Guard::ArgumentNotNull(entry);
Guard::ArgumentNotNull(data);
Guard::ArgumentNotNull(entry, GUARD_LINE);
Guard::ArgumentNotNull(data, GUARD_LINE);
Object * result = CreateObject(*entry);
if (result != nullptr)

2
src/object/ObjectManager.cpp
View File

@@ -225,7 +225,7 @@ private:
size_t GetLoadedObjectIndex(const Object * object)
{
Guard::ArgumentNotNull(object);
Guard::ArgumentNotNull(object, GUARD_LINE);
size_t result = SIZE_MAX;
if (_loadedObjects != nullptr)

6
src/object/ObjectRepository.cpp
View File

@@ -167,7 +167,7 @@ public:
Object * LoadObject(const ObjectRepositoryItem * ori) override
{
Guard::ArgumentNotNull(ori);
Guard::ArgumentNotNull(ori, GUARD_LINE);
Object * object = ObjectFactory::CreateObjectFromLegacyFile(ori->Path);
return object;
@@ -177,7 +177,7 @@ public:
{
ObjectRepositoryItem * item = &_items[ori->Id];
Guard::Assert(item->LoadedObject == nullptr);
Guard::Assert(item->LoadedObject == nullptr, GUARD_LINE);
item->LoadedObject = object;
}
@@ -518,7 +518,7 @@ private:
int newRealChecksum = object_calculate_checksum(entry, newData, newDataSize);
if (newRealChecksum != entry->checksum)
{
Guard::Fail("CalculateExtraBytesToFixChecksum failed to fix checksum.");
Guard::Fail("CalculateExtraBytesToFixChecksum failed to fix checksum.", GUARD_LINE);
// Save old data form
SaveObject(path, entry, data, dataSize, false);

2
src/object/SceneryGroupObject.cpp
View File

@@ -94,7 +94,7 @@ void SceneryGroupObject::UpdateEntryIndexes()
if (ori->LoadedObject == nullptr) continue;
uint16 sceneryEntry = objectManager->GetLoadedObjectEntryIndex(ori->LoadedObject);
Guard::Assert(sceneryEntry != UINT8_MAX);
Guard::Assert(sceneryEntry != UINT8_MAX, GUARD_LINE);
uint8 objectType = objectEntry->flags & 0x0F;
switch (objectType) {