From c934642bdb7e6747a20054d7cc7b079e69bc22c2 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 18 Mar 2010 15:09:24 +0000
Subject: 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
---
 engines/mohawk/riven_scripts.cpp | 4 ++--
 engines/mohawk/riven_scripts.h   | 6 ++++--
 engines/mohawk/video/qdm2.h      | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'engines/mohawk')

diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp
index 911ee16028..e809ad9642 100644
--- a/engines/mohawk/riven_scripts.cpp
+++ b/engines/mohawk/riven_scripts.cpp
@@ -172,7 +172,7 @@ static void printTabs(byte tabs) {
 		printf ("\t");
 }
 
-void RivenScript::dumpScript(Common::StringList varNames, Common::StringList xNames, byte tabs) {
+void RivenScript::dumpScript(Common::StringArray varNames, Common::StringArray xNames, byte tabs) {
 	if (_stream->pos() != 0)
 		_stream->seek(0);
 
@@ -180,7 +180,7 @@ void RivenScript::dumpScript(Common::StringList varNames, Common::StringList xNa
 	dumpCommands(varNames, xNames, tabs + 1);
 }
 
-void RivenScript::dumpCommands(Common::StringList varNames, Common::StringList xNames, byte tabs) {
+void RivenScript::dumpCommands(Common::StringArray varNames, Common::StringArray xNames, byte tabs) {
 	uint16 commandCount = _stream->readUint16BE();
 
 	for (uint16 i = 0; i < commandCount; i++) {
diff --git a/engines/mohawk/riven_scripts.h b/engines/mohawk/riven_scripts.h
index 2879fa014d..f61abee36b 100644
--- a/engines/mohawk/riven_scripts.h
+++ b/engines/mohawk/riven_scripts.h
@@ -26,6 +26,8 @@
 #ifndef RIVEN_SCRIPTS_H
 #define RIVEN_SCRIPTS_H
 
+#include "common/str-array.h"
+
 class MohawkEngine_Riven;
 
 #define DECLARE_OPCODE(x) void x(uint16 op, uint16 argc, uint16 *argv)
@@ -55,7 +57,7 @@ public:
 	~RivenScript();
 
 	void runScript();
-	void dumpScript(Common::StringList varNames, Common::StringList xNames, byte tabs);
+	void dumpScript(Common::StringArray varNames, Common::StringArray xNames, byte tabs);
 	uint16 getScriptType() { return _scriptType; }
 
 	// Read in an array of script objects from a stream
@@ -74,7 +76,7 @@ private:
 	Common::SeekableReadStream *_stream;
 	uint16 _scriptType;
 
-	void dumpCommands(Common::StringList varNames, Common::StringList xNames, byte tabs);
+	void dumpCommands(Common::StringArray varNames, Common::StringArray xNames, byte tabs);
 	void processCommands(bool runCommands);
 
 	static uint32 calculateCommandSize(Common::SeekableReadStream* script);
diff --git a/engines/mohawk/video/qdm2.h b/engines/mohawk/video/qdm2.h
index a2f55a10ac..ffa5f77030 100644
--- a/engines/mohawk/video/qdm2.h
+++ b/engines/mohawk/video/qdm2.h
@@ -27,6 +27,7 @@
 #define MOHAWK_VIDEO_QDM2_H
 
 #include "sound/audiostream.h"
+#include "common/array.h"
 #include "common/stream.h"
 
 namespace Mohawk {
-- 
cgit v1.2.3