aboutsummaryrefslogtreecommitdiff
path: root/engines/sky
diff options
context:
space:
mode:
authorMax Horn2010-03-18 15:54:40 +0000
committerMax Horn2010-03-18 15:54:40 +0000
commitcac0ac66e22d18a57958ef342e6b115e35197e90 (patch)
tree1fef12f458e84cdba353bd9b3ef45e3d00a63a16 /engines/sky
parent81a698d0a0a52115088825523950047d135b0ca0 (diff)
downloadscummvm-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/sky')
-rw-r--r--engines/sky/control.cpp8
-rw-r--r--engines/sky/detection.cpp10
2 files changed, 9 insertions, 9 deletions
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index 30c616f12d..7b59fa2726 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -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");
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index 8feffab6e6..e72875fa4e 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -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);