diff options
author | Max Horn | 2010-03-18 15:09:24 +0000 |
---|---|---|
committer | Max Horn | 2010-03-18 15:09:24 +0000 |
commit | c934642bdb7e6747a20054d7cc7b079e69bc22c2 (patch) | |
tree | 190d12bad5ed1cbabbd498d310f261c3a1c25bc9 /engines/sky | |
parent | 30c84d2cff41924e6229d0cacd3d36ce1c2bf6ac (diff) | |
download | scummvm-rg350-c934642bdb7e6747a20054d7cc7b079e69bc22c2.tar.gz scummvm-rg350-c934642bdb7e6747a20054d7cc7b079e69bc22c2.tar.bz2 scummvm-rg350-c934642bdb7e6747a20054d7cc7b079e69bc22c2.zip |
COMMON: Move typedef StringList from str.h to new header str-array.h
This removes the dependency on array.h from str.h.
Also, begun migration from the confusing type name "StringList" to
the more appropriate StringArray.
svn-id: r48282
Diffstat (limited to 'engines/sky')
-rw-r--r-- | engines/sky/control.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/sky/control.h b/engines/sky/control.h index 9c0e3c3cac..a0024ce73b 100644 --- a/engines/sky/control.h +++ b/engines/sky/control.h @@ -29,6 +29,7 @@ #include "common/events.h" #include "common/scummsys.h" +#include "common/str-array.h" class OSystem; namespace Common { @@ -194,8 +195,8 @@ public: uint16 _selectedGame; uint16 saveGameToFile(); - void loadDescriptions(Common::StringList &list); - void saveDescriptions(const Common::StringList &list); + void loadDescriptions(Common::StringArray &list); + void saveDescriptions(const Common::StringArray &list); private: int displayMessage(const char *altButton, const char *message, ...) GCC_PRINTF(3, 4); @@ -222,7 +223,7 @@ private: void drawCross(uint16 x, uint16 y); uint16 saveRestorePanel(bool allowSave); - void setUpGameSprites(const Common::StringList &saveGameNames, DataFileHeader **nameSprites, uint16 firstNum, uint16 selectedGame); + void setUpGameSprites(const Common::StringArray &saveGameNames, DataFileHeader **nameSprites, uint16 firstNum, uint16 selectedGame); void showSprites(DataFileHeader **nameSprites, bool allowSave); void handleKeyPress(Common::KeyState kbd, Common::String &textBuf); |