From cac0ac66e22d18a57958ef342e6b115e35197e90 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 18 Mar 2010 15:54:40 +0000 Subject: COMMON: Get rid of Common::StringList svn-id: r48287 --- engines/mohawk/console.cpp | 4 ++-- engines/mohawk/detection.cpp | 6 +++--- engines/mohawk/myst.cpp | 4 ++-- engines/mohawk/myst_saveload.cpp | 2 +- engines/mohawk/myst_saveload.h | 2 +- engines/mohawk/riven.cpp | 4 ++-- engines/mohawk/riven_saveload.cpp | 2 +- engines/mohawk/riven_saveload.h | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) (limited to 'engines/mohawk') diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp index 7521bcd194..389665db39 100644 --- a/engines/mohawk/console.cpp +++ b/engines/mohawk/console.cpp @@ -510,7 +510,7 @@ bool RivenConsole::Cmd_DumpScript(int argc, const char **argv) { // Load in Variable Names Common::SeekableReadStream *nameStream = _vm->getRawData(ID_NAME, VariableNames); - Common::StringList varNames; + Common::StringArray varNames; uint16 namesCount = nameStream->readUint16BE(); uint16 *stringOffsets = new uint16[namesCount]; @@ -531,7 +531,7 @@ bool RivenConsole::Cmd_DumpScript(int argc, const char **argv) { // Load in External Command Names nameStream = _vm->getRawData(ID_NAME, ExternalCommandNames); - Common::StringList xNames; + Common::StringArray xNames; namesCount = nameStream->readUint16BE(); stringOffsets = new uint16[namesCount]; diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index 65353b61e7..a7b1fe7fae 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -1005,7 +1005,7 @@ bool MohawkMetaEngine::hasFeature(MetaEngineFeature f) const { } SaveStateList MohawkMetaEngine::listSaves(const char *target) const { - Common::StringList filenames; + Common::StringArray filenames; SaveStateList saveList; // Loading games is only supported in Myst/Riven currently. @@ -1027,10 +1027,10 @@ SaveStateList MohawkMetaEngine::listSaves(const char *target) const { void MohawkMetaEngine::removeSaveState(const char *target, int slot) const { // Removing saved games is only supported in Myst/Riven currently. if (strstr(target, "myst")) { - Common::StringList filenames = g_system->getSavefileManager()->listSavefiles("*.mys"); + Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles("*.mys"); g_system->getSavefileManager()->removeSavefile(filenames[slot].c_str()); } else if (strstr(target, "riven")) { - Common::StringList filenames = g_system->getSavefileManager()->listSavefiles("*.rvn"); + Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles("*.rvn"); g_system->getSavefileManager()->removeSavefile(filenames[slot].c_str()); } } diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 1055414d1f..5835c7e69d 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -222,7 +222,7 @@ Common::Error MohawkEngine_Myst::run() { // Load game from launcher/command line if requested if (ConfMan.hasKey("save_slot") && !(getFeatures() & GF_DEMO)) { uint32 gameToLoad = ConfMan.getInt("save_slot"); - Common::StringList savedGamesList = _saveLoad->generateSaveGameList(); + Common::StringArray savedGamesList = _saveLoad->generateSaveGameList(); if (gameToLoad > savedGamesList.size()) error ("Could not find saved game"); _saveLoad->loadGame(savedGamesList[gameToLoad]); @@ -1593,7 +1593,7 @@ Common::Error MohawkEngine_Myst::loadGameState(int slot) { } Common::Error MohawkEngine_Myst::saveGameState(int slot, const char *desc) { - Common::StringList saveList = _saveLoad->generateSaveGameList(); + Common::StringArray saveList = _saveLoad->generateSaveGameList(); if ((uint)slot < saveList.size()) _saveLoad->deleteSave(saveList[slot]); diff --git a/engines/mohawk/myst_saveload.cpp b/engines/mohawk/myst_saveload.cpp index e13866ea13..b04b3cac77 100644 --- a/engines/mohawk/myst_saveload.cpp +++ b/engines/mohawk/myst_saveload.cpp @@ -39,7 +39,7 @@ MystSaveLoad::~MystSaveLoad() { delete _v; } -Common::StringList MystSaveLoad::generateSaveGameList() { +Common::StringArray MystSaveLoad::generateSaveGameList() { return _saveFileMan->listSavefiles("*.mys"); } diff --git a/engines/mohawk/myst_saveload.h b/engines/mohawk/myst_saveload.h index f5df581378..b3f3cfaef4 100644 --- a/engines/mohawk/myst_saveload.h +++ b/engines/mohawk/myst_saveload.h @@ -194,7 +194,7 @@ public: MystSaveLoad(MohawkEngine_Myst*, Common::SaveFileManager*); ~MystSaveLoad(); - Common::StringList generateSaveGameList(); + Common::StringArray generateSaveGameList(); bool loadGame(Common::String); bool saveGame(Common::String); void deleteSave(Common::String); diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 2c5f849ba9..d5a4e9b140 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -98,7 +98,7 @@ Common::Error MohawkEngine_Riven::run() { // Load game from launcher/command line if requested if (ConfMan.hasKey("save_slot") && !(getFeatures() & GF_DEMO)) { uint32 gameToLoad = ConfMan.getInt("save_slot"); - Common::StringList savedGamesList = _saveLoad->generateSaveGameList(); + Common::StringArray savedGamesList = _saveLoad->generateSaveGameList(); if (gameToLoad > savedGamesList.size()) error ("Could not find saved game"); _saveLoad->loadGame(savedGamesList[gameToLoad]); @@ -569,7 +569,7 @@ Common::Error MohawkEngine_Riven::loadGameState(int slot) { } Common::Error MohawkEngine_Riven::saveGameState(int slot, const char *desc) { - Common::StringList saveList = _saveLoad->generateSaveGameList(); + Common::StringArray saveList = _saveLoad->generateSaveGameList(); if ((uint)slot < saveList.size()) _saveLoad->deleteSave(saveList[slot]); diff --git a/engines/mohawk/riven_saveload.cpp b/engines/mohawk/riven_saveload.cpp index a4e2363be2..3c989838da 100644 --- a/engines/mohawk/riven_saveload.cpp +++ b/engines/mohawk/riven_saveload.cpp @@ -38,7 +38,7 @@ RivenSaveLoad::~RivenSaveLoad() { delete _loadFile; } -Common::StringList RivenSaveLoad::generateSaveGameList() { +Common::StringArray RivenSaveLoad::generateSaveGameList() { return _saveFileMan->listSavefiles("*.rvn"); } diff --git a/engines/mohawk/riven_saveload.h b/engines/mohawk/riven_saveload.h index cef2bfb7eb..c708f9d35d 100644 --- a/engines/mohawk/riven_saveload.h +++ b/engines/mohawk/riven_saveload.h @@ -45,7 +45,7 @@ public: RivenSaveLoad(MohawkEngine_Riven*, Common::SaveFileManager*); ~RivenSaveLoad(); - Common::StringList generateSaveGameList(); + Common::StringArray generateSaveGameList(); bool loadGame(Common::String); bool saveGame(Common::String); void deleteSave(Common::String); -- cgit v1.2.3