Fixes for Cine engine loading from launcher

svn-id: r33914
This commit is contained in:
Christopher Page 2008-08-15 19:44:17 +00:00
parent ad5b550df8
commit 7e49b2e8a1
2 changed files with 15 additions and 4 deletions

View File

@ -554,14 +554,23 @@ bool CineMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common
SaveStateList CineMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
SaveStateList saveList;
Common::String pattern = target;
pattern += ".?";
Common::StringList filenames = saveFileMan->listSavefiles(pattern.c_str());
sort(filenames.begin(), filenames.end());
Common::StringList::const_iterator file = filenames.begin();
Common::String filename = target;
filename += ".dir";
Common::InSaveFile *in = saveFileMan->openForLoading(filename.c_str());
if (in) {
int8 ch;
int slotNum = 0;
char saveDesc[20];
do {
// Obtain the last digit of the filename, since they correspond to the save slot
int slotNum = atoi(file->c_str() + file->size() - 1);
uint pos = 0;
do {
ch = in->readByte();
@ -575,8 +584,8 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
}
} while (ch >= 32 && !in->eos());
if (saveDesc[0] != 0) {
saveList.push_back(SaveStateDescriptor(slotNum, Common::String(saveDesc), filename));
slotNum++;
saveList.push_back(SaveStateDescriptor(slotNum, Common::String(saveDesc), *file));
file++;
}
} while (!in->eos());
}

View File

@ -968,12 +968,14 @@ void LauncherDialog::loadGame(int item) {
if (_loadDialog->delSave()) {
String filename = saveList[idx].filename();
printf("Deleting file: %s\n", filename.c_str());
//saveFileMan->removeSavefile(filename.c_str());
saveFileMan->removeSavefile(filename.c_str());
}
// Load the savegame
else {
int slot = atoi(saveList[idx].save_slot().c_str());
const char *file = saveList[idx].filename().c_str();
printf("Loading slot: %d\n", slot);
printf("Loading file: %s\n", file);
ConfMan.setInt("save_slot", slot);
ConfMan.setActiveDomain(_domains[item]);
close();