diff options
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/detection.cpp | 8 | ||||
| -rw-r--r-- | engines/kyra/gui.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/gui_v2.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 7c1280cfde..364c856b67 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -1192,7 +1192,7 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const { pattern += ".???"; Common::StringList filenames; - filenames = saveFileMan->listSavefiles(pattern.c_str()); + filenames = saveFileMan->listSavefiles(pattern); Common::sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..) SaveStateList saveList; @@ -1201,7 +1201,7 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const { int slotNum = atoi(file->c_str() + file->size() - 3); if (slotNum >= 0 && slotNum <= 999) { - Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str()); + Common::InSaveFile *in = saveFileMan->openForLoading(*file); if (in) { if (Kyra::KyraEngine_v1::readSaveHeader(in, false, header) == Kyra::KyraEngine_v1::kRSHENoError) { // Workaround for old savegames using 'German' as description for kyra3 start savegame (slot 0) @@ -1226,12 +1226,12 @@ void KyraMetaEngine::removeSaveState(const char *target, int slot) const { return; Common::String filename = Kyra::KyraEngine_v1::getSavegameFilename(target, slot); - g_system->getSavefileManager()->removeSavefile(filename.c_str()); + g_system->getSavefileManager()->removeSavefile(filename); } SaveStateDescriptor KyraMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Kyra::KyraEngine_v1::getSavegameFilename(target, slot); - Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str()); + Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename); if (in) { Kyra::KyraEngine_v1::SaveHeader header; diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index f2661ab4b4..faea2c9a72 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -298,7 +298,7 @@ int GUI::redrawShadedButtonCallback(Button *button) { void GUI::updateSaveList() { Common::String pattern = _vm->_targetName + ".???"; - Common::StringList saveFileList = _vm->_saveFileMan->listSavefiles(pattern.c_str()); + Common::StringList saveFileList = _vm->_saveFileMan->listSavefiles(pattern); _saveSlots.clear(); for (Common::StringList::const_iterator i = saveFileList.begin(); i != saveFileList.end(); ++i) { diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp index ed3082c727..7e3d2b5afb 100644 --- a/engines/kyra/gui_v2.cpp +++ b/engines/kyra/gui_v2.cpp @@ -727,7 +727,7 @@ int GUI_v2::deleteMenu(Button *caller) { break; Common::String oldName = _vm->getSavegameFilename(*i); Common::String newName = _vm->getSavegameFilename(*i-1); - _vm->_saveFileMan->renameSavefile(oldName.c_str(), newName.c_str()); + _vm->_saveFileMan->renameSavefile(oldName, newName); } _saveMenu.menuNameId = _vm->gameFlags().isTalkie ? 9 : 17; return 0; |