dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saveload: Skip GetVariableAddress asserts if _DEBUG not defined

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-12-07 18:12:33 +00:00
parent 4da3cfcf56
commit 4436da7436
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/saveload/saveload.h
View File

@@ -1041,6 +1041,7 @@ static inline void *GetVariableAddress(const void *object, const SaveLoad *sld)
/* Entry is a global address. */ /* Entry is a global address. */
if (sld->global) return sld->address; if (sld->global) return sld->address;
#ifdef _DEBUG
/* Entry is a null-variable, mostly used to read old savegames etc. */ /* Entry is a null-variable, mostly used to read old savegames etc. */
if (GetVarMemType(sld->conv) == SLE_VAR_NULL) { if (GetVarMemType(sld->conv) == SLE_VAR_NULL) {
assert(sld->address == nullptr); assert(sld->address == nullptr);
@@ -1049,6 +1050,7 @@ static inline void *GetVariableAddress(const void *object, const SaveLoad *sld)
/* Everything else should be a non-null pointer. */ /* Everything else should be a non-null pointer. */
assert(object != nullptr); assert(object != nullptr);
#endif
return const_cast<byte *>((const byte *)object + (ptrdiff_t)sld->address); return const_cast<byte *>((const byte *)object + (ptrdiff_t)sld->address);
} }