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

Change: switch SL_DEQUE and SL_REFLIST length field to a gamma 

The current SaveLoad is a bit inconsistent how long a length field
is. Sometimes it is a 32bit, sometimes a gamma. Make it consistent
across the board by making them all gammas.
pull/9375/head
Patric Stout 2021-06-12 13:23:19 +02:00 committed by Patric Stout
parent 75e7451151
commit 0d2e3437e3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/saveload/saveload.cpp
View File

@ -1261,7 +1261,7 @@ public:
const SlStorageT *list = static_cast<const SlStorageT *>(storage); const SlStorageT *list = static_cast<const SlStorageT *>(storage);
int type_size = SlCalcConvFileLen(SLE_FILE_U32); // Size of the length of the list. int type_size = SlGetArrayLength(list->size());
int item_size = SlCalcConvFileLen(cmd == SL_VAR ? conv : (VarType)SLE_FILE_U32); int item_size = SlCalcConvFileLen(cmd == SL_VAR ? conv : (VarType)SLE_FILE_U32);
return list->size() * item_size + type_size; return list->size() * item_size + type_size;
} }
@ -1290,7 +1290,7 @@ public:
switch (_sl.action) { switch (_sl.action) {
case SLA_SAVE: case SLA_SAVE:
SlWriteUint32((uint32)list->size()); SlWriteArrayLength(list->size());
for (auto &item : *list) { for (auto &item : *list) {
SlSaveLoadMember(cmd, &item, conv); SlSaveLoadMember(cmd, &item, conv);
@ -1301,8 +1301,8 @@ public:
case SLA_LOAD: { case SLA_LOAD: {
size_t length; size_t length;
switch (cmd) { switch (cmd) {
case SL_VAR: length = SlReadUint32(); break; case SL_VAR: length = IsSavegameVersionBefore(SLV_SAVELOAD_LIST_LENGTH) ? SlReadUint32() : SlReadArrayLength(); break;
case SL_REF: length = IsSavegameVersionBefore(SLV_69) ? SlReadUint16() : SlReadUint32(); break; case SL_REF: length = IsSavegameVersionBefore(SLV_69) ? SlReadUint16() : IsSavegameVersionBefore(SLV_SAVELOAD_LIST_LENGTH) ? SlReadUint32() : SlReadArrayLength(); break;
default: NOT_REACHED(); default: NOT_REACHED();
} }