diff options
| author | Max Horn | 2010-03-18 15:54:40 +0000 |
|---|---|---|
| committer | Max Horn | 2010-03-18 15:54:40 +0000 |
| commit | cac0ac66e22d18a57958ef342e6b115e35197e90 (patch) | |
| tree | 1fef12f458e84cdba353bd9b3ef45e3d00a63a16 /engines/saga | |
| parent | 81a698d0a0a52115088825523950047d135b0ca0 (diff) | |
| download | scummvm-rg350-cac0ac66e22d18a57958ef342e6b115e35197e90.tar.gz scummvm-rg350-cac0ac66e22d18a57958ef342e6b115e35197e90.tar.bz2 scummvm-rg350-cac0ac66e22d18a57958ef342e6b115e35197e90.zip | |
COMMON: Get rid of Common::StringList
svn-id: r48287
Diffstat (limited to 'engines/saga')
| -rw-r--r-- | engines/saga/detection.cpp | 4 | ||||
| -rw-r--r-- | engines/saga/saga.h | 3 | ||||
| -rw-r--r-- | engines/saga/saveload.cpp | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index 807345cd7b..1c2c6bacff 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -190,7 +190,7 @@ bool SagaMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame SaveStateList SagaMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); - Common::StringList filenames; + Common::StringArray filenames; char saveDesc[SAVE_TITLE_SIZE]; Common::String pattern = target; pattern += ".s??"; @@ -200,7 +200,7 @@ SaveStateList SagaMetaEngine::listSaves(const char *target) const { SaveStateList saveList; int slotNum = 0; - for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); ++file) { + for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) { // Obtain the last 2 digits of the filename, since they correspond to the save slot slotNum = atoi(file->c_str() + file->size() - 2); diff --git a/engines/saga/saga.h b/engines/saga/saga.h index fc783933f1..9b97e54dc4 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -81,7 +81,6 @@ class Puzzle; class Resource; class ResourceContext; -struct StringList; using Common::MemoryReadStream; using Common::MemoryReadStreamEndian; @@ -390,7 +389,7 @@ struct StringsTable { const char *getString(int index) const { if ((stringsCount <= index) || (index < 0)) { // This occurs at the end of Ted's chapter, right after the ending cutscene - warning("StringList::getString wrong index 0x%X (%d)", index, stringsCount); + warning("StringsTable::getString wrong index 0x%X (%d)", index, stringsCount); return ""; } return strings[index]; diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp index 53811fda1d..951d0a5698 100644 --- a/engines/saga/saveload.cpp +++ b/engines/saga/saveload.cpp @@ -118,7 +118,7 @@ void SagaEngine::fillSaveList() { int i; Common::InSaveFile *in; - Common::StringList filenames; + Common::StringArray filenames; char slot[3]; int slotNumber; char *name; @@ -136,7 +136,7 @@ void SagaEngine::fillSaveList() { _saveFilesCount = 0; - for (Common::StringList::iterator file = filenames.begin(); file != filenames.end(); ++file){ + for (Common::StringArray::iterator file = filenames.begin(); file != filenames.end(); ++file){ //Obtain the last 2 digits of the filename, since they correspond to the save slot slot[0] = file->c_str()[file->size()-2]; slot[1] = file->c_str()[file->size()-1]; |