[Scummvm-cvs-logs] scummvm master -> 04de7279a154eb4869f6ad76388ae0e9232f1433
m-kiewitz
m_kiewitz at users.sourceforge.net
Fri Feb 5 19:44:13 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
04de7279a1 SCI: Blocking ScummVM auto-save slot 0 for saving
Commit: 04de7279a154eb4869f6ad76388ae0e9232f1433
https://github.com/scummvm/scummvm/commit/04de7279a154eb4869f6ad76388ae0e9232f1433
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-05T19:43:48+01:00
Commit Message:
SCI: Blocking ScummVM auto-save slot 0 for saving
Auto-saving is not used by SCI, but slot 0 is ScummVM "standard"
for auto-saving, that's why it's not available for saving anymore.
Jones still uses slot 0 for saving/restoring (because it's
hardcoded and changing it would break it somewhat)
Deleting + restoring is still possible of couse.
Changed paths:
engines/sci/detection.cpp
engines/sci/engine/kfile.cpp
engines/sci/engine/state.h
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 7c70600..f4f1040 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -730,12 +730,12 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const {
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
- int slotNum = 0;
+ int slotNr = 0;
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
// Obtain the last 3 digits of the filename, since they correspond to the save slot
- slotNum = atoi(file->c_str() + file->size() - 3);
+ slotNr = atoi(file->c_str() + file->size() - 3);
- if (slotNum >= 0 && slotNum <= 99) {
+ if (slotNr >= 0 && slotNr <= 99) {
Common::InSaveFile *in = saveFileMan->openForLoading(*file);
if (in) {
SavegameMetadata meta;
@@ -744,7 +744,17 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const {
delete in;
continue;
}
- saveList.push_back(SaveStateDescriptor(slotNum, meta.name));
+ SaveStateDescriptor descriptor(slotNr, meta.name);
+
+ if (slotNr == 0) {
+ // ScummVM auto-save slot, not used by SCI
+ // SCI does not support auto-saving, but slot 0 is reserved for auto-saving in ScummVM.
+ descriptor.setWriteProtectedFlag(true);
+ } else {
+ descriptor.setWriteProtectedFlag(false);
+ }
+
+ saveList.push_back(descriptor);
delete in;
}
}
@@ -753,48 +763,60 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const {
return saveList;
}
-SaveStateDescriptor SciMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
- Common::String fileName = Common::String::format("%s.%03d", target, slot);
+SaveStateDescriptor SciMetaEngine::querySaveMetaInfos(const char *target, int slotNr) const {
+ Common::String fileName = Common::String::format("%s.%03d", target, slotNr);
Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(fileName);
+ SaveStateDescriptor descriptor(slotNr, "");
+
+ // Do not allow save slot 0 (used for auto-saving) to be deleted or
+ // overwritten. SCI does not support auto-saving, but slot 0 is reserved for auto-saving in ScummVM.
+ if (slotNr == 0) {
+ descriptor.setWriteProtectedFlag(true);
+ descriptor.setDeletableFlag(false);
+ } else {
+ descriptor.setWriteProtectedFlag(false);
+ descriptor.setDeletableFlag(true);
+ }
if (in) {
SavegameMetadata meta;
+
if (!get_savegame_metadata(in, &meta)) {
// invalid
delete in;
- SaveStateDescriptor desc(slot, "Invalid");
- return desc;
+ descriptor.setDescription("*Invalid*");
+ return descriptor;
}
- SaveStateDescriptor desc(slot, meta.name);
+ descriptor.setDescription(meta.name);
Graphics::Surface *const thumbnail = Graphics::loadThumbnail(*in);
- desc.setThumbnail(thumbnail);
+ descriptor.setThumbnail(thumbnail);
int day = (meta.saveDate >> 24) & 0xFF;
int month = (meta.saveDate >> 16) & 0xFF;
int year = meta.saveDate & 0xFFFF;
- desc.setSaveDate(year, month, day);
+ descriptor.setSaveDate(year, month, day);
int hour = (meta.saveTime >> 16) & 0xFF;
int minutes = (meta.saveTime >> 8) & 0xFF;
- desc.setSaveTime(hour, minutes);
+ descriptor.setSaveTime(hour, minutes);
if (meta.version >= 34) {
- desc.setPlayTime(meta.playTime * 1000 / 60);
+ descriptor.setPlayTime(meta.playTime * 1000 / 60);
} else {
- desc.setPlayTime(meta.playTime * 1000);
+ descriptor.setPlayTime(meta.playTime * 1000);
}
delete in;
- return desc;
+ return descriptor;
}
-
- return SaveStateDescriptor();
+ // Return empty descriptor
+ return descriptor;
}
int SciMetaEngine::getMaximumSaveSlot() const { return 99; }
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 80bd683..979fa95 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -806,15 +806,15 @@ reg_t kSaveGame(EngineState *s, int argc, reg_t *argv) {
} else {
uint savegameNr;
// savegameId is in lower range, scripts expect us to create a new slot
- for (savegameId = 0; savegameId < SAVEGAMEID_OFFICIALRANGE_START; savegameId++) {
+ for (savegameId = SAVEGAMESLOT_FIRST; savegameId <= SAVEGAMESLOT_LAST; savegameId++) {
for (savegameNr = 0; savegameNr < saves.size(); savegameNr++) {
if (savegameId == saves[savegameNr].id)
break;
}
- if (savegameNr == saves.size())
+ if (savegameNr == saves.size()) // Slot not found, seems to be good to go
break;
}
- if (savegameId == SAVEGAMEID_OFFICIALRANGE_START)
+ if (savegameId > SAVEGAMESLOT_LAST)
error("kSavegame: no more savegame slots available");
}
} else {
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index eb9f3bb..0f04e32 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -57,6 +57,10 @@ enum AbortGameState {
kAbortQuitGame = 3
};
+// slot 0 is the ScummVM auto-save slot, which is not used by us, but is still reserved
+#define SAVEGAMESLOT_FIRST 1
+#define SAVEGAMESLOT_LAST 99
+
// We assume that scripts give us savegameId 0->99 for creating a new save slot
// and savegameId 100->199 for existing save slots. Refer to kfile.cpp
enum {
More information about the Scummvm-git-logs
mailing list