Pushed down dependencies from parser.h

svn-id: r39636

10 files changed, 22 insertions, 15 deletions

diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp
index c31d49a259..83601ff4c0 100644
--- a/engines/parallaction/callables_ns.cpp
+++ b/engines/parallaction/callables_ns.cpp
@@ -408,8 +408,8 @@ void Parallaction_ns::_c_testResult(void *parm) {
 	parseLocation("common");
 
 	uint id[2];
-	id[0] = _gfx->createLabel(_menuFont, _location._slideText[0], 1);
-	id[1] = _gfx->createLabel(_menuFont, _location._slideText[1], 1);
+	id[0] = _gfx->createLabel(_menuFont, _location._slideText[0].c_str(), 1);
+	id[1] = _gfx->createLabel(_menuFont, _location._slideText[1].c_str(), 1);
 
 	_gfx->showLabel(id[0], CENTER_LABEL_HORIZONTAL, 38);
 	_gfx->showLabel(id[1], CENTER_LABEL_HORIZONTAL, 58);
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index 200d180044..2f6ec9ddf6 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -27,6 +27,7 @@
 
 #include "common/config-manager.h"
 #include "parallaction/parallaction.h"
+#include "parallaction/parser.h"
 #include "parallaction/iff.h"
 
 
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index 3e61b0a66c..37104d7b0b 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -25,7 +25,7 @@
 
 #include "parallaction/iff.h"
 #include "common/config-manager.h"
-
+#include "parallaction/parser.h"
 #include "parallaction/parallaction.h"
 
 
diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp
index 4832661d62..daffe4393d 100644
--- a/engines/parallaction/objects.cpp
+++ b/engines/parallaction/objects.cpp
@@ -25,6 +25,7 @@
 
 #include "parallaction/parallaction.h"
 #include "parallaction/objects.h"
+#include "parallaction/parser.h"
 
 namespace Parallaction {
 
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 0e35182449..82d5d08e82 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -36,7 +36,6 @@
 
 #include "parallaction/input.h"
 #include "parallaction/inventory.h"
-#include "parallaction/parser.h"
 #include "parallaction/objects.h"
 #include "parallaction/disk.h"
 
@@ -126,6 +125,10 @@ class ProgramExec;
 class SoundMan;
 class SoundMan_ns;
 class SoundMan_br;
+class LocationParser_ns;
+class LocationParser_br;
+class ProgramParser_ns;
+class ProgramParser_br;
 
 
 struct Location {
@@ -148,7 +151,7 @@ struct Location {
 
 	// NS specific
 	PointList	_walkPoints;
-	char _slideText[2][MAX_TOKEN_LEN];
+	Common::String _slideText[2];
 
 	// BRA specific
 	int			_zeta0;
@@ -535,7 +538,7 @@ private:
 	LocationParser_br		*_locationParser;
 	ProgramParser_br		*_programParser;
 	SoundMan_br				*_soundManI;
-	
+
 	int32		_counters[32];
 	Table		*_countersNames;
 
diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
index 6fcf009a21..89166c8d19 100644
--- a/engines/parallaction/parallaction_br.cpp
+++ b/engines/parallaction/parallaction_br.cpp
@@ -29,6 +29,7 @@
 #include "parallaction/parallaction.h"
 #include "parallaction/exec.h"
 #include "parallaction/input.h"
+#include "parallaction/parser.h"
 #include "parallaction/saveload.h"
 #include "parallaction/sound.h"
 #include "parallaction/walk.h"
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index 211f6e573c..430894cb19 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -30,6 +30,7 @@
 #include "parallaction/parallaction.h"
 #include "parallaction/exec.h"
 #include "parallaction/input.h"
+#include "parallaction/parser.h"
 #include "parallaction/saveload.h"
 #include "parallaction/sound.h"
 #include "parallaction/walk.h"
@@ -173,7 +174,7 @@ Common::Error Parallaction_ns::init() {
 	} else {
 		_soundManI = new AmigaSoundMan_ns(this);
 	}
-	
+
 	_soundMan = new SoundMan(_soundManI);
 
 	initResources();
@@ -333,7 +334,7 @@ void Parallaction_ns::changeLocation() {
 
 	if (locname.hasSlide()) {
 		showSlide(locname.slide());
-		uint id = _gfx->createLabel(_menuFont, _location._slideText[0], 1);
+		uint id = _gfx->createLabel(_menuFont, _location._slideText[0].c_str(), 1);
 		_gfx->showLabel(id, CENTER_LABEL_HORIZONTAL, 14);
 		_gfx->updateScreen();
 
diff --git a/engines/parallaction/parser.cpp b/engines/parallaction/parser.cpp
index bfd16de73d..928f3f5b74 100644
--- a/engines/parallaction/parser.cpp
+++ b/engines/parallaction/parser.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "parallaction/parallaction.h"
+#include "parallaction/parser.h"
 
 
 namespace Parallaction {
diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp
index 5b44b47748..5f238215dc 100644
--- a/engines/parallaction/parser_br.cpp
+++ b/engines/parallaction/parser_br.cpp
@@ -25,7 +25,7 @@
 
 
 #include "parallaction/parallaction.h"
-
+#include "parallaction/parser.h"
 #include "parallaction/sound.h"
 
 namespace Parallaction {
@@ -812,9 +812,8 @@ void LocationParser_br::parseDoorData(ZonePtr z) {
 	do {
 
 		if (!scumm_stricmp(_tokens[0], "slidetext")) {
-			strcpy(_vm->_location._slideText[0], _tokens[1]);
-//				printf("%s\t", _slideText[0]);
-			strcpy(_vm->_location._slideText[1], _tokens[2]);
+			_vm->_location._slideText[0] = _tokens[1];
+			_vm->_location._slideText[1] = _tokens[2];
 		}
 
 		if (!scumm_stricmp(_tokens[0], "location")) {
diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp
index 909753e981..37aa9949c3 100644
--- a/engines/parallaction/parser_ns.cpp
+++ b/engines/parallaction/parser_ns.cpp
@@ -25,6 +25,7 @@
 
 
 #include "parallaction/parallaction.h"
+#include "parallaction/parser.h"
 #include "parallaction/sound.h"
 
 namespace Parallaction {
@@ -1443,9 +1444,8 @@ void LocationParser_ns::parseDoorData(ZonePtr z) {
 	do {
 
 		if (!scumm_stricmp(_tokens[0], "slidetext")) {
-			strcpy(_vm->_location._slideText[0], _tokens[1]);
-//				printf("%s\t", _slideText[0]);
-			strcpy(_vm->_location._slideText[1], _tokens[2]);
+			_vm->_location._slideText[0] = _tokens[1];
+			_vm->_location._slideText[1] = _tokens[2];
 		}
 
 		if (!scumm_stricmp(_tokens[0], "location")) {