mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: move GetVariableAddress inside SlObjectMember 

Also move it to static, as nobody else is using it.
pull/9342/head
Patric Stout 2021-05-31 22:49:44 +02:00 committed by Patric Stout
parent f899772ec2
commit fba86f711f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/saveload/saveload.cpp
View File

@ -1517,8 +1517,10 @@ size_t SlCalcObjMemberLength(const void *object, const SaveLoad &sld)
} }
} }
bool SlObjectMember(void *ptr, const SaveLoad &sld) static bool SlObjectMember(void *object, const SaveLoad &sld)
{ {
void *ptr = GetVariableAddress(object, sld);
assert(IsVariableSizeRight(sld)); assert(IsVariableSizeRight(sld));
VarType conv = GB(sld.conv, 0, 8); VarType conv = GB(sld.conv, 0, 8);
@ -1604,8 +1606,7 @@ void SlObject(void *object, const SaveLoadTable &slt)
} }
for (auto &sld : slt) { for (auto &sld : slt) {
void *ptr = GetVariableAddress(object, sld); SlObjectMember(object, sld);
SlObjectMember(ptr, sld);
} }
} }

1
src/saveload/saveload.h
View File

@ -905,7 +905,6 @@ void SlWriteByte(byte b);
void SlGlobList(const SaveLoadTable &slt); void SlGlobList(const SaveLoadTable &slt);
void SlArray(void *array, size_t length, VarType conv); void SlArray(void *array, size_t length, VarType conv);
void SlObject(void *object, const SaveLoadTable &slt); void SlObject(void *object, const SaveLoadTable &slt);
bool SlObjectMember(void *object, const SaveLoad &sld);
void NORETURN SlError(StringID string, const char *extra_msg = nullptr); void NORETURN SlError(StringID string, const char *extra_msg = nullptr);
void NORETURN SlErrorCorrupt(const char *msg); void NORETURN SlErrorCorrupt(const char *msg);
void NORETURN SlErrorCorruptFmt(const char *format, ...) WARN_FORMAT(1, 2); void NORETURN SlErrorCorruptFmt(const char *format, ...) WARN_FORMAT(1, 2);