aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/made/database.cpp22
1 files changed, 12 insertions, 10 deletions
diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index bf47164e8f..7c8f9bdd0c 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -665,15 +665,16 @@ bool GameDatabaseV3::getSavegameDescription(const char *filename, Common::String
}
int32 size = in->readUint32LE();
- if (size != in->size() - 64) {
- warning("Unexpected save game size. Expected %d, size is %d (file size - 64)", size, in->size() - 64);
+ int16 saveVersion = in->readUint16LE();
+
+ if (saveVersion != version) {
+ warning("Save game %s was saved with a different version of the game. Game version is %d, save version is %d", filename, version, saveVersion);
delete in;
return false;
}
- int16 saveVersion = in->readUint16LE();
- if (saveVersion != version) {
- warning("Save game %s was saved with a different version of the game. Game version is %d, save version is %d", filename, version, saveVersion);
+ if (size != in->size() - 64) {
+ warning("Unexpected save game size. Expected %d, size is %d (file size - 64)", size, in->size() - 64);
delete in;
return false;
}
@@ -722,15 +723,16 @@ int16 GameDatabaseV3::loadgame(const char *filename, int16 version) {
}
uint32 size = in->readUint32LE();
- if (size != expectedSize) {
- warning("Unexpected save game size. Expected %d, size is %d", expectedSize, size);
+ int16 saveVersion = in->readUint16LE();
+
+ if (saveVersion != version) {
+ warning("Save game %s was saved with a different version of the game. Game version is %d, save version is %d", filename, version, saveVersion);
delete in;
return 1;
}
- int16 saveVersion = in->readUint16LE();
- if (saveVersion != version) {
- warning("Save game %s was saved with a different version of the game. Game version is %d, save version is %d", filename, version, saveVersion);
+ if (size != expectedSize) {
+ warning("Unexpected save game size. Expected %d, size is %d", expectedSize, size);
delete in;
return 1;
}