diff options
Diffstat (limited to 'engines/cine')
-rw-r--r-- | engines/cine/cine.h | 2 | ||||
-rw-r--r-- | engines/cine/detection.cpp | 4 | ||||
-rw-r--r-- | engines/cine/gfx.cpp | 2 | ||||
-rw-r--r-- | engines/cine/gfx.h | 4 | ||||
-rw-r--r-- | engines/cine/msg.cpp | 2 | ||||
-rw-r--r-- | engines/cine/various.cpp | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/engines/cine/cine.h b/engines/cine/cine.h index 911577e89e..77d4866363 100644 --- a/engines/cine/cine.h +++ b/engines/cine/cine.h @@ -130,7 +130,7 @@ public: Common::RandomSource _rnd; - Common::StringList _volumeResourceFiles; + Common::StringArray _volumeResourceFiles; StringPtrHashMap _volumeEntriesMap; TextHandler _textHandler; diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 3b5ca670d0..fcfa1f7f20 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -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"; diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp index 3370688d1d..f55cae1277 100644 --- a/engines/cine/gfx.cpp +++ b/engines/cine/gfx.cpp @@ -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) { } diff --git a/engines/cine/gfx.h b/engines/cine/gfx.h index caf9b44ba7..64e9730720 100644 --- a/engines/cine/gfx.h +++ b/engines/cine/gfx.h @@ -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; }; diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp index eb7167c6a3..45f81f7d05 100644 --- a/engines/cine/msg.cpp +++ b/engines/cine/msg.cpp @@ -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; diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp index e7c7f9b938..f8588b1bc5 100644 --- a/engines/cine/various.cpp +++ b/engines/cine/various.cpp @@ -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); |