thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hardcoding header size of the Thumbnail and of the Info section of scumm games.

Browse source 
(because packed struct handling changed and gcc seems not to be happy with it)
This should unbreak new save games made after this commit.

svn-id: r23565
This commit is contained in:
Johannes Schickel 2006-07-22 16:19:00 +00:00
parent 16de659f59
commit d272f6c483
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/scumm/saveload.cpp
View file

@ -69,6 +69,8 @@ struct SaveInfoSection {
uint16 time;
};
#define SaveInfoSectionSize (4+4+4 + 4+4 + 4+2)
#if defined(END_PACK_STRUCTS)
#pragma END_PACK_STRUCTS
#endif
@ -519,7 +521,7 @@ bool ScummEngine::loadInfos(Common::InSaveFile *file, InfoStuff *stuff) {
section.size = file->readUint32BE();
// if we extend this we should add a table for the special sizes at the versions to check it
if (section.version == INFOSECTION_VERSION && section.size != sizeof(SaveInfoSection)) {
if (section.version == INFOSECTION_VERSION && section.size != SaveInfoSectionSize) {
warning("Info section is corrupt");
file->skip(section.size);
return false;
@ -549,8 +551,8 @@ bool ScummEngine::loadInfos(Common::InSaveFile *file, InfoStuff *stuff) {
// skip all newer features, this could make problems if some older version uses more space for
// saving informations, but this should NOT happen
if (section.size > sizeof(SaveInfoSection)) {
file->skip(section.size - sizeof(SaveInfoSection));
if (section.size > SaveInfoSectionSize) {
file->skip(section.size - SaveInfoSectionSize);
}
return true;
@ -560,7 +562,7 @@ void ScummEngine::saveInfos(Common::OutSaveFile* file) {
SaveInfoSection section;
section.type = MKID_BE('INFO');
section.version = INFOSECTION_VERSION;
section.size = sizeof(SaveInfoSection);
section.size = SaveInfoSectionSize;
// still save old format for older versions
section.timeTValue = time(0);