thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Get rid of Common::StringList

Browse source 
svn-id: r48287
This commit is contained in:
Max Horn 2010-03-18 15:54:40 +00:00
parent 81a698d0a0
commit cac0ac66e2
54 changed files with 108 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/str-array.h
View file

@ -37,13 +37,6 @@ namespace Common {
typedef Array<String> StringArray;
/**
* Alias for type StringArray. For backwards compatibility only.
* @deprecated Use StringArray instead!
*/
typedef StringArray StringList;
} // End of namespace Common
#endif

4
engines/agi/detection.cpp
View file

@ -1048,7 +1048,7 @@ bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameD
SaveStateList AgiMetaEngine::listSaves(const char *target) const {
const uint32 AGIflag = MKID_BE('AGI:');
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringList filenames;
Common::StringArray filenames;
char saveDesc[31];
Common::String pattern = target;
pattern += ".???";
@ -1057,7 +1057,7 @@ SaveStateList AgiMetaEngine::listSaves(const char *target) const {
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
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 3 digits of the filename, since they correspond to the save slot
int slotNum = atoi(file->c_str() + file->size() - 3);

10
engines/agi/sound.cpp
View file

@ -1194,16 +1194,16 @@ bool IIgsSoundMgr::loadWaveFile(const Common::FSNode &wavePath, const IIgsExeInf
*/
struct fsnodeNameEqualsIgnoreCase : public Common::UnaryFunction<const Common::FSNode&, bool> {
// FIXME: This should be replaced; use SearchMan instead
fsnodeNameEqualsIgnoreCase(const Common::StringList &str) : _str(str) {}
fsnodeNameEqualsIgnoreCase(const Common::StringArray &str) : _str(str) {}
fsnodeNameEqualsIgnoreCase(const Common::String str) { _str.push_back(str); }
bool operator()(const Common::FSNode &param) const {
for (Common::StringList::const_iterator iter = _str.begin(); iter != _str.end(); ++iter)
for (Common::StringArray::const_iterator iter = _str.begin(); iter != _str.end(); ++iter)
if (param.getName().equalsIgnoreCase(*iter))
return true;
return false;
}
private:
Common::StringList _str;
Common::StringArray _str;
};
bool SoundMgr::loadInstruments() {
@ -1229,12 +1229,12 @@ bool SoundMgr::loadInstruments() {
}
// Populate executable filenames list (Long filename and short filename) for searching
Common::StringList exeNames;
Common::StringArray exeNames;
exeNames.push_back(Common::String(exeInfo->exePrefix) + ".SYS16");
exeNames.push_back(Common::String(exeInfo->exePrefix) + ".SYS");
// Populate wave filenames list (Long filename and short filename) for searching
Common::StringList waveNames;
Common::StringArray waveNames;
waveNames.push_back("SIERRASTANDARD");
waveNames.push_back("SIERRAST");

4
engines/agos/detection.cpp
View file

@ -185,7 +185,7 @@ bool AgosMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
SaveStateList AgosMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringList filenames;
Common::StringArray filenames;
Common::String saveDesc;
Common::String pattern = target;
pattern += ".???";
@ -194,7 +194,7 @@ SaveStateList AgosMetaEngine::listSaves(const char *target) const {
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
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 3 digits of the filename, since they correspond to the save slot
int slotNum = atoi(file->c_str() + file->size() - 3);

4
engines/agos/saveload.cpp
View file

@ -37,7 +37,7 @@ namespace AGOS {
int AGOSEngine::countSaveGames() {
Common::InSaveFile *f;
Common::StringList filenames;
Common::StringArray filenames;
uint i = 1;
char slot[4];
int slotNum;
@ -49,7 +49,7 @@ int AGOSEngine::countSaveGames() {
memset(marks, false, 256 * sizeof(bool)); //assume no savegames for this title
filenames = _saveFileMan->listSavefiles(prefix);
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 3 digits of the filename, since they correspond to the save slot
slot[0] = file->c_str()[file->size()-3];
slot[1] = file->c_str()[file->size()-2];

2
engines/cine/cine.h
View file

@ -130,7 +130,7 @@ public:
Common::RandomSource _rnd;
Common::StringList _volumeResourceFiles;
Common::StringArray _volumeResourceFiles;
StringPtrHashMap _volumeEntriesMap;
TextHandler _textHandler;

4
engines/cine/detection.cpp
View file

@ -619,9 +619,9 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
Common::String pattern = target;
pattern += ".?";
Common::StringList filenames = saveFileMan->listSavefiles(pattern);
Common::StringArray filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end());
Common::StringList::const_iterator file;
Common::StringArray::const_iterator file;
Common::String filename = target;
filename += ".dir";

2
engines/cine/gfx.cpp
View file

@ -833,7 +833,7 @@ void FWRenderer::clearMenuStack() {
delete menu;
}
SelectionMenu::SelectionMenu(Common::Point p, int width, Common::StringList elements)
SelectionMenu::SelectionMenu(Common::Point p, int width, Common::StringArray elements)
: Menu(kSelectionMenu), _pos(p), _width(width), _elements(elements), _selection(-1) {
}

4
engines/cine/gfx.h
View file

@ -84,7 +84,7 @@ private:
class SelectionMenu : public Menu {
public:
SelectionMenu(Common::Point p, int width, Common::StringList elements);
SelectionMenu(Common::Point p, int width, Common::StringArray elements);
int getElementCount() const { return _elements.size(); }
@ -94,7 +94,7 @@ public:
private:
const Common::Point _pos;
const int _width;
const Common::StringList _elements;
const Common::StringArray _elements;
int _selection;
};

2
engines/cine/msg.cpp
View file

@ -33,7 +33,7 @@ namespace Cine {
// FIXME: Global C++ objects affect portability negatively.
// Turn this into a class member instead.
Common::StringList messageTable;
Common::StringArray messageTable;
void loadMsg(char *pMsgName) {
uint32 sourceSize;

4
engines/cine/various.cpp
View file

@ -502,7 +502,7 @@ void processInventory(int16 x, int16 y) {
if (!listSize)
return;
Common::StringList list;
Common::StringArray list;
for (int i = 0; i < listSize; ++i)
list.push_back(objectListCommand[i]);
SelectionMenu *menu = new SelectionMenu(Common::Point(x, y), menuWidth, list);
@ -706,7 +706,7 @@ int16 makeMenuChoice(const CommandeType commandList[], uint16 height, uint16 X,
Y = 199 - paramY;
}
Common::StringList list;
Common::StringArray list;
for (uint16 i = 0; i < height; ++i)
list.push_back(commandList[i]);
menu = new SelectionMenu(Common::Point(X, Y), width, list);

2
engines/cruise/cruise.h
View file

@ -66,7 +66,7 @@ private:
bool _preLoad;
Debugger *_debugger;
PCSound *_sound;
Common::StringList _langStrings;
Common::StringArray _langStrings;
CursorType _savedCursor;
uint32 lastTick, lastTickDebug;
int _gameSpeed;

4
engines/cruise/detection.cpp
View file

@ -271,14 +271,14 @@ bool CruiseMetaEngine::hasFeature(MetaEngineFeature f) const {
SaveStateList CruiseMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringList filenames;
Common::StringArray filenames;
Common::String pattern("cruise.s??");
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
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
int slotNum = atoi(file->c_str() + file->size() - 2);

4
engines/draci/detection.cpp
View file

@ -130,14 +130,14 @@ bool DraciMetaEngine::hasFeature(MetaEngineFeature f) const {
SaveStateList DraciMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringList filenames;
Common::StringArray filenames;
Common::String pattern("draci.s??");
filenames = saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
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
int slotNum = atoi(file->c_str() + file->size() - 2);

4
engines/groovie/saveload.cpp
View file

@ -50,13 +50,13 @@ SaveStateList SaveLoad::listValidSaves(const Common::String &target) {
// Get the list of savefiles
Common::String pattern = target + ".00?";
Common::StringList savefiles = g_system->getSavefileManager()->listSavefiles(pattern);
Common::StringArray savefiles = g_system->getSavefileManager()->listSavefiles(pattern);
// Sort the list of filenames
sort(savefiles.begin(), savefiles.end());
// Fill the information for the existing savegames
Common::StringList::iterator it = savefiles.begin();
Common::StringArray::iterator it = savefiles.begin();
while (it != savefiles.end()) {
int slot = it->lastChar() - '0';
SaveStateDescriptor descriptor;

4
engines/kyra/detection.cpp
View file

@ -1321,12 +1321,12 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
Common::String pattern = target;
pattern += ".???";
Common::StringList filenames;
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles(pattern);
Common::sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
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 3 digits of the filename, since they correspond to the save slot
int slotNum = atoi(file->c_str() + file->size() - 3);

4
engines/kyra/gui.cpp
View file

@ -370,10 +370,10 @@ int GUI::redrawShadedButtonCallback(Button *button) {
void GUI::updateSaveList(bool excludeQuickSaves) {
Common::String pattern = _vm->_targetName + ".???";
Common::StringList saveFileList = _vm->_saveFileMan->listSavefiles(pattern);
Common::StringArray saveFileList = _vm->_saveFileMan->listSavefiles(pattern);
_saveSlots.clear();
for (Common::StringList::const_iterator i = saveFileList.begin(); i != saveFileList.end(); ++i) {
for (Common::StringArray::const_iterator i = saveFileList.begin(); i != saveFileList.end(); ++i) {
char s1 = 0, s2 = 0, s3 = 0;
s1 = (*i)[i->size()-3];
s2 = (*i)[i->size()-2];

4
engines/lure/detection.cpp
View file

@ -242,7 +242,7 @@ bool LureMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
SaveStateList LureMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringList filenames;
Common::StringArray filenames;
Common::String saveDesc;
Common::String pattern = "lure.???";
@ -250,7 +250,7 @@ SaveStateList LureMetaEngine::listSaves(const char *target) const {
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
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 3 digits of the filename, since they correspond to the save slot
int slotNum = atoi(file->c_str() + file->size() - 3);

4
engines/mohawk/console.cpp
View file

@ -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];

6
engines/mohawk/detection.cpp
View file

@ -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());
}
}

4
engines/mohawk/myst.cpp
View file

@ -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]);

2
engines/mohawk/myst_saveload.cpp
View file

@ -39,7 +39,7 @@ MystSaveLoad::~MystSaveLoad() {
delete _v;
}
Common::StringList MystSaveLoad::generateSaveGameList() {
Common::StringArray MystSaveLoad::generateSaveGameList() {
return _saveFileMan->listSavefiles("*.mys");
}

2
engines/mohawk/myst_saveload.h
View file

@ -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);

4
engines/mohawk/riven.cpp
View file

@ -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]);

2
engines/mohawk/riven_saveload.cpp
View file

@ -38,7 +38,7 @@ RivenSaveLoad::~RivenSaveLoad() {
delete _loadFile;
}
Common::StringList RivenSaveLoad::generateSaveGameList() {
Common::StringArray RivenSaveLoad::generateSaveGameList() {
return _saveFileMan->listSavefiles("*.rvn");
}

2
engines/mohawk/riven_saveload.h
View file

@ -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);

4
engines/parallaction/detection.cpp
View file

@ -295,7 +295,7 @@ bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, cons
SaveStateList ParallactionMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringList filenames;
Common::StringArray filenames;
Common::String pattern = target;
pattern += ".0??";
@ -303,7 +303,7 @@ SaveStateList ParallactionMetaEngine::listSaves(const char *target) const {
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
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
int slotNum = atoi(file->c_str() + file->size() - 2);

2
engines/parallaction/parallaction_ns.cpp
View file

@ -116,7 +116,7 @@ void LocationName::bind(const char *s) {
_hasSlide = false;
_hasCharacter = false;
Common::StringList list;
Common::StringArray list;
char *tok = strtok(_buf, ".");
while (tok) {
list.push_back(tok);

8
engines/parallaction/saveload.cpp
View file

@ -193,9 +193,9 @@ void SaveLoad_ns::doSaveGame(uint16 slot, const char* name) {
int SaveLoad::buildSaveFileList(Common::StringList& l) {
int SaveLoad::buildSaveFileList(Common::StringArray& l) {
Common::String pattern = _saveFilePrefix + ".???";
Common::StringList filenames = _saveFileMan->listSavefiles(pattern);
Common::StringArray filenames = _saveFileMan->listSavefiles(pattern);
Common::String s;
@ -219,7 +219,7 @@ int SaveLoad::buildSaveFileList(Common::StringList& l) {
int SaveLoad::selectSaveFile(Common::String &selectedName, bool saveMode, const Common::String &caption, const Common::String &button) {
Common::StringList list;
Common::StringArray list;
buildSaveFileList(list);
GUI::SaveLoadChooser slc(caption, button);
@ -332,7 +332,7 @@ static bool askRenameOldSavefiles() {
}
void SaveLoad_ns::renameOldSavefiles() {
Common::StringList oldFilenames = _saveFileMan->listSavefiles("game.*");
Common::StringArray oldFilenames = _saveFileMan->listSavefiles("game.*");
uint numOldSaves = oldFilenames.size();
bool rename = false;

2
engines/parallaction/saveload.h
View file

@ -42,7 +42,7 @@ protected:
Common::InSaveFile *getInSaveFile(uint slot);
Common::OutSaveFile *getOutSaveFile(uint slot);
int selectSaveFile(Common::String &selectedName, bool saveMode, const Common::String &caption, const Common::String &button);
int buildSaveFileList(Common::StringList& l);
int buildSaveFileList(Common::StringArray& l);
virtual void doLoadGame(uint16 slot) = 0;
virtual void doSaveGame(uint16 slot, const char* name) = 0;

8
engines/queen/queen.cpp
View file

@ -141,7 +141,7 @@ GameList QueenMetaEngine::detectGames(const Common::FSList &fslist) const {
SaveStateList QueenMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringList filenames;
Common::StringArray filenames;
char saveDesc[32];
Common::String pattern("queen.s??");
@ -149,7 +149,7 @@ SaveStateList QueenMetaEngine::listSaves(const char *target) const {
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
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
int slotNum = atoi(file->c_str() + file->size() - 2);
@ -432,8 +432,8 @@ int QueenEngine::getGameStateSlot(const char *filename) const {
void QueenEngine::findGameStateDescriptions(char descriptions[100][32]) {
char prefix[20];
makeGameStateName(SLOT_LISTPREFIX, prefix);
Common::StringList filenames = _saveFileMan->listSavefiles(prefix);
for (Common::StringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it) {
Common::StringArray filenames = _saveFileMan->listSavefiles(prefix);
for (Common::StringArray::const_iterator it = filenames.begin(); it != filenames.end(); ++it) {
int i = getGameStateSlot(it->c_str());
if (i >= 0 && i < SAVESTATE_MAX_NUM) {
GameStateHeader header;

2
engines/queen/resource.cpp
View file

@ -125,7 +125,7 @@ uint8 *Resource::loadFile(const char *filename, uint32 skipBytes, uint32 *size)
return dstBuf;
}
void Resource::loadTextFile(const char *filename, Common::StringList &stringList) {
void Resource::loadTextFile(const char *filename, Common::StringArray &stringList) {
debug(7, "Resource::loadTextFile('%s')", filename);
ResourceEntry *re = resourceEntry(filename);
assert(re != NULL);

4
engines/saga/detection.cpp
View file

@ -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);

3
engines/saga/saga.h
View file

@ -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];

4
engines/saga/saveload.cpp
View file

@ -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];

4
engines/sci/detection.cpp
View file

@ -402,7 +402,7 @@ bool SciEngine::hasFeature(EngineFeature f) const {
SaveStateList SciMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringList filenames;
Common::StringArray filenames;
Common::String pattern = target;
pattern += ".???";
@ -411,7 +411,7 @@ SaveStateList SciMetaEngine::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 3 digits of the filename, since they correspond to the save slot
slotNum = atoi(file->c_str() + file->size() - 3);

4
engines/sci/engine/kernel.cpp
View file

@ -445,7 +445,7 @@ void Kernel::loadSelectorNames() {
if (!r) { // No such resource?
// Check if we have a table for this game
// Some demos do not have a selector table
Common::StringList staticSelectorTable = checkStaticSelectorNames();
Common::StringArray staticSelectorTable = checkStaticSelectorNames();
if (staticSelectorTable.empty())
error("Kernel: Could not retrieve selector names");
@ -722,7 +722,7 @@ bool kernel_matches_signature(SegManager *segMan, const char *sig, int argc, con
}
void Kernel::setDefaultKernelNames(Common::String gameId) {
_kernelNames = Common::StringList(sci_default_knames, SCI_KNAMES_DEFAULT_ENTRIES_NR);
_kernelNames = Common::StringArray(sci_default_knames, SCI_KNAMES_DEFAULT_ENTRIES_NR);
// Some (later) SCI versions replaced CanBeHere by CantBeHere
if (_selectorCache.cantBeHere != -1)

6
engines/sci/engine/kernel32.cpp
View file

@ -375,7 +375,7 @@ enum {
};
void Kernel::setKernelNamesSci2() {
_kernelNames = Common::StringList(sci2_default_knames, kKernelEntriesSci2);
_kernelNames = Common::StringArray(sci2_default_knames, kKernelEntriesSci2);
}
void Kernel::setKernelNamesSci21(EngineState *s) {
@ -387,13 +387,13 @@ void Kernel::setKernelNamesSci21(EngineState *s) {
// they would not be compatible with other games of the same interpreter.
if (g_sci->_features->detectSci21KernelType() == SCI_VERSION_2) {
_kernelNames = Common::StringList(sci2_default_knames, kKernelEntriesGk2Demo);
_kernelNames = Common::StringArray(sci2_default_knames, kKernelEntriesGk2Demo);
// OnMe is IsOnMe here, but they should be compatible
_kernelNames[0x23] = "Robot"; // Graph in SCI2
_kernelNames[0x2e] = "Priority"; // DisposeTextBitmap in SCI2
} else {
// TODO: Differentiate between SCI2.1/3
_kernelNames = Common::StringList(sci21_default_knames, kKernelEntriesSci3);
_kernelNames = Common::StringArray(sci21_default_knames, kKernelEntriesSci3);
}
}

4
engines/sci/engine/kfile.cpp
View file

@ -257,9 +257,9 @@ void listSavegames(Common::Array<SavegameDesc> &saves) {
Common::SaveFileManager *saveFileMan = g_engine->getSaveFileManager();
// Load all saves
Common::StringList saveNames = saveFileMan->listSavefiles(g_sci->getSavegamePattern());
Common::StringArray saveNames = saveFileMan->listSavefiles(g_sci->getSavegamePattern());
for (Common::StringList::const_iterator iter = saveNames.begin(); iter != saveNames.end(); ++iter) {
for (Common::StringArray::const_iterator iter = saveNames.begin(); iter != saveNames.end(); ++iter) {
Common::String filename = *iter;
Common::SeekableReadStream *in;
if ((in = saveFileMan->openForLoading(filename))) {

4
engines/sci/engine/static_selectors.cpp
View file

@ -110,8 +110,8 @@ static const SelectorRemap sciSelectorRemap[] = {
{ SCI_VERSION_NONE, SCI_VERSION_NONE, 0, 0 }
};
Common::StringList Kernel::checkStaticSelectorNames() {
Common::StringList names;
Common::StringArray Kernel::checkStaticSelectorNames() {
Common::StringArray names;
const int offset = (getSciVersion() < SCI_VERSION_1_1) ? 3 : 0;
#ifdef ENABLE_SCI32

4
engines/scumm/detection.cpp
View file

@ -1036,7 +1036,7 @@ int ScummMetaEngine::getMaximumSaveSlot() const { return 99; }
SaveStateList ScummMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringList filenames;
Common::StringArray filenames;
Common::String saveDesc;
Common::String pattern = target;
pattern += ".s??";
@ -1045,7 +1045,7 @@ SaveStateList ScummMetaEngine::listSaves(const char *target) const {
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
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
int slotNum = atoi(file->c_str() + file->size() - 2);

4
engines/scumm/saveload.cpp
View file

@ -582,7 +582,7 @@ void ScummEngine::listSavegames(bool *marks, int num) {
char slot[3];
int slotNum;
Common::StringList files;
Common::StringArray files;
Common::String prefix = makeSavegameName(99, false);
prefix.setChar('*', prefix.size()-2);
@ -590,7 +590,7 @@ void ScummEngine::listSavegames(bool *marks, int num) {
memset(marks, false, num * sizeof(bool)); //assume no savegames for this title
files = _saveFileMan->listSavefiles(prefix);
for (Common::StringList::const_iterator file = files.begin(); file != files.end(); ++file) {
for (Common::StringArray::const_iterator file = files.begin(); file != files.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];

8
engines/sky/control.cpp
View file

@ -838,7 +838,7 @@ uint16 Control::saveRestorePanel(bool allowSave) {
}
bool withAutoSave = (lookListLen == 7);
Common::StringList saveGameTexts;
Common::StringArray saveGameTexts;
DataFileHeader *textSprites[MAX_ON_SCREEN + 1];
for (cnt = 0; cnt < MAX_ON_SCREEN + 1; cnt++)
textSprites[cnt] = NULL;
@ -982,7 +982,7 @@ void Control::handleKeyPress(Common::KeyState kbd, Common::String &textBuf) {
}
}
void Control::setUpGameSprites(const Common::StringList &saveGameNames, DataFileHeader **nameSprites, uint16 firstNum, uint16 selectedGame) {
void Control::setUpGameSprites(const Common::StringArray &saveGameNames, DataFileHeader **nameSprites, uint16 firstNum, uint16 selectedGame) {
char cursorChar[2] = "-";
DisplayedText textSpr;
if (!nameSprites[MAX_ON_SCREEN]) {
@ -1027,7 +1027,7 @@ void Control::showSprites(DataFileHeader **nameSprites, bool allowSave) {
delete drawResource;
}
void Control::loadDescriptions(Common::StringList &savenames) {
void Control::loadDescriptions(Common::StringArray &savenames) {
savenames.resize(MAX_SAVE_GAMES);
Common::InSaveFile *inf;
@ -1072,7 +1072,7 @@ int Control::displayMessage(const char *altButton, const char *message, ...) {
return result;
}
void Control::saveDescriptions(const Common::StringList &list) {
void Control::saveDescriptions(const Common::StringArray &list) {
Common::OutSaveFile *outf;
outf = _saveFileMan->openForSaving("SKY-VM.SAV");

10
engines/sky/detection.cpp
View file

@ -178,7 +178,7 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
SaveStateList saveList;
// Load the descriptions
Common::StringList savenames;
Common::StringArray savenames;
savenames.resize(MAX_SAVE_GAMES+1);
Common::InSaveFile *inf;
@ -196,7 +196,7 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
}
// Find all saves
Common::StringList filenames;
Common::StringArray filenames;
filenames = saveFileMan->listSavefiles("SKY-VM.???");
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
@ -206,7 +206,7 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
saveList.insert_at(0, SaveStateDescriptor(0, "*AUTOSAVE*"));
// Prepare the list of savestates by looping over all matching savefiles
for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
// Extract the extension
Common::String ext = file->c_str() + file->size() - 3;
ext.toUppercase();
@ -235,7 +235,7 @@ void SkyMetaEngine::removeSaveState(const char *target, int slot) const {
saveFileMan->removeSavefile(fName);
// Load current save game descriptions
Common::StringList savenames;
Common::StringArray savenames;
savenames.resize(MAX_SAVE_GAMES+1);
Common::InSaveFile *inf;
inf = saveFileMan->openForLoading("SKY-VM.SAV");
@ -294,7 +294,7 @@ Common::Error SkyEngine::saveGameState(int slot, const char *desc) {
return Common::kWritePermissionDenied;
// Load current save game descriptions
Common::StringList saveGameTexts;
Common::StringArray saveGameTexts;
saveGameTexts.resize(MAX_SAVE_GAMES+1);
_skyControl->loadDescriptions(saveGameTexts);

6
engines/sword1/control.cpp
View file

@ -791,14 +791,14 @@ bool Control::restoreFromFile() {
void Control::readSavegameDescriptions() {
char saveName[40];
Common::String pattern = "sword1.???";
Common::StringList filenames = _saveFileMan->listSavefiles(pattern);
Common::StringArray filenames = _saveFileMan->listSavefiles(pattern);
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
_saveNames.clear();
int num = 0;
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 3 digits of the filename, since they correspond to the save slot
slotNum = atoi(file->c_str() + file->size() - 3);
@ -847,7 +847,7 @@ int Control::displayMessage(const char *altButton, const char *message, ...) {
bool Control::savegamesExist() {
Common::String pattern = "sword1.???";
Common::StringList saveNames = _saveFileMan->listSavefiles(pattern);
Common::StringArray saveNames = _saveFileMan->listSavefiles(pattern);
return saveNames.size() > 0;
}

4
engines/sword1/detection.cpp
View file

@ -228,11 +228,11 @@ SaveStateList SwordMetaEngine::listSaves(const char *target) const {
SaveStateList saveList;
char saveName[40];
Common::StringList filenames = saveFileMan->listSavefiles("sword1.???");
Common::StringArray filenames = saveFileMan->listSavefiles("sword1.???");
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
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 3 digits of the filename, since they correspond to the save slot
slotNum = atoi(file->c_str() + file->size() - 3);

2
engines/sword2/saveload.cpp
View file

@ -389,7 +389,7 @@ uint32 Sword2Engine::getSaveDescription(uint16 slotNo, byte *description) {
bool Sword2Engine::saveExists() {
Common::String pattern = _targetName + ".???";
Common::StringList filenames = _saveFileMan->listSavefiles(pattern);
Common::StringArray filenames = _saveFileMan->listSavefiles(pattern);
return !filenames.empty();
}

4
engines/sword2/sword2.cpp
View file

@ -184,7 +184,7 @@ GameList Sword2MetaEngine::detectGames(const Common::FSList &fslist) const {
SaveStateList Sword2MetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringList filenames;
Common::StringArray filenames;
char saveDesc[SAVE_DESCRIPTION_LEN];
Common::String pattern = target;
pattern += ".???";
@ -193,7 +193,7 @@ SaveStateList Sword2MetaEngine::listSaves(const char *target) const {
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
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 3 digits of the filename, since they correspond to the save slot
int slotNum = atoi(file->c_str() + file->size() - 3);

4
engines/teenagent/detection.cpp
View file

@ -121,11 +121,11 @@ public:
Common::String pattern = target;
pattern += ".*";
Common::StringList filenames = g_system->getSavefileManager()->listSavefiles(pattern);
Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles(pattern);
Common::sort(filenames.begin(), filenames.end());
SaveStateList saveList;
for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
int slot;
const char *ext = strrchr(file->c_str(), '.');
if (ext && (slot = atoi(ext + 1)) >= 0 && slot < MAX_SAVES) {

4
engines/tinsel/detection.cpp
View file

@ -684,12 +684,12 @@ extern int getList(Common::SaveFileManager *saveFileMan, const Common::String &t
SaveStateList TinselMetaEngine::listSaves(const char *target) const {
Common::String pattern = target;
pattern = pattern + ".???";
Common::StringList files = g_system->getSavefileManager()->listSavefiles(pattern);
Common::StringArray files = g_system->getSavefileManager()->listSavefiles(pattern);
sort(files.begin(), files.end()); // Sort (hopefully ensuring we are sorted numerically..)
SaveStateList saveList;
int slotNum = 0;
for (Common::StringList::const_iterator file = files.begin(); file != files.end(); ++file) {
for (Common::StringArray::const_iterator file = files.begin(); file != files.end(); ++file) {
// Obtain the last 3 digits of the filename, since they correspond to the save slot
slotNum = atoi(file->c_str() + file->size() - 3);

4
engines/tinsel/saveload.cpp
View file

@ -330,11 +330,11 @@ int getList(Common::SaveFileManager *saveFileMan, const Common::String &target)
int i;
const Common::String pattern = target + ".???";
Common::StringList files = saveFileMan->listSavefiles(pattern);
Common::StringArray files = saveFileMan->listSavefiles(pattern);
numSfiles = 0;
for (Common::StringList::const_iterator file = files.begin(); file != files.end(); ++file) {
for (Common::StringArray::const_iterator file = files.begin(); file != files.end(); ++file) {
if (numSfiles >= MAX_SAVED_FILES)
break;

4
engines/touche/detection.cpp
View file

@ -180,11 +180,11 @@ 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);
Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles(pattern);
bool slotsTable[Touche::kMaxSaveStates];
memset(slotsTable, 0, sizeof(slotsTable));
SaveStateList saveList;
for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
int slot = Touche::getGameStateFileSlot(file->c_str());
if (slot >= 0 && slot < Touche::kMaxSaveStates) {
slotsTable[slot] = true;

4
engines/touche/menu.cpp
View file

@ -377,8 +377,8 @@ 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);
for (Common::StringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it) {
Common::StringArray filenames = _saveFileMan->listSavefiles(gameStateFileName);
for (Common::StringArray::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);

4
engines/tucker/detection.cpp
View file

@ -173,11 +173,11 @@ public:
virtual SaveStateList listSaves(const char *target) const {
Common::String pattern = Tucker::generateGameStateFileName(target, 0, true);
Common::StringList filenames = g_system->getSavefileManager()->listSavefiles(pattern);
Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles(pattern);
bool slotsTable[Tucker::kLastSaveSlot + 1];
memset(slotsTable, 0, sizeof(slotsTable));
SaveStateList saveList;
for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
int slot;
const char *ext = strrchr(file->c_str(), '.');
if (ext && (slot = atoi(ext + 1)) >= 0 && slot <= Tucker::kLastSaveSlot) {