diff options
| -rw-r--r-- | engines/scumm/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/saveload.cpp | 8 | ||||
| -rw-r--r-- | engines/scumm/scumm.h | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 2a6de98dee..f7ae50cc63 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -1186,7 +1186,7 @@ SaveStateDescriptor ScummMetaEngine::querySaveMetaInfos(const char *target, int desc.setDeletableFlag(true); desc.setThumbnail(thumbnail); - InfoStuff infos; + SaveStateMetaInfos infos; memset(&infos, 0, sizeof(infos)); if (ScummEngine::loadInfosFromSlot(target, slot, &infos)) { int day = (infos.date >> 24) & 0xFF; diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index bdae4c5f6a..fb34255683 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -373,7 +373,7 @@ bool ScummEngine::loadState(int slot, bool compat) { // Since version 56 we save additional information about the creation of // the save game and the save time. if (hdr.ver >= VER(56)) { - InfoStuff infos; + SaveStateMetaInfos infos; if (!loadInfos(in, &infos)) { warning("Info section could not be found"); delete in; @@ -703,7 +703,7 @@ Graphics::Surface *ScummEngine::loadThumbnailFromSlot(const char *target, int sl return thumb; } -bool ScummEngine::loadInfosFromSlot(const char *target, int slot, InfoStuff *stuff) { +bool ScummEngine::loadInfosFromSlot(const char *target, int slot, SaveStateMetaInfos *stuff) { Common::SeekableReadStream *in; SaveGameHeader hdr; @@ -741,8 +741,8 @@ bool ScummEngine::loadInfosFromSlot(const char *target, int slot, InfoStuff *stu return true; } -bool ScummEngine::loadInfos(Common::SeekableReadStream *file, InfoStuff *stuff) { - memset(stuff, 0, sizeof(InfoStuff)); +bool ScummEngine::loadInfos(Common::SeekableReadStream *file, SaveStateMetaInfos *stuff) { + memset(stuff, 0, sizeof(SaveStateMetaInfos)); SaveInfoSection section; section.type = file->readUint32BE(); diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 86b8276fd0..23e6b7b256 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -308,8 +308,7 @@ enum WhereIsObject { WIO_FLOBJECT = 4 }; -// TODO: Rename InfoStuff to something more descriptive -struct InfoStuff { +struct SaveStateMetaInfos { uint32 date; uint16 time; uint32 playtime; @@ -678,11 +677,11 @@ public: } static Graphics::Surface *loadThumbnailFromSlot(const char *target, int slot); - static bool loadInfosFromSlot(const char *target, int slot, InfoStuff *stuff); + static bool loadInfosFromSlot(const char *target, int slot, SaveStateMetaInfos *stuff); protected: void saveInfos(Common::WriteStream* file); - static bool loadInfos(Common::SeekableReadStream *file, InfoStuff *stuff); + static bool loadInfos(Common::SeekableReadStream *file, SaveStateMetaInfos *stuff); protected: /* Script VM - should be in Script class */ |