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

ENGINES: Use MetaEngine consistently for getting autosave slot

Browse source 
The autosave refactoring that was done in
7adad5aaf5 used g_engine for identifying the
autosave slot. This worked for in-game save/load, but doesn't fit when
called from the launcher.

Fix by passing MetaEngine to SaveStateDescriptor ctor and using it for this
query.

Amends 7adad5aaf5.
This commit is contained in:
Orgad Shaneh 2021-10-19 09:28:14 +03:00 • committed by Eugene Sandulenko
parent 7399dced7b
commit fe104cc337
87 changed files with 182 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/access/metaengine.cpp
View file

@ -135,7 +135,7 @@ SaveStateList AccessMetaEngine::listSaves(const char *target) const {
if (in) {
if (Access::AccessEngine::readSavegameHeader(in, header))
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
saveList.push_back(SaveStateDescriptor(this, slot, header._saveName));
delete in;
}
@ -170,7 +170,7 @@ SaveStateDescriptor AccessMetaEngine::querySaveMetaInfos(const char *target, int
delete f;
// Create the return descriptor
SaveStateDescriptor desc(slot, header._saveName);
SaveStateDescriptor desc(this, slot, header._saveName);
desc.setThumbnail(header._thumbnail);
desc.setSaveDate(header._year, header._month, header._day);
desc.setSaveTime(header._hour, header._minute);

4
engines/adl/metaengine.cpp
View file

@ -136,7 +136,7 @@ SaveStateDescriptor AdlMetaEngine::querySaveMetaInfos(const char *target, int sl
return SaveStateDescriptor();
}
SaveStateDescriptor sd(slot, name);
SaveStateDescriptor sd(this, slot, name);
int year = inFile->readUint16BE();
int month = inFile->readByte();
@ -198,7 +198,7 @@ SaveStateList AdlMetaEngine::listSaves(const char *target) const {
delete inFile;
int slotNum = atoi(fileName.c_str() + fileName.size() - 2);
SaveStateDescriptor sd(slotNum, name);
SaveStateDescriptor sd(this, slotNum, name);
saveList.push_back(sd);
}

6
engines/agi/metaengine.cpp
View file

@ -214,7 +214,7 @@ SaveStateList AgiMetaEngine::listSaves(const char *target) const {
delete in;
saveList.push_back(SaveStateDescriptor(slotNr, description));
saveList.push_back(SaveStateDescriptor(this, slotNr, description));
}
}
}
@ -257,11 +257,11 @@ SaveStateDescriptor AgiMetaEngine::querySaveMetaInfos(const char *target, int sl
// broken description, ignore it
delete in;
SaveStateDescriptor descriptor(slotNr, "[broken saved game]");
SaveStateDescriptor descriptor(this, slotNr, "[broken saved game]");
return descriptor;
}
SaveStateDescriptor descriptor(slotNr, description);
SaveStateDescriptor descriptor(this, slotNr, description);
char saveVersion = in->readByte();
if (saveVersion >= 4) {

2
engines/agos/metaengine.cpp
View file

@ -128,7 +128,7 @@ SaveStateList AgosMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(*file);
if (in) {
saveDesc = file->c_str();
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveDesc));
delete in;
}
}

4
engines/ags/metaengine.cpp
View file

@ -69,7 +69,7 @@ SaveStateList AGSMetaEngine::listSaves(const char *target) const {
if (slotNum > maxSlot)
continue;
SaveStateDescriptor desc(slotNum, rich_media_header.getSaveName());
SaveStateDescriptor desc(this, slotNum, rich_media_header.getSaveName());
saveList.push_back(desc);
}
}
@ -111,7 +111,7 @@ SaveStateDescriptor AGSMetaEngine::querySaveMetaInfos(const char *target, int sl
rich_media_header.ReadFromFile(&saveFile);
if (rich_media_header.dwMagicNumber == RM_MAGICNUMBER) {
SaveStateDescriptor desc(slot, rich_media_header.getSaveName());
SaveStateDescriptor desc(this, slot, rich_media_header.getSaveName());
// Thumbnail handling
if (rich_media_header.dwThumbnailOffsetLowerDword != 0 &&

4
engines/avalanche/metaengine.cpp
View file

@ -126,7 +126,7 @@ SaveStateList AvalancheMetaEngine::listSaves(const char *target) const {
file->read(name, nameSize);
name[nameSize] = 0;
saveList.push_back(SaveStateDescriptor(slotNum, name));
saveList.push_back(SaveStateDescriptor(this, slotNum, name));
delete[] name;
delete file;
}
@ -172,7 +172,7 @@ SaveStateDescriptor AvalancheMetaEngine::querySaveMetaInfos(const char *target,
description += actChar;
}
SaveStateDescriptor desc(slot, description);
SaveStateDescriptor desc(this, slot, description);
Graphics::Surface *thumbnail;
if (!Graphics::loadThumbnail(*f, thumbnail)) {

4
engines/bbvs/metaengine.cpp
View file

@ -87,7 +87,7 @@ SaveStateList BbvsMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
if (in) {
if (Bbvs::BbvsEngine::readSaveHeader(in, header) == Bbvs::BbvsEngine::kRSHENoError) {
saveList.push_back(SaveStateDescriptor(slotNum, header.description));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.description));
}
delete in;
}
@ -107,7 +107,7 @@ SaveStateDescriptor BbvsMetaEngine::querySaveMetaInfos(const char *target, int s
error = Bbvs::BbvsEngine::readSaveHeader(in, header, false);
delete in;
if (error == Bbvs::BbvsEngine::kRSHENoError) {
SaveStateDescriptor desc(slot, header.description);
SaveStateDescriptor desc(this, slot, header.description);
desc.setThumbnail(header.thumbnail);
desc.setSaveDate(header.saveDate & 0xFFFF, (header.saveDate >> 16) & 0xFF, (header.saveDate >> 24) & 0xFF);
desc.setSaveTime((header.saveTime >> 16) & 0xFF, (header.saveTime >> 8) & 0xFF);

4
engines/bladerunner/bladerunner.cpp
View file

@ -350,7 +350,7 @@ Common::Error BladeRunnerEngine::run() {
_system->showMouse(true);
bool hasSavegames = !SaveFileManager::list(_targetName).empty();
bool hasSavegames = !SaveFileManager::list(getMetaEngine(), _targetName).empty();
if (!startup(hasSavegames)) {
// shutting down
@ -2401,7 +2401,7 @@ void BladeRunnerEngine::autoSaveGame(int textId, bool endgame) {
}
_gameIsAutoSaving = true;
SaveStateList saveList = BladeRunner::SaveFileManager::list(getTargetName());
SaveStateList saveList = BladeRunner::SaveFileManager::list(getMetaEngine(), getTargetName());
// Find first available save slot
int slot = -1;

4
engines/bladerunner/metaengine.cpp
View file

@ -66,7 +66,7 @@ bool BladeRunnerMetaEngine::hasFeature(MetaEngineFeature f) const {
}
SaveStateList BladeRunnerMetaEngine::listSaves(const char *target) const {
return BladeRunner::SaveFileManager::list(target);
return BladeRunner::SaveFileManager::list(this, target);
}
int BladeRunnerMetaEngine::getMaximumSaveSlot() const {
@ -78,7 +78,7 @@ void BladeRunnerMetaEngine::removeSaveState(const char *target, int slot) const
}
SaveStateDescriptor BladeRunnerMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
return BladeRunner::SaveFileManager::queryMetaInfos(target, slot);
return BladeRunner::SaveFileManager::queryMetaInfos(this, target, slot);
}
#if PLUGIN_ENABLED_DYNAMIC(BLADERUNNER)

8
engines/bladerunner/savefile.cpp
View file

@ -34,7 +34,7 @@
namespace BladeRunner {
SaveStateList SaveFileManager::list(const Common::String &target) {
SaveStateList SaveFileManager::list(const MetaEngine *metaEngine, const Common::String &target) {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray files = saveFileMan->listSavefiles(target + ".###");
@ -50,7 +50,7 @@ SaveStateList SaveFileManager::list(const Common::String &target) {
readHeader(*saveFile, header);
int slotNum = atoi(fileName->c_str() + fileName->size() - 3);
saveList.push_back(SaveStateDescriptor(slotNum, header._name));
saveList.push_back(SaveStateDescriptor(metaEngine, slotNum, header._name));
delete saveFile;
}
@ -60,7 +60,7 @@ SaveStateList SaveFileManager::list(const Common::String &target) {
return saveList;
}
SaveStateDescriptor SaveFileManager::queryMetaInfos(const Common::String &target, int slot) {
SaveStateDescriptor SaveFileManager::queryMetaInfos(const MetaEngine *metaEngine, const Common::String &target, int slot) {
Common::String filename = Common::String::format("%s.%03d", target.c_str(), slot);
Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(filename);
@ -75,7 +75,7 @@ SaveStateDescriptor SaveFileManager::queryMetaInfos(const Common::String &target
}
delete saveFile;
SaveStateDescriptor desc(slot, header._name);
SaveStateDescriptor desc(metaEngine, slot, header._name);
desc.setThumbnail(header._thumbnail);
desc.setSaveDate(header._year, header._month, header._day);
desc.setSaveTime(header._hour, header._minute);

4
engines/bladerunner/savefile.h
View file

@ -73,8 +73,8 @@ public:
static const uint32 kNameLength = 41;
static const uint32 kThumbnailSize = 9600; // 80x60x16bpp
static SaveStateList list(const Common::String &target);
static SaveStateDescriptor queryMetaInfos(const Common::String &target, int slot);
static SaveStateList list(const MetaEngine *metaEngine, const Common::String &target);
static SaveStateDescriptor queryMetaInfos(const MetaEngine *metaEngine, const Common::String &target, int slot);
static Common::InSaveFile *openForLoading(const Common::String &target, int slot);
static Common::OutSaveFile *openForSaving(const Common::String &target, int slot);

6
engines/bladerunner/ui/kia_section_load.cpp
View file

@ -65,7 +65,7 @@ void KIASectionLoad::open() {
_scrollBox->show();
_scrollBox->clearLines();
_saveList = SaveFileManager::list(_vm->getTargetName());
_saveList = SaveFileManager::list(_vm->getMetaEngine(), _vm->getTargetName());
if (!_saveList.empty()) {
_scrollBox->addLine(_vm->_textOptions->getText(36), -1, 4); // Load game:
@ -106,7 +106,7 @@ void KIASectionLoad::draw(Graphics::Surface &surface) {
if (_hoveredLineId != selectedLineId) {
if (selectedLineId >= 0 && selectedLineId < (int)_saveList.size() && _displayingLineId != selectedLineId) {
if (_timeLeft == 0u) {
SaveStateDescriptor desc = SaveFileManager::queryMetaInfos(_vm->getTargetName(), selectedLineId);
SaveStateDescriptor desc = SaveFileManager::queryMetaInfos(_vm->getMetaEngine(), _vm->getTargetName(), selectedLineId);
const Graphics::Surface *thumbnail = desc.getThumbnail();
if (thumbnail != nullptr) {
_vm->_kia->playImage(*thumbnail);
@ -126,7 +126,7 @@ void KIASectionLoad::draw(Graphics::Surface &surface) {
if (_timeLeft) {
uint32 timeDiff = now - _timeLast; // unsigned difference is intentional
if (timeDiff >= _timeLeft) {
SaveStateDescriptor desc = SaveFileManager::queryMetaInfos(_vm->getTargetName(), _saveList[selectedLineId].getSaveSlot());
SaveStateDescriptor desc = SaveFileManager::queryMetaInfos(_vm->getMetaEngine(), _vm->getTargetName(), _saveList[selectedLineId].getSaveSlot());
const Graphics::Surface *thumbnail = desc.getThumbnail();
if (thumbnail != nullptr) {
_vm->_kia->playImage(*thumbnail);

6
engines/bladerunner/ui/kia_section_save.cpp
View file

@ -94,7 +94,7 @@ void KIASectionSave::open() {
_scrollBox->show();
_saveList = SaveFileManager::list(_vm->getTargetName());
_saveList = SaveFileManager::list(_vm->getMetaEngine(), _vm->getTargetName());
bool ableToSaveGame = true;
@ -186,7 +186,7 @@ void KIASectionSave::draw(Graphics::Surface &surface) {
if (selectedLineId != _hoveredLineId) {
if (selectedLineId >= 0 && selectedLineId < (int)_saveList.size() && _displayingLineId != selectedLineId) {
if (_timeLeft == 0u) {
SaveStateDescriptor desc = SaveFileManager::queryMetaInfos(_vm->getTargetName(), selectedLineId);
SaveStateDescriptor desc = SaveFileManager::queryMetaInfos(_vm->getMetaEngine(), _vm->getTargetName(), selectedLineId);
const Graphics::Surface *thumbnail = desc.getThumbnail();
if (thumbnail != nullptr) {
_vm->_kia->playImage(*thumbnail);
@ -206,7 +206,7 @@ void KIASectionSave::draw(Graphics::Surface &surface) {
if (_timeLeft) {
uint32 timeDiff = now - _timeLast; // unsigned difference is intentional
if (timeDiff >= _timeLeft) {
SaveStateDescriptor desc = SaveFileManager::queryMetaInfos(_vm->getTargetName(), _saveList[selectedLineId].getSaveSlot());
SaveStateDescriptor desc = SaveFileManager::queryMetaInfos(_vm->getMetaEngine(), _vm->getTargetName(), _saveList[selectedLineId].getSaveSlot());
const Graphics::Surface *thumbnail = desc.getThumbnail();
if (thumbnail != nullptr) {
_vm->_kia->playImage(*thumbnail);

2
engines/buried/metaengine.cpp
View file

@ -106,7 +106,7 @@ SaveStateList BuriedMetaEngine::listSaves(const char *target) const {
for (int j = 0; j < 4; j++)
desc.deleteLastChar();
saveList.push_back(SaveStateDescriptor(i, desc));
saveList.push_back(SaveStateDescriptor(this, i, desc));
}
return saveList;

8
engines/cge/metaengine.cpp
View file

@ -94,11 +94,11 @@ SaveStateList CGEMetaEngine::listSaves(const char *target) const {
if (!strncmp(buffer, CGE::savegameStr, kSavegameStrSize + 1)) {
// Valid savegame
if (CGE::CGEEngine::readSavegameHeader(file, header)) {
saveList.push_back(SaveStateDescriptor(slotNum, header.saveName));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.saveName));
}
} else {
// Must be an original format savegame
saveList.push_back(SaveStateDescriptor(slotNum, "Unknown"));
saveList.push_back(SaveStateDescriptor(this, slotNum, "Unknown"));
}
delete file;
@ -128,11 +128,11 @@ SaveStateDescriptor CGEMetaEngine::querySaveMetaInfos(const char *target, int sl
if (!hasHeader) {
// Original savegame perhaps?
SaveStateDescriptor desc(slot, "Unknown");
SaveStateDescriptor desc(this, slot, "Unknown");
return desc;
} else {
// Create the return descriptor
SaveStateDescriptor desc(slot, header.saveName);
SaveStateDescriptor desc(this, slot, header.saveName);
desc.setThumbnail(header.thumbnail);
desc.setSaveDate(header.saveYear, header.saveMonth, header.saveDay);
desc.setSaveTime(header.saveHour, header.saveMinutes);

8
engines/cge2/metaengine.cpp
View file

@ -94,11 +94,11 @@ SaveStateList CGE2MetaEngine::listSaves(const char *target) const {
if (!strncmp(buffer, kSavegameStr, kSavegameStrSize + 1)) {
// Valid savegame
if (CGE2::CGE2Engine::readSavegameHeader(file, header)) {
saveList.push_back(SaveStateDescriptor(slotNum, header.saveName));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.saveName));
}
} else {
// Must be an original format savegame
saveList.push_back(SaveStateDescriptor(slotNum, "Unknown"));
saveList.push_back(SaveStateDescriptor(this, slotNum, "Unknown"));
}
delete file;
@ -128,11 +128,11 @@ SaveStateDescriptor CGE2MetaEngine::querySaveMetaInfos(const char *target, int s
if (!hasHeader) {
// Original savegame perhaps?
SaveStateDescriptor desc(slot, "Unknown");
SaveStateDescriptor desc(this, slot, "Unknown");
return desc;
} else {
// Create the return descriptor
SaveStateDescriptor desc(slot, header.saveName);
SaveStateDescriptor desc(this, slot, header.saveName);
desc.setThumbnail(header.thumbnail);
desc.setSaveDate(header.saveYear, header.saveMonth, header.saveDay);
desc.setSaveTime(header.saveHour, header.saveMinutes);

8
engines/cine/metaengine.cpp
View file

@ -127,7 +127,7 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
strncpy(saveDesc, saveNames[slotNum], SAVEGAME_NAME_LEN);
saveDesc[sizeof(CommandeType) - 1] = 0;
SaveStateDescriptor saveStateDesc(slotNum, saveDesc);
SaveStateDescriptor saveStateDesc(this, slotNum, saveDesc);
if (saveStateDesc.getDescription().empty()) {
if (saveStateDesc.isAutosave()) {
@ -150,7 +150,7 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
// No saving on empty autosave slot
if (!foundAutosave) {
SaveStateDescriptor desc(getAutosaveSlot(), _("Empty autosave"));
SaveStateDescriptor desc(this, getAutosaveSlot(), _("Empty autosave"));
saveList.push_back(desc);
}
@ -179,7 +179,7 @@ SaveStateDescriptor CineMetaEngine::querySaveMetaInfos(const char *target, int s
if (f) {
// Create the return descriptor
SaveStateDescriptor desc(slot, Common::U32String());
SaveStateDescriptor desc(this, slot, Common::U32String());
ExtendedSavegameHeader header;
if (readSavegameHeader(f.get(), &header, false)) {
@ -213,7 +213,7 @@ SaveStateDescriptor CineMetaEngine::querySaveMetaInfos(const char *target, int s
// No saving on empty autosave slot
if (slot == getAutosaveSlot()) {
return SaveStateDescriptor(slot, _("Empty autosave"));
return SaveStateDescriptor(this, slot, _("Empty autosave"));
}
return SaveStateDescriptor();

2
engines/composer/metaengine.cpp
View file

@ -116,7 +116,7 @@ SaveStateList ComposerMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(*file);
if (in) {
saveDesc = getSaveName(in);
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveDesc));
delete in;
}
}

4
engines/cruise/metaengine.cpp
View file

@ -85,7 +85,7 @@ SaveStateList CruiseMetaEngine::listSaves(const char *target) const {
if (in) {
Cruise::CruiseSavegameHeader header;
if (Cruise::readSavegameHeader(in, header))
saveList.push_back(SaveStateDescriptor(slotNum, header.saveName));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.saveName));
delete in;
}
}
@ -114,7 +114,7 @@ SaveStateDescriptor CruiseMetaEngine::querySaveMetaInfos(const char *target, int
delete f;
// Create the return descriptor
SaveStateDescriptor desc(slot, header.saveName);
SaveStateDescriptor desc(this, slot, header.saveName);
desc.setThumbnail(header.thumbnail);
return desc;

2
engines/cryomni3d/metaengine.cpp
View file

@ -113,7 +113,7 @@ SaveStateList CryOmni3DMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveMan->openForLoading(*file);
if (in) {
if (in->read(saveName, kSaveDescriptionLen) == kSaveDescriptionLen) {
saveList.push_back(SaveStateDescriptor(slotNum - 1, saveName));
saveList.push_back(SaveStateDescriptor(this, slotNum - 1, saveName));
}
delete in;
}

4
engines/dm/metaengine.cpp
View file

@ -77,7 +77,7 @@ public:
Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
if (in) {
if (DM::readSaveGameHeader(in, &header))
saveList.push_back(SaveStateDescriptor(slotNum, header._descr.getDescription()));
saveList.push_back(SaveStateDescriptor(this, slotNum, header._descr.getDescription()));
delete in;
}
}
@ -99,7 +99,7 @@ public:
delete in;
if (successfulRead) {
SaveStateDescriptor desc(slot, header._descr.getDescription());
SaveStateDescriptor desc(this, slot, header._descr.getDescription());
return header._descr;
}

4
engines/draci/metaengine.cpp
View file

@ -70,7 +70,7 @@ SaveStateList DraciMetaEngine::listSaves(const char *target) const {
if (in) {
Draci::DraciSavegameHeader header;
if (Draci::readSavegameHeader(in, header)) {
saveList.push_back(SaveStateDescriptor(slotNum, header.saveName));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.saveName));
}
delete in;
}
@ -100,7 +100,7 @@ SaveStateDescriptor DraciMetaEngine::querySaveMetaInfos(const char *target, int
delete f;
// Create the return descriptor
SaveStateDescriptor desc(slot, header.saveName);
SaveStateDescriptor desc(this, slot, header.saveName);
desc.setThumbnail(header.thumbnail);
int day = (header.date >> 24) & 0xFF;

4
engines/dragons/metaengine.cpp
View file

@ -80,7 +80,7 @@ SaveStateList DragonsMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
if (in) {
if (Dragons::DragonsEngine::readSaveHeader(in, header) == Dragons::kRSHENoError) {
saveList.push_back(SaveStateDescriptor(slotNum, header.description));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.description));
}
delete in;
}
@ -99,7 +99,7 @@ SaveStateDescriptor DragonsMetaEngine::querySaveMetaInfos(const char *target, in
error = Dragons::DragonsEngine::readSaveHeader(in, header, false);
delete in;
if (error == Dragons::kRSHENoError) {
SaveStateDescriptor desc(slot, header.description);
SaveStateDescriptor desc(this, slot, header.description);
desc.setThumbnail(header.thumbnail);
desc.setSaveDate(header.saveDate & 0xFFFF, (header.saveDate >> 16) & 0xFF, (header.saveDate >> 24) & 0xFF);
desc.setSaveTime((header.saveTime >> 16) & 0xFF, (header.saveTime >> 8) & 0xFF);

2
engines/drascula/metaengine.cpp
View file

@ -124,7 +124,7 @@ SaveStateDescriptor DrasculaMetaEngine::querySaveMetaInfos(const char *target, i
Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(fileName);
SaveStateDescriptor desc(slot, Common::U32String());
SaveStateDescriptor desc(this, slot, Common::U32String());
if (in) {
desc = Drascula::loadMetaData(in, slot, false);
if (desc.getSaveSlot() != slot) {

4
engines/dreamweb/metaengine.cpp
View file

@ -92,7 +92,7 @@ SaveStateList DreamWebMetaEngine::listSaves(const char *target) const {
delete stream;
int slotNum = atoi(file.c_str() + file.size() - 2);
SaveStateDescriptor sd(slotNum, name);
SaveStateDescriptor sd(this, slotNum, name);
saveList.push_back(sd);
}
@ -123,7 +123,7 @@ SaveStateDescriptor DreamWebMetaEngine::querySaveMetaInfos(const char *target, i
for (i = 0; i < descSize; i++)
saveName += (char)in->readByte();
SaveStateDescriptor desc(slot, saveName);
SaveStateDescriptor desc(this, slot, saveName);
// Check if there is a ScummVM data block
if (header.len(6) == SCUMMVM_BLOCK_MAGIC_SIZE) {

2
engines/dreamweb/saveload.cpp
View file

@ -728,7 +728,7 @@ uint DreamWebEngine::scanForNames() {
delete stream;
int slotNum = atoi(file.c_str() + file.size() - 2);
SaveStateDescriptor sd(slotNum, name);
SaveStateDescriptor sd(getMetaEngine(), slotNum, name);
saveList.push_back(sd);
if (slotNum < 21)
Common::strlcpy(&_saveNames[17 * slotNum + 1], name, 16); // the first character is unused

2
engines/glk/metaengine.cpp
View file

@ -249,7 +249,7 @@ SaveStateList GlkMetaEngine::listSaves(const char *target) const {
if (in) {
Common::String saveName;
if (Glk::QuetzalReader::getSavegameDescription(in, saveName))
saveList.push_back(SaveStateDescriptor(slot, saveName));
saveList.push_back(SaveStateDescriptor(this, slot, saveName));
delete in;
}

4
engines/gnap/metaengine.cpp
View file

@ -88,7 +88,7 @@ SaveStateList GnapMetaEngine::listSaves(const char *target) const {
if (in) {
if (Gnap::GnapEngine::readSavegameHeader(in, header))
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
saveList.push_back(SaveStateDescriptor(this, slot, header._saveName));
delete in;
}
}
@ -117,7 +117,7 @@ SaveStateDescriptor GnapMetaEngine::querySaveMetaInfos(const char *target, int s
while ((ch = (char)file->readByte()) != '\0')
saveName += ch;
SaveStateDescriptor desc(slot, saveName);
SaveStateDescriptor desc(this, slot, saveName);
if (version != 1) {
Graphics::Surface *thumbnail;

2
engines/grim/metaengine.cpp
View file

@ -121,7 +121,7 @@ SaveStateList GrimMetaEngine::listSaves(const char *target) const {
strSize = savedState->readLESint32();
savedState->read(str, strSize);
savedState->endSection();
saveList.push_back(SaveStateDescriptor(slotNum, str));
saveList.push_back(SaveStateDescriptor(this, slotNum, str));
}
delete savedState;
}

4
engines/hopkins/metaengine.cpp
View file

@ -115,7 +115,7 @@ SaveStateList HopkinsMetaEngine::listSaves(const char *target) const {
if (in) {
if (Hopkins::SaveLoadManager::readSavegameHeader(in, header)) {
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
saveList.push_back(SaveStateDescriptor(this, slot, header._saveName));
}
delete in;
@ -151,7 +151,7 @@ SaveStateDescriptor HopkinsMetaEngine::querySaveMetaInfos(const char *target, in
delete f;
// Create the return descriptor
SaveStateDescriptor desc(slot, header._saveName);
SaveStateDescriptor desc(this, slot, header._saveName);
desc.setThumbnail(header._thumbnail);
desc.setSaveDate(header._year, header._month, header._day);
desc.setSaveTime(header._hour, header._minute);

4
engines/hugo/metaengine.cpp
View file

@ -111,7 +111,7 @@ SaveStateList HugoMetaEngine::listSaves(const char *target) const {
file->read(name, nameSize);
name[nameSize] = 0;
saveList.push_back(SaveStateDescriptor(slotNum, name));
saveList.push_back(SaveStateDescriptor(this, slotNum, name));
delete file;
}
}
@ -140,7 +140,7 @@ SaveStateDescriptor HugoMetaEngine::querySaveMetaInfos(const char *target, int s
file->read(saveName, saveNameLength);
saveName[saveNameLength] = 0;
SaveStateDescriptor desc(slot, saveName);
SaveStateDescriptor desc(this, slot, saveName);
Graphics::Surface *thumbnail;
if (!Graphics::loadThumbnail(*file, thumbnail)) {

4
engines/illusions/metaengine.cpp
View file

@ -94,7 +94,7 @@ SaveStateList IllusionsMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
if (in) {
if (Illusions::IllusionsEngine::readSaveHeader(in, header) == Illusions::IllusionsEngine::kRSHENoError) {
saveList.push_back(SaveStateDescriptor(slotNum, header.description));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.description));
}
delete in;
}
@ -113,7 +113,7 @@ SaveStateDescriptor IllusionsMetaEngine::querySaveMetaInfos(const char *target,
error = Illusions::IllusionsEngine::readSaveHeader(in, header, false);
delete in;
if (error == Illusions::IllusionsEngine::kRSHENoError) {
SaveStateDescriptor desc(slot, header.description);
SaveStateDescriptor desc(this, slot, header.description);
desc.setThumbnail(header.thumbnail);
desc.setSaveDate(header.saveDate & 0xFFFF, (header.saveDate >> 16) & 0xFF, (header.saveDate >> 24) & 0xFF);
desc.setSaveTime((header.saveTime >> 16) & 0xFF, (header.saveTime >> 8) & 0xFF);

4
engines/kingdom/metaengine.cpp
View file

@ -92,7 +92,7 @@ SaveStateList KingdomMetaEngine::listSaves(const char *target) const {
if (in) {
if (Kingdom::KingdomGame::readSavegameHeader(in, header)) {
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
saveList.push_back(SaveStateDescriptor(this, slot, header._saveName));
header._thumbnail->free();
delete header._thumbnail;
@ -123,7 +123,7 @@ SaveStateDescriptor KingdomMetaEngine::querySaveMetaInfos(const char *target, in
delete f;
// Create the return descriptor
SaveStateDescriptor desc(slot, header._saveName);
SaveStateDescriptor desc(this, slot, header._saveName);
desc.setThumbnail(header._thumbnail);
desc.setSaveDate(header._year, header._month, header._day);
desc.setSaveTime(header._hour, header._minute);

6
engines/kyra/metaengine.cpp
View file

@ -162,7 +162,7 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
if (slotNum == 0 && header.gameID == Kyra::GI_KYRA3)
header.description = "New Game";
saveList.push_back(SaveStateDescriptor(slotNum, header.description));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.description));
}
delete in;
}
@ -202,7 +202,7 @@ SaveStateDescriptor KyraMetaEngine::querySaveMetaInfos(const char *target, int s
delete in;
if (error == Kyra::KyraEngine_v1::kRSHENoError) {
SaveStateDescriptor desc(slot, header.description);
SaveStateDescriptor desc(this, slot, header.description);
// Slot 0 is used for the 'restart game' save in all three Kyrandia games, thus
// we prevent it from being deleted.
@ -220,7 +220,7 @@ SaveStateDescriptor KyraMetaEngine::querySaveMetaInfos(const char *target, int s
}
}
SaveStateDescriptor desc(slot, Common::String());
SaveStateDescriptor desc(this, slot, Common::String());
// We don't allow quick saves (slot 990 till 998) to be overwritten.
// The same goes for the 'Autosave', which is slot 999. Slot 0 will also

4
engines/lab/metaengine.cpp
View file

@ -99,7 +99,7 @@ SaveStateList LabMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
if (in) {
if (Lab::readSaveGameHeader(in, header))
saveList.push_back(SaveStateDescriptor(slotNum, header._descr.getDescription()));
saveList.push_back(SaveStateDescriptor(this, slotNum, header._descr.getDescription()));
delete in;
}
}
@ -130,7 +130,7 @@ SaveStateDescriptor LabMetaEngine::querySaveMetaInfos(const char *target, int sl
delete in;
if (successfulRead) {
SaveStateDescriptor desc(slot, header._descr.getDescription());
SaveStateDescriptor desc(this, slot, header._descr.getDescription());
return header._descr;
}
}

4
engines/lilliput/metaengine.cpp
View file

@ -117,7 +117,7 @@ SaveStateList LilliputMetaEngine::listSaves(const char *target) const {
file->read(name, nameSize);
name[nameSize] = 0;
saveList.push_back(SaveStateDescriptor(slotNum, name));
saveList.push_back(SaveStateDescriptor(this, slotNum, name));
delete file;
}
}
@ -147,7 +147,7 @@ SaveStateDescriptor LilliputMetaEngine::querySaveMetaInfos(const char *target, i
saveName += curChr;
}
SaveStateDescriptor desc(slot, saveName);
SaveStateDescriptor desc(this, slot, saveName);
Graphics::Surface *thumbnail;
if (!Graphics::loadThumbnail(*file, thumbnail)) {

2
engines/lure/metaengine.cpp
View file

@ -101,7 +101,7 @@ SaveStateList LureMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(*file);
if (in) {
saveDesc = Lure::getSaveName(in);
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveDesc));
delete in;
}
}

2
engines/macventure/metaengine.cpp
View file

@ -85,7 +85,7 @@ SaveStateList MacVentureMetaEngine::listSaves(const char *target) const {
SaveStateList saveList;
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
int slotNum = atoi(file->c_str() + file->size() - 3);
SaveStateDescriptor desc(slotNum, Common::U32String());
SaveStateDescriptor desc(this, slotNum, Common::U32String());
if (slotNum >= 0 && slotNum <= getMaximumSaveSlot()) {
Common::InSaveFile *in = saveFileMan->openForLoading(*file);
if (in) {

4
engines/mads/metaengine.cpp
View file

@ -118,7 +118,7 @@ SaveStateList MADSMetaEngine::listSaves(const char *target) const {
if (in) {
if (MADS::Game::readSavegameHeader(in, header))
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
saveList.push_back(SaveStateDescriptor(this, slot, header._saveName));
delete in;
}
}
@ -151,7 +151,7 @@ SaveStateDescriptor MADSMetaEngine::querySaveMetaInfos(const char *target, int s
delete f;
// Create the return descriptor
SaveStateDescriptor desc(slot, header._saveName);
SaveStateDescriptor desc(this, slot, header._saveName);
desc.setThumbnail(header._thumbnail);
desc.setSaveDate(header._year, header._month, header._day);
desc.setSaveTime(header._hour, header._minute);

4
engines/metaengine.cpp
View file

@ -361,7 +361,7 @@ SaveStateList MetaEngine::listSaves(const char *target, bool saveMode) const {
// No autosave yet. We want to add a dummy one in so that it can be marked as
// write protected, and thus be prevented from being saved in
SaveStateDescriptor desc(autosaveSlot, _("Autosave"));
SaveStateDescriptor desc(this, autosaveSlot, _("Autosave"));
saveList.push_back(desc);
Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
@ -409,7 +409,7 @@ SaveStateDescriptor MetaEngine::querySaveMetaInfos(const char *target, int slot)
}
// Create the return descriptor
SaveStateDescriptor desc(slot, Common::U32String());
SaveStateDescriptor desc(this, slot, Common::U32String());
parseSavegameHeader(&header, &desc);
desc.setThumbnail(header.thumbnail);
return desc;

4
engines/mohawk/metaengine.cpp
View file

@ -171,7 +171,7 @@ SaveStateList MohawkMetaEngine::listSavesForPrefix(const char *prefix, const cha
int slotNum = atoi(slot);
saveList.push_back(SaveStateDescriptor(slotNum, ""));
saveList.push_back(SaveStateDescriptor(this, slotNum, ""));
}
Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
@ -233,7 +233,7 @@ SaveStateDescriptor MohawkMetaEngine::querySaveMetaInfos(const char *target, int
#ifdef ENABLE_MYST
if (gameId == "myst") {
return Mohawk::MystGameState::querySaveMetaInfos(slot);
return Mohawk::MystGameState::querySaveMetaInfos(this, slot);
}
#endif
#ifdef ENABLE_RIVEN

4
engines/mohawk/myst_state.cpp
View file

@ -268,8 +268,8 @@ bool MystGameState::saveMetadata(int slot, const Graphics::Surface *thumbnail) {
return true;
}
SaveStateDescriptor MystGameState::querySaveMetaInfos(int slot) {
SaveStateDescriptor desc(slot, Common::U32String());
SaveStateDescriptor MystGameState::querySaveMetaInfos(const MetaEngine *metaEngine, int slot) {
SaveStateDescriptor desc(metaEngine, slot, Common::U32String());
// Open the save file
Common::String filename = buildSaveFilename(slot);

2
engines/mohawk/myst_state.h
View file

@ -105,7 +105,7 @@ public:
MystGameState(MohawkEngine_Myst*, Common::SaveFileManager*);
~MystGameState();
static SaveStateDescriptor querySaveMetaInfos(int slot);
static SaveStateDescriptor querySaveMetaInfos(const MetaEngine *metaEngine, int slot);
static Common::String querySaveDescription(int slot);
void reset();

4
engines/mortevielle/metaengine.cpp
View file

@ -76,12 +76,12 @@ bool MortevielleMetaEngine::hasFeature(MetaEngineFeature f) const {
int MortevielleMetaEngine::getMaximumSaveSlot() const { return 99; }
SaveStateList MortevielleMetaEngine::listSaves(const char *target) const {
return Mortevielle::SavegameManager::listSaves(target);
return Mortevielle::SavegameManager::listSaves(this, target);
}
SaveStateDescriptor MortevielleMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
Common::String filename = Mortevielle::MortevielleEngine::generateSaveFilename(target, slot);
return Mortevielle::SavegameManager::querySaveMetaInfos(filename);
return Mortevielle::SavegameManager::querySaveMetaInfos(this, filename);
}
#if PLUGIN_ENABLED_DYNAMIC(MORTEVIELLE)

10
engines/mortevielle/saveload.cpp
View file

@ -235,7 +235,7 @@ WARN_UNUSED_RESULT bool SavegameManager::readSavegameHeader(Common::InSaveFile *
return true;
}
SaveStateList SavegameManager::listSaves(const Common::String &target) {
SaveStateList SavegameManager::listSaves(const MetaEngine *metaEngine, const Common::String &target) {
Common::String pattern = target;
pattern += ".###";
@ -274,7 +274,7 @@ SaveStateList SavegameManager::listSaves(const Common::String &target) {
if (validFlag)
// Got a valid savegame
saveList.push_back(SaveStateDescriptor(slotNumber, saveDescription));
saveList.push_back(SaveStateDescriptor(metaEngine, slotNumber, saveDescription));
delete in;
}
@ -284,7 +284,7 @@ SaveStateList SavegameManager::listSaves(const Common::String &target) {
return saveList;
}
SaveStateDescriptor SavegameManager::querySaveMetaInfos(const Common::String &fileName) {
SaveStateDescriptor SavegameManager::querySaveMetaInfos(const MetaEngine *metaEngine, const Common::String &fileName) {
Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(fileName);
if (f) {
@ -303,7 +303,7 @@ SaveStateDescriptor SavegameManager::querySaveMetaInfos(const Common::String &fi
// Original savegame perhaps?
delete f;
return SaveStateDescriptor(slot, Common::String::format("Savegame - %03d", slot));
return SaveStateDescriptor(metaEngine, slot, Common::String::format("Savegame - %03d", slot));
} else {
// Get the savegame header information
SavegameHeader header;
@ -314,7 +314,7 @@ SaveStateDescriptor SavegameManager::querySaveMetaInfos(const Common::String &fi
delete f;
// Create the return descriptor
SaveStateDescriptor desc(slot, header.saveName);
SaveStateDescriptor desc(metaEngine, slot, header.saveName);
desc.setDeletableFlag(true);
desc.setWriteProtectedFlag(false);
desc.setThumbnail(header.thumbnail);

4
engines/mortevielle/saveload.h
View file

@ -67,8 +67,8 @@ public:
void writeSavegameHeader(Common::OutSaveFile *out, const Common::String &saveName);
WARN_UNUSED_RESULT static bool readSavegameHeader(Common::InSaveFile *in, SavegameHeader &header, bool skipThumbnail = true);
static SaveStateList listSaves(const Common::String &target);
static SaveStateDescriptor querySaveMetaInfos(const Common::String &fileName);
static SaveStateList listSaves(const MetaEngine *metaEngine, const Common::String &target);
static SaveStateDescriptor querySaveMetaInfos(const MetaEngine *metaEngine, const Common::String &fileName);
};
} // End of namespace Mortevielle

2
engines/mutationofjb/metaengine.cpp
View file

@ -72,7 +72,7 @@ public:
MutationOfJB::SaveHeader saveHdr;
if (saveHdr.sync(sz)) {
saveList.push_back(SaveStateDescriptor(slotNo, saveHdr._description));
saveList.push_back(SaveStateDescriptor(this, slotNo, saveHdr._description));
}
}
}

2
engines/myst3/metaengine.cpp
View file

@ -56,7 +56,7 @@ public:
SaveStateList saveList;
for (uint32 i = 0; i < filenames.size(); i++)
saveList.push_back(SaveStateDescriptor(i, filenames[i]));
saveList.push_back(SaveStateDescriptor(this, i, filenames[i]));
return saveList;
}

4
engines/neverhood/metaengine.cpp
View file

@ -112,7 +112,7 @@ SaveStateList NeverhoodMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
if (in) {
if (Neverhood::NeverhoodEngine::readSaveHeader(in, header) == Neverhood::NeverhoodEngine::kRSHENoError) {
saveList.push_back(SaveStateDescriptor(slotNum, header.description));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.description));
}
delete in;
}
@ -146,7 +146,7 @@ SaveStateDescriptor NeverhoodMetaEngine::querySaveMetaInfos(const char *target,
delete in;
if (error == Neverhood::NeverhoodEngine::kRSHENoError) {
SaveStateDescriptor desc(slot, header.description);
SaveStateDescriptor desc(this, slot, header.description);
desc.setThumbnail(header.thumbnail);
int day = (header.saveDate >> 24) & 0xFF;

7
engines/ngi/metaengine.cpp
View file

@ -110,12 +110,10 @@ SaveStateList NGIMetaEngine::listSaves(const char *target) const {
continue;
}
SaveStateDescriptor desc;
SaveStateDescriptor desc(this, slotNum, header.description);
NGI::parseSavegameHeader(header, desc);
desc.setSaveSlot(slotNum);
saveList.push_back(desc);
}
}
@ -141,11 +139,10 @@ SaveStateDescriptor NGIMetaEngine::querySaveMetaInfos(const char *target, int sl
}
// Create the return descriptor
SaveStateDescriptor desc;
SaveStateDescriptor desc(this, slot, header.description);
NGI::parseSavegameHeader(header, desc);
desc.setSaveSlot(slot);
desc.setThumbnail(header.thumbnail);
return desc;

2
engines/ngi/modal.cpp
View file

@ -2153,7 +2153,7 @@ bool ModalSaveGame::getFileInfo(int slot, FileInfo *fileinfo) {
return false;
// Create the return descriptor
SaveStateDescriptor desc(slot, header.saveName);
SaveStateDescriptor desc(g_nmi->getMetaEngine(), slot, header.description);
char res[17];
NGI::parseSavegameHeader(header, desc);

2
engines/parallaction/metaengine.cpp
View file

@ -164,7 +164,7 @@ SaveStateList ParallactionMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(*file);
if (in) {
Common::String saveDesc = in->readLine();
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveDesc));
delete in;
}
}

2
engines/pegasus/metaengine.cpp
View file

@ -100,7 +100,7 @@ SaveStateList PegasusMetaEngine::listSaves(const char *target) const {
for (int j = 0; j < 4; j++)
desc.deleteLastChar();
saveList.push_back(SaveStateDescriptor(i, desc));
saveList.push_back(SaveStateDescriptor(this, i, desc));
}
return saveList;

8
engines/prince/metaengine.cpp
View file

@ -104,11 +104,11 @@ SaveStateList PrinceMetaEngine::listSaves(const char *target) const {
if (!strncmp(buffer, kSavegameStr, kSavegameStrSize + 1)) {
// Valid savegame
if (Prince::PrinceEngine::readSavegameHeader(file, header)) {
saveList.push_back(SaveStateDescriptor(slotNum, header.saveName));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.saveName));
}
} else {
// Must be an original format savegame
saveList.push_back(SaveStateDescriptor(slotNum, "Unknown"));
saveList.push_back(SaveStateDescriptor(this, slotNum, "Unknown"));
}
delete file;
@ -137,11 +137,11 @@ SaveStateDescriptor PrinceMetaEngine::querySaveMetaInfos(const char *target, int
if (!hasHeader) {
// Original savegame perhaps?
SaveStateDescriptor desc(slot, "Unknown");
SaveStateDescriptor desc(this, slot, "Unknown");
return desc;
} else {
// Create the return descriptor
SaveStateDescriptor desc(slot, header.saveName);
SaveStateDescriptor desc(this, slot, header.saveName);
desc.setThumbnail(header.thumbnail);
desc.setSaveDate(header.saveYear, header.saveMonth, header.saveDay);
desc.setSaveTime(header.saveHour, header.saveMinutes);

2
engines/queen/metaengine.cpp
View file

@ -69,7 +69,7 @@ SaveStateList QueenMetaEngine::listSaves(const char *target) const {
for (int i = 0; i < 4; i++)
in->readUint32BE();
in->read(saveDesc, 32);
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveDesc));
delete in;
}
}

4
engines/saga/metaengine.cpp
View file

@ -143,7 +143,7 @@ SaveStateList SagaMetaEngine::listSaves(const char *target) const {
for (int i = 0; i < 3; i++)
in->readUint32BE();
in->read(saveDesc, SAVE_TITLE_SIZE);
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveDesc));
delete in;
}
}
@ -177,7 +177,7 @@ SaveStateDescriptor SagaMetaEngine::querySaveMetaInfos(const char *target, int s
char name[SAVE_TITLE_SIZE];
in->read(name, sizeof(name));
SaveStateDescriptor desc(slot, name);
SaveStateDescriptor desc(this, slot, name);
// Some older saves were not written in an endian safe fashion.
// We try to detect this here by checking for extremely high version values.

15
engines/savestate.cpp
View file

@ -22,6 +22,7 @@
#include "engines/savestate.h"
#include "engines/engine.h"
#include "engines/metaengine.h"
#include "graphics/surface.h"
#include "common/config-manager.h"
#include "common/textconsole.h"
@ -34,20 +35,22 @@ SaveStateDescriptor::SaveStateDescriptor()
_thumbnail(), _saveType(kSaveTypeUndetermined) {
}
SaveStateDescriptor::SaveStateDescriptor(int slot, const Common::U32String &d)
SaveStateDescriptor::SaveStateDescriptor(const MetaEngine *metaEngine, int slot, const Common::U32String &d)
: _slot(slot), _description(d), _isLocked(false), _playTimeMSecs(0) {
initSaveType();
initSaveType(metaEngine);
}
SaveStateDescriptor::SaveStateDescriptor(int slot, const Common::String &d)
SaveStateDescriptor::SaveStateDescriptor(const MetaEngine *metaEngine, int slot, const Common::String &d)
: _slot(slot), _description(Common::U32String(d)), _isLocked(false), _playTimeMSecs(0) {
initSaveType();
initSaveType(metaEngine);
}
void SaveStateDescriptor::initSaveType() {
void SaveStateDescriptor::initSaveType(const MetaEngine *metaEngine) {
// Do not allow auto-save slot to be deleted or overwritten.
if (!metaEngine && g_engine)
metaEngine = g_engine->getMetaEngine();
const bool autosave =
g_engine && ConfMan.getInt("autosave_period") && _slot == g_engine->getAutosaveSlot();
metaEngine && ConfMan.getInt("autosave_period") && _slot == metaEngine->getAutosaveSlot();
_isWriteProtected = autosave;
_saveType = autosave ? kSaveTypeAutosave : kSaveTypeRegular;
_isDeletable = !autosave;

8
engines/savestate.h
View file

@ -28,6 +28,8 @@
#include "common/ustr.h"
#include "common/ptr.h"
class MetaEngine;
namespace Graphics {
struct Surface;
}
@ -60,11 +62,11 @@ private:
kSaveTypeAutosave
};
void initSaveType();
void initSaveType(const MetaEngine *metaEngine);
public:
SaveStateDescriptor();
SaveStateDescriptor(int slot, const Common::U32String &d);
SaveStateDescriptor(int slot, const Common::String &d);
SaveStateDescriptor(const MetaEngine *metaEngine, int slot, const Common::U32String &d);
SaveStateDescriptor(const MetaEngine *metaEngine, int slot, const Common::String &d);
/**
* @param slot The saveslot id, as it would be passed to the "-x" command line switch.

6
engines/sci/metaengine.cpp
View file

@ -355,7 +355,7 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const {
delete in;
continue;
}
SaveStateDescriptor descriptor(slotNr, meta.name);
SaveStateDescriptor descriptor(this, slotNr, meta.name);
if (descriptor.isAutosave()) {
hasAutosave = true;
@ -368,7 +368,7 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const {
}
if (!hasAutosave) {
SaveStateDescriptor descriptor(0, _("(Autosave)"));
SaveStateDescriptor descriptor(this, 0, _("(Autosave)"));
descriptor.setLocked(true);
saveList.push_back(descriptor);
}
@ -381,7 +381,7 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const {
SaveStateDescriptor SciMetaEngine::querySaveMetaInfos(const char *target, int slotNr) const {
const Common::String fileName = Common::String::format("%s.%03d", target, slotNr);
Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(fileName);
SaveStateDescriptor descriptor(slotNr, "");
SaveStateDescriptor descriptor(this, slotNr, "");
if (in) {
SavegameMetadata meta;

4
engines/scumm/metaengine.cpp
View file

@ -476,7 +476,7 @@ SaveStateList ScummMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(*file);
if (in) {
Scumm::getSavegameName(in, saveDesc, 0); // FIXME: heversion?!?
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveDesc));
delete in;
}
}
@ -504,7 +504,7 @@ SaveStateDescriptor ScummMetaEngine::querySaveMetaInfos(const char *target, int
return SaveStateDescriptor();
}
SaveStateDescriptor desc(slot, saveDesc);
SaveStateDescriptor desc(this, slot, saveDesc);
desc.setThumbnail(thumbnail);
if (infoPtr) {

4
engines/sherlock/metaengine.cpp
View file

@ -123,7 +123,7 @@ bool Sherlock::SherlockEngine::isDemo() const {
}
SaveStateList SherlockMetaEngine::listSaves(const char *target) const {
return Sherlock::SaveManager::getSavegameList(target);
return Sherlock::SaveManager::getSavegameList(this, target);
}
int SherlockMetaEngine::getMaximumSaveSlot() const {
@ -148,7 +148,7 @@ SaveStateDescriptor SherlockMetaEngine::querySaveMetaInfos(const char *target, i
delete f;
// Create the return descriptor
SaveStateDescriptor desc(slot, header._saveName);
SaveStateDescriptor desc(this, slot, header._saveName);
desc.setThumbnail(header._thumbnail);
desc.setSaveDate(header._year, header._month, header._day);
desc.setSaveTime(header._hour, header._minute);

6
engines/sherlock/saveload.cpp
View file

@ -65,7 +65,7 @@ void SaveManager::createSavegameList() {
for (int idx = 0; idx < MAX_SAVEGAME_SLOTS; ++idx)
_savegames.push_back(EMPTY_SAVEGAME_SLOT);
SaveStateList saveList = getSavegameList(_target);
SaveStateList saveList = getSavegameList(_vm->getMetaEngine(), _target);
for (uint idx = 0; idx < saveList.size(); ++idx) {
int slot = saveList[idx].getSaveSlot();
if (slot >= 0 && slot < MAX_SAVEGAME_SLOTS)
@ -85,7 +85,7 @@ void SaveManager::createSavegameList() {
}
}
SaveStateList SaveManager::getSavegameList(const Common::String &target) {
SaveStateList SaveManager::getSavegameList(const MetaEngine *metaEngine, const Common::String &target) {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String saveDesc;
@ -104,7 +104,7 @@ SaveStateList SaveManager::getSavegameList(const Common::String &target) {
if (in) {
if (readSavegameHeader(in, header))
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
saveList.push_back(SaveStateDescriptor(metaEngine, slot, header._saveName));
delete in;
}

2
engines/sherlock/saveload.h
View file

@ -89,7 +89,7 @@ public:
/**
* Load a list of savegames
*/
static SaveStateList getSavegameList(const Common::String &target);
static SaveStateList getSavegameList(const MetaEngine *metaEngine, const Common::String &target);
/**
* Support method that generates a savegame name

4
engines/sky/metaengine.cpp
View file

@ -176,7 +176,7 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
int slotNum = atoi(ext.c_str());
Common::InSaveFile *in = saveFileMan->openForLoading(*file);
if (in) {
saveList.push_back(SaveStateDescriptor(slotNum,
saveList.push_back(SaveStateDescriptor(this, slotNum,
(slotNum == 0) ? _("Autosave") : Common::U32String(savenames[slotNum - 1])));
delete in;
}
@ -274,7 +274,7 @@ SaveStateDescriptor SkyMetaEngine::querySaveMetaInfos(const char *target, int sl
Common::InSaveFile *in = saveFileMan->openForLoading(fName);
if (in) {
delete in;
SaveStateDescriptor descriptor(slot, tmpSavename);
SaveStateDescriptor descriptor(this, slot, tmpSavename);
return descriptor;
}
}

2
engines/stark/metaengine.cpp
View file

@ -66,7 +66,7 @@ public:
description = stream.readString();
}
saveList.push_back(SaveStateDescriptor(slot, description));
saveList.push_back(SaveStateDescriptor(this, slot, description));
}
Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());

8
engines/startrek/metaengine.cpp
View file

@ -118,7 +118,7 @@ SaveStateList StarTrekMetaEngine::listSaves(const char *target) const {
strcpy(meta.description, "[broken saved game]");
}
saveList.push_back(SaveStateDescriptor(slotNr, meta.description));
saveList.push_back(SaveStateDescriptor(this, slotNr, meta.description));
}
}
}
@ -157,11 +157,11 @@ SaveStateDescriptor StarTrekMetaEngine::querySaveMetaInfos(const char *target, i
}
if (descriptionPos >= sizeof(meta.description)) {
// broken meta.description, ignore it
SaveStateDescriptor descriptor(slotNr, "[broken saved game]");
SaveStateDescriptor descriptor(this, slotNr, "[broken saved game]");
return descriptor;
}
SaveStateDescriptor descriptor(slotNr, meta.description);
SaveStateDescriptor descriptor(this, slotNr, meta.description);
if (meta.thumbnail == nullptr) {
return SaveStateDescriptor();
@ -175,7 +175,7 @@ SaveStateDescriptor StarTrekMetaEngine::querySaveMetaInfos(const char *target, i
return descriptor;
} else {
SaveStateDescriptor emptySave(slotNr, Common::U32String());
SaveStateDescriptor emptySave(this, slotNr, Common::U32String());
return emptySave;
}
}

4
engines/supernova/metaengine.cpp
View file

@ -92,7 +92,7 @@ SaveStateList SupernovaMetaEngine::listSaves(const char *target) const {
int saveFileDescSize = savefile->readSint16LE();
char* saveFileDesc = new char[saveFileDescSize];
savefile->read(saveFileDesc, saveFileDescSize);
saveFileList.push_back(SaveStateDescriptor(saveSlot, saveFileDesc));
saveFileList.push_back(SaveStateDescriptor(this, saveSlot, saveFileDesc));
delete [] saveFileDesc;
}
}
@ -138,7 +138,7 @@ SaveStateDescriptor SupernovaMetaEngine::querySaveMetaInfos(const char *target,
int descriptionSize = savefile->readSint16LE();
char* description = new char[descriptionSize];
savefile->read(description, descriptionSize);
SaveStateDescriptor desc(slot, description);
SaveStateDescriptor desc(this, slot, description);
delete [] description;
uint32 saveDate = savefile->readUint32LE();

4
engines/sword1/metaengine.cpp
View file

@ -88,7 +88,7 @@ SaveStateList SwordMetaEngine::listSaves(const char *target) const {
if (in) {
in->readUint32LE(); // header
in->read(saveName, 40);
saveList.push_back(SaveStateDescriptor(slotNum, saveName));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveName));
delete in;
}
}
@ -118,7 +118,7 @@ SaveStateDescriptor SwordMetaEngine::querySaveMetaInfos(const char *target, int
in->read(name, sizeof(name));
in->read(&versionSave, 1); // version
SaveStateDescriptor desc(slot, name);
SaveStateDescriptor desc(this, slot, name);
if (versionSave < 2) // These older version of the savegames used a flag to signal presence of thumbnail
in->skip(1);

2
engines/sword2/metaengine.cpp
View file

@ -86,7 +86,7 @@ SaveStateList Sword2MetaEngine::listSaves(const char *target) const {
if (in) {
in->readUint32LE();
in->read(saveDesc, SAVE_DESCRIPTION_LEN);
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveDesc));
delete in;
}
}

2
engines/sword25/metaengine.cpp
View file

@ -67,7 +67,7 @@ SaveStateList Sword25MetaEngine::listSaves(const char *target) const {
for (uint i = 0; i < ps.getSlotCount(); ++i) {
if (ps.isSlotOccupied(i)) {
Common::String desc = ps.getSavegameDescription(i);
saveList.push_back(SaveStateDescriptor(i, desc));
saveList.push_back(SaveStateDescriptor(this, i, desc));
}
}

6
engines/teenagent/metaengine.cpp
View file

@ -81,7 +81,7 @@ public:
in->seek(0);
in->read(buf, 24);
buf[24] = 0;
saveList.push_back(SaveStateDescriptor(slot, buf));
saveList.push_back(SaveStateDescriptor(this, slot, buf));
}
}
// Sort saves based on slot number.
@ -113,9 +113,9 @@ public:
in->seek(TeenAgent::saveStateSize);
if (!Graphics::checkThumbnailHeader(*in))
return SaveStateDescriptor(slot, desc);
return SaveStateDescriptor(this, slot, desc);
SaveStateDescriptor ssd(slot, desc);
SaveStateDescriptor ssd(this, slot, desc);
//checking for the thumbnail
Graphics::Surface *thumbnail;

4
engines/tinsel/metaengine.cpp
View file

@ -112,7 +112,7 @@ SaveStateDescriptor TinselMetaEngine::querySaveMetaInfos(const char *target, int
file->read(saveDesc, sizeof(saveDesc));
saveDesc[SG_DESC_LEN - 1] = 0;
SaveStateDescriptor desc(slot, saveDesc);
SaveStateDescriptor desc(this, slot, saveDesc);
int8 tm_year = file->readUint16LE();
int8 tm_mon = file->readSByte();
@ -159,7 +159,7 @@ SaveStateList TinselMetaEngine::listSaves(const char *target) const {
saveDesc[SG_DESC_LEN - 1] = 0;
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveDesc));
delete in;
}
}

4
engines/titanic/core/project_item.cpp
View file

@ -464,7 +464,7 @@ CViewItem *CProjectItem::findView(int roomNumber, int nodeNumber, int viewNumber
return nullptr;
}
SaveStateList CProjectItem::getSavegameList(const Common::String &target) {
SaveStateList CProjectItem::getSavegameList(const MetaEngine *metaEngine, const Common::String &target) {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String saveDesc;
@ -486,7 +486,7 @@ SaveStateList CProjectItem::getSavegameList(const Common::String &target) {
SimpleFile f;
f.open(in);
if (readSavegameHeader(&f, header))
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
saveList.push_back(SaveStateDescriptor(metaEngine, slot, header._saveName));
delete in;
}

2
engines/titanic/core/project_item.h
View file

@ -145,7 +145,7 @@ public:
/**
* Load a list of savegames
*/
static SaveStateList getSavegameList(const Common::String &target);
static SaveStateList getSavegameList(const MetaEngine *metaEngine, const Common::String &target);
/**
* Write out the header information for a savegame

4
engines/titanic/metaengine.cpp
View file

@ -106,7 +106,7 @@ SaveStateList TitanicMetaEngine::listSaves(const char *target) const {
cf.open(in);
if (Titanic::CProjectItem::readSavegameHeader(&cf, header))
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
saveList.push_back(SaveStateDescriptor(this, slot, header._saveName));
cf.close();
}
@ -144,7 +144,7 @@ SaveStateDescriptor TitanicMetaEngine::querySaveMetaInfos(const char *target, in
file.close();
// Create the return descriptor
SaveStateDescriptor desc(slot, header._saveName);
SaveStateDescriptor desc(this, slot, header._saveName);
if (header._version) {
desc.setThumbnail(header._thumbnail);

4
engines/toltecs/metaengine.cpp
View file

@ -100,7 +100,7 @@ SaveStateList ToltecsMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
if (in) {
if (Toltecs::ToltecsEngine::readSaveHeader(in, header) == Toltecs::ToltecsEngine::kRSHENoError) {
saveList.push_back(SaveStateDescriptor(slotNum, header.description));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.description));
}
delete in;
}
@ -152,7 +152,7 @@ SaveStateDescriptor ToltecsMetaEngine::querySaveMetaInfos(const char *target, in
delete in;
if (error == Toltecs::ToltecsEngine::kRSHENoError) {
SaveStateDescriptor desc(slot, header.description);
SaveStateDescriptor desc(this, slot, header.description);
desc.setThumbnail(header.thumbnail);

4
engines/tony/metaengine.cpp
View file

@ -107,7 +107,7 @@ SaveStateList TonyMetaEngine::listSaves(const char *target) const {
if (Tony::RMOptionScreen::loadThumbnailFromSaveState(slotNum, thumbnailData, saveName, difficulty)) {
// Add the save name to the savegame list
saveList.push_back(SaveStateDescriptor(slotNum, saveName));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveName));
}
}
}
@ -141,7 +141,7 @@ SaveStateDescriptor TonyMetaEngine::querySaveMetaInfos(const char *target, int s
pixels[i] = READ_LE_UINT16(pixels + i);
#endif
// Create the return descriptor
SaveStateDescriptor desc(slot, saveName);
SaveStateDescriptor desc(this, slot, saveName);
desc.setDeletableFlag(true);
desc.setWriteProtectedFlag(false);
desc.setThumbnail(to);

4
engines/toon/metaengine.cpp
View file

@ -94,7 +94,7 @@ SaveStateList ToonMetaEngine::listSaves(const char *target) const {
file->read(name, nameSize);
name[nameSize] = 0;
saveList.push_back(SaveStateDescriptor(slotNum, name));
saveList.push_back(SaveStateDescriptor(this, slotNum, name));
delete file;
}
}
@ -122,7 +122,7 @@ SaveStateDescriptor ToonMetaEngine::querySaveMetaInfos(const char *target, int s
file->read(saveName, saveNameLength);
saveName[saveNameLength] = 0;
SaveStateDescriptor desc(slot, saveName);
SaveStateDescriptor desc(this, slot, saveName);
Graphics::Surface *thumbnail = nullptr;
if (!Graphics::loadThumbnail(*file, thumbnail, false)) {

2
engines/touche/metaengine.cpp
View file

@ -82,7 +82,7 @@ SaveStateList ToucheMetaEngine::listSaves(const char *target) const {
char description[64];
Touche::readGameStateDescription(in, description, sizeof(description) - 1);
if (description[0]) {
saveList.push_back(SaveStateDescriptor(slot, description));
saveList.push_back(SaveStateDescriptor(this, slot, description));
}
delete in;
}

2
engines/trecision/metaengine.cpp
View file

@ -61,7 +61,7 @@ SaveStateDescriptor TrecisionMetaEngine::querySaveMetaInfos(const char *target,
// Original saved game, convert
Common::String saveName = saveFile->readString(0, 40);
SaveStateDescriptor desc(slot, saveName);
SaveStateDescriptor desc(this, slot, saveName);
// This is freed inside SaveStateDescriptor
const Graphics::PixelFormat kImageFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);

4
engines/tsage/metaengine.cpp
View file

@ -107,7 +107,7 @@ public:
if (in) {
if (TsAGE::Saver::readSavegameHeader(in, header)) {
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
saveList.push_back(SaveStateDescriptor(this, slot, header._saveName));
}
delete in;
@ -143,7 +143,7 @@ public:
delete f;
// Create the return descriptor
SaveStateDescriptor desc(slot, header._saveName);
SaveStateDescriptor desc(this, slot, header._saveName);
desc.setThumbnail(header._thumbnail);
desc.setSaveDate(header._saveYear, header._saveMonth, header._saveDay);
desc.setSaveTime(header._saveHour, header._saveMinutes);

4
engines/tucker/metaengine.cpp
View file

@ -68,7 +68,7 @@ public:
Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(*file);
if (in) {
if (Tucker::TuckerEngine::readSavegameHeader(in, header) == Tucker::TuckerEngine::kSavegameNoError) {
saveList.push_back(SaveStateDescriptor(slot, header.description));
saveList.push_back(SaveStateDescriptor(this, slot, header.description));
}
delete in;
@ -109,7 +109,7 @@ public:
return SaveStateDescriptor();
}
SaveStateDescriptor desc(slot, header.description);
SaveStateDescriptor desc(this, slot, header.description);
if (slot == Tucker::kAutoSaveSlot) {
bool autosaveAllowed = Tucker::TuckerEngine::isAutosaveAllowed(target);

4
engines/voyeur/metaengine.cpp
View file

@ -109,7 +109,7 @@ SaveStateList VoyeurMetaEngine::listSaves(const char *target) const {
if (in) {
if (header.read(in)) {
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
saveList.push_back(SaveStateDescriptor(this, slot, header._saveName));
}
delete in;
}
@ -140,7 +140,7 @@ SaveStateDescriptor VoyeurMetaEngine::querySaveMetaInfos(const char *target, int
delete f;
// Create the return descriptor
SaveStateDescriptor desc(slot, header._saveName);
SaveStateDescriptor desc(this, slot, header._saveName);
desc.setThumbnail(header._thumbnail);
desc.setSaveDate(header._saveYear, header._saveMonth, header._saveDay);
desc.setSaveTime(header._saveHour, header._saveMinutes);

2
engines/wage/metaengine.cpp
View file

@ -101,7 +101,7 @@ SaveStateList WageMetaEngine::listSaves(const char *target) const {
in->read(saveDesc, 127);
}
}
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
saveList.push_back(SaveStateDescriptor(this, slotNum, saveDesc));
delete in;
}
}

4
engines/xeen/metaengine.cpp
View file

@ -139,7 +139,7 @@ SaveStateList XeenMetaEngine::listSaves(const char *target) const {
if (in) {
if (Xeen::SavesManager::readSavegameHeader(in, header))
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
saveList.push_back(SaveStateDescriptor(this, slot, header._saveName));
delete in;
}
@ -173,7 +173,7 @@ SaveStateDescriptor XeenMetaEngine::querySaveMetaInfos(const char *target, int s
delete f;
// Create the return descriptor
SaveStateDescriptor desc(slot, header._saveName);
SaveStateDescriptor desc(this, slot, header._saveName);
desc.setThumbnail(header._thumbnail);
desc.setSaveDate(header._year, header._month, header._day);
desc.setSaveTime(header._hour, header._minute);

4
engines/zvision/metaengine.cpp
View file

@ -258,7 +258,7 @@ SaveStateList ZVisionMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
if (in) {
if (zvisionSaveMan->readSaveGameHeader(in, header)) {
saveList.push_back(SaveStateDescriptor(slotNum, header.saveName));
saveList.push_back(SaveStateDescriptor(this, slotNum, header.saveName));
}
delete in;
}
@ -295,7 +295,7 @@ SaveStateDescriptor ZVisionMetaEngine::querySaveMetaInfos(const char *target, in
delete in;
if (successfulRead) {
SaveStateDescriptor desc(slot, header.saveName);
SaveStateDescriptor desc(this, slot, header.saveName);
desc.setThumbnail(header.thumbnail);

6
gui/saveload-dialog.cpp
View file

@ -321,7 +321,7 @@ void SaveLoadChooserDialog::listSaves() {
slotNum = slotNum * 10 + (c - '0');
}
SaveStateDescriptor slot(slotNum, files[i]);
SaveStateDescriptor slot(_metaEngine, slotNum, files[i]);
slot.setLocked(true);
_saveList.push_back(slot);
}
@ -710,7 +710,7 @@ void SaveLoadChooserSimple::updateSaveList() {
saveSlot = x->getSaveSlot();
if (curSlot < saveSlot) {
while (curSlot < saveSlot) {
SaveStateDescriptor dummySave(curSlot, "");
SaveStateDescriptor dummySave(_metaEngine, curSlot, "");
_saveList.insert_at(curSlot, dummySave);
saveNames.push_back(dummySave.getDescription());
colors.push_back(ThemeEngine::kFontColorNormal);
@ -754,7 +754,7 @@ void SaveLoadChooserSimple::updateSaveList() {
Common::String emptyDesc;
for (int i = curSlot; i <= maximumSaveSlots; i++) {
saveNames.push_back(emptyDesc);
SaveStateDescriptor dummySave(i, "");
SaveStateDescriptor dummySave(_metaEngine, i, "");
_saveList.push_back(dummySave);
colors.push_back(ThemeEngine::kFontColorNormal);
}