aboutsummaryrefslogtreecommitdiff
path: root/engines/agi
diff options
context:
space:
mode:
authorMax Horn2010-03-18 15:09:24 +0000
committerMax Horn2010-03-18 15:09:24 +0000
commitc934642bdb7e6747a20054d7cc7b079e69bc22c2 (patch)
tree190d12bad5ed1cbabbd498d310f261c3a1c25bc9 /engines/agi
parent30c84d2cff41924e6229d0cacd3d36ce1c2bf6ac (diff)
downloadscummvm-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/agi')
-rw-r--r--engines/agi/predictive.cpp2
-rw-r--r--engines/agi/sound.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index c4b6649563..153fec641a 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -67,7 +67,7 @@ void bringWordtoTop(char *str, int wordnum) {
// This function reorders the words on the given pred.dic line
// by moving the word at position 'wordnum' to the front (that is, right behind
// right behind the numerical code word at the start of the line).
- Common::StringList words;
+ Common::Array<Common::String> words;
char buf[MAXLINELEN];
if (!str)
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp
index 760dfd3320..24abf88c0e 100644
--- a/engines/agi/sound.cpp
+++ b/engines/agi/sound.cpp
@@ -26,6 +26,7 @@
#include "common/md5.h"
#include "common/config-manager.h"
#include "common/random.h"
+#include "common/str-array.h"
#include "agi/agi.h"