diff options
| author | Max Horn | 2009-05-29 14:38:22 +0000 |
|---|---|---|
| committer | Max Horn | 2009-05-29 14:38:22 +0000 |
| commit | fb79b185717c9aae7c793e7f07d5d6b94aec4abf (patch) | |
| tree | 6df973c3f64d5712d6df36caa0af30b6b6012561 /engines/touche | |
| parent | 518e005ec27ef323275b364a3cd16d24d7491674 (diff) | |
| download | scummvm-rg350-fb79b185717c9aae7c793e7f07d5d6b94aec4abf.tar.gz scummvm-rg350-fb79b185717c9aae7c793e7f07d5d6b94aec4abf.tar.bz2 scummvm-rg350-fb79b185717c9aae7c793e7f07d5d6b94aec4abf.zip | |
Changed SaveFileManager methods to take Common::String params (instead of char pointers)
svn-id: r41000
Diffstat (limited to 'engines/touche')
| -rw-r--r-- | engines/touche/detection.cpp | 6 | ||||
| -rw-r--r-- | engines/touche/menu.cpp | 4 | ||||
| -rw-r--r-- | engines/touche/saveload.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index dcaab80d6e..75bc5c2a6e 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -168,7 +168,7 @@ bool ToucheMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGa SaveStateList ToucheMetaEngine::listSaves(const char *target) const { Common::String pattern = Touche::generateGameStateFileName(target, 0, true); - Common::StringList filenames = g_system->getSavefileManager()->listSavefiles(pattern.c_str()); + Common::StringList filenames = g_system->getSavefileManager()->listSavefiles(pattern); bool slotsTable[Touche::kMaxSaveStates]; memset(slotsTable, 0, sizeof(slotsTable)); SaveStateList saveList; @@ -181,7 +181,7 @@ SaveStateList ToucheMetaEngine::listSaves(const char *target) const { for (int slot = 0; slot < Touche::kMaxSaveStates; ++slot) { if (slotsTable[slot]) { Common::String file = Touche::generateGameStateFileName(target, slot); - Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(file.c_str()); + Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(file); if (in) { char description[64]; Touche::readGameStateDescription(in, description, sizeof(description) - 1); @@ -201,7 +201,7 @@ int ToucheMetaEngine::getMaximumSaveSlot() const { void ToucheMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Touche::generateGameStateFileName(target, slot); - g_system->getSavefileManager()->removeSavefile(filename.c_str()); + g_system->getSavefileManager()->removeSavefile(filename); } #if PLUGIN_ENABLED_DYNAMIC(TOUCHE) diff --git a/engines/touche/menu.cpp b/engines/touche/menu.cpp index 6085e623fd..abc7944ccc 100644 --- a/engines/touche/menu.cpp +++ b/engines/touche/menu.cpp @@ -377,11 +377,11 @@ void ToucheEngine::handleOptions(int forceDisplay) { menuData.saveLoadDescriptionsTable[i][0] = 0; } Common::String gameStateFileName = generateGameStateFileName(_targetName.c_str(), 0, true); - Common::StringList filenames = _saveFileMan->listSavefiles(gameStateFileName.c_str()); + Common::StringList filenames = _saveFileMan->listSavefiles(gameStateFileName); for (Common::StringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it) { int i = getGameStateFileSlot(it->c_str()); if (i >= 0 && i < kMaxSaveStates) { - Common::InSaveFile *f = _saveFileMan->openForLoading(it->c_str()); + Common::InSaveFile *f = _saveFileMan->openForLoading(*it); if (f) { readGameStateDescription(f, menuData.saveLoadDescriptionsTable[i], 32); delete f; diff --git a/engines/touche/saveload.cpp b/engines/touche/saveload.cpp index daf9d25ce8..69b8f9ba43 100644 --- a/engines/touche/saveload.cpp +++ b/engines/touche/saveload.cpp @@ -324,7 +324,7 @@ void ToucheEngine::loadGameStateData(Common::ReadStream *stream) { Common::Error ToucheEngine::saveGameState(int num, const char *description) { bool saveOk = false; Common::String gameStateFileName = generateGameStateFileName(_targetName.c_str(), num); - Common::OutSaveFile *f = _saveFileMan->openForSaving(gameStateFileName.c_str()); + Common::OutSaveFile *f = _saveFileMan->openForSaving(gameStateFileName); if (f) { f->writeUint16LE(kCurrentGameStateVersion); f->writeUint16LE(0); @@ -347,7 +347,7 @@ Common::Error ToucheEngine::saveGameState(int num, const char *description) { Common::Error ToucheEngine::loadGameState(int num) { bool loadOk = false; Common::String gameStateFileName = generateGameStateFileName(_targetName.c_str(), num); - Common::InSaveFile *f = _saveFileMan->openForLoading(gameStateFileName.c_str()); + Common::InSaveFile *f = _saveFileMan->openForLoading(gameStateFileName); if (f) { uint16 version = f->readUint16LE(); if (version < kCurrentGameStateVersion) { |
