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/cine | |
| 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/cine')
| -rw-r--r-- | engines/cine/msg.cpp | 2 | ||||
| -rw-r--r-- | engines/cine/msg.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp index a7cccf03c7..eb7167c6a3 100644 --- a/engines/cine/msg.cpp +++ b/engines/cine/msg.cpp @@ -31,6 +31,8 @@ namespace Cine { +// FIXME: Global C++ objects affect portability negatively. +// Turn this into a class member instead. Common::StringList messageTable; void loadMsg(char *pMsgName) { diff --git a/engines/cine/msg.h b/engines/cine/msg.h index ddf8ade8c2..cf51cdb48f 100644 --- a/engines/cine/msg.h +++ b/engines/cine/msg.h @@ -26,13 +26,13 @@ #ifndef CINE_MSG_H #define CINE_MSG_H -#include "common/str.h" +#include "common/str-array.h" namespace Cine { #define NUM_MAX_MESSAGE 255 -extern Common::StringList messageTable; +extern Common::StringArray messageTable; void loadMsg(char *pMsgName); |