MOHAWK: MYST: Move the current stack id to ScriptParser

14 files changed, 17 insertions, 17 deletions

diff --git a/engines/mohawk/myst_stacks/channelwood.cpp b/engines/mohawk/myst_stacks/channelwood.cpp
index d1281fa5e0..7e4e5e12b1 100644
--- a/engines/mohawk/myst_stacks/channelwood.cpp
+++ b/engines/mohawk/myst_stacks/channelwood.cpp
@@ -38,7 +38,7 @@ namespace Mohawk {
 namespace MystStacks {
 
 Channelwood::Channelwood(MohawkEngine_Myst *vm) :
-		MystScriptParser(vm),
+		MystScriptParser(vm, kChannelwoodStack),
 		_state(vm->_gameState->_channelwood),
 		_valveVar(0),
 		_siriusDrawerState(0),
diff --git a/engines/mohawk/myst_stacks/credits.cpp b/engines/mohawk/myst_stacks/credits.cpp
index 135aded96c..423dc9c216 100644
--- a/engines/mohawk/myst_stacks/credits.cpp
+++ b/engines/mohawk/myst_stacks/credits.cpp
@@ -37,7 +37,7 @@ namespace MystStacks {
 // NOTE: Credits Start Card is 10000
 
 Credits::Credits(MohawkEngine_Myst *vm) :
-		MystScriptParser(vm),
+		MystScriptParser(vm, kCreditsStack),
 		_creditsRunning(false),
 		_curImage(0) {
 	setupOpcodes();
diff --git a/engines/mohawk/myst_stacks/demo.cpp b/engines/mohawk/myst_stacks/demo.cpp
index d2ba70c198..b98a16d73e 100644
--- a/engines/mohawk/myst_stacks/demo.cpp
+++ b/engines/mohawk/myst_stacks/demo.cpp
@@ -31,7 +31,7 @@ namespace Mohawk {
 namespace MystStacks {
 
 Demo::Demo(MohawkEngine_Myst *vm) :
-		Intro(vm),
+		Intro(vm, kDemoStack),
 		_returnToMenuRunning(false),
 		_returnToMenuStep(0),
 		_returnToMenuNextTime(0) {
@@ -86,7 +86,7 @@ void Demo::returnToMenu_run() {
 	if (time < _returnToMenuNextTime)
 		return;
 
-	switch (_returnToMenuStep){
+	switch (_returnToMenuStep) {
 	case 0:
 		_vm->_gfx->fadeToBlack();
 		_vm->changeToCard(2003, kNoTransition);
diff --git a/engines/mohawk/myst_stacks/dni.cpp b/engines/mohawk/myst_stacks/dni.cpp
index a38b5d3857..bb1adf2353 100644
--- a/engines/mohawk/myst_stacks/dni.cpp
+++ b/engines/mohawk/myst_stacks/dni.cpp
@@ -34,7 +34,7 @@ namespace Mohawk {
 namespace MystStacks {
 
 Dni::Dni(MohawkEngine_Myst *vm) :
-		MystScriptParser(vm),
+		MystScriptParser(vm, kDniStack),
 		_notSeenAtrus(true),
 		_atrusRunning(false),
 		_waitForLoop(false),
diff --git a/engines/mohawk/myst_stacks/intro.cpp b/engines/mohawk/myst_stacks/intro.cpp
index 9e03713b0f..f6a7987b25 100644
--- a/engines/mohawk/myst_stacks/intro.cpp
+++ b/engines/mohawk/myst_stacks/intro.cpp
@@ -31,8 +31,8 @@
 namespace Mohawk {
 namespace MystStacks {
 
-Intro::Intro(MohawkEngine_Myst *vm) :
-		MystScriptParser(vm),
+Intro::Intro(MohawkEngine_Myst *vm, MystStack stackId) :
+		MystScriptParser(vm, stackId),
 		_introMoviesRunning(false),
 		_introStep(0),
 		_linkBookRunning(false),
diff --git a/engines/mohawk/myst_stacks/intro.h b/engines/mohawk/myst_stacks/intro.h
index ec78199802..06a1e03290 100644
--- a/engines/mohawk/myst_stacks/intro.h
+++ b/engines/mohawk/myst_stacks/intro.h
@@ -38,7 +38,7 @@ namespace MystStacks {
 
 class Intro : public MystScriptParser {
 public:
-	explicit Intro(MohawkEngine_Myst *vm);
+	explicit Intro(MohawkEngine_Myst *vm, MystStack stackId = kIntroStack);
 	~Intro() override;
 
 	void disablePersistentScripts() override;
diff --git a/engines/mohawk/myst_stacks/makingof.cpp b/engines/mohawk/myst_stacks/makingof.cpp
index 4e0ce516b8..7e57f98aa1 100644
--- a/engines/mohawk/myst_stacks/makingof.cpp
+++ b/engines/mohawk/myst_stacks/makingof.cpp
@@ -31,7 +31,7 @@ namespace Mohawk {
 namespace MystStacks {
 
 MakingOf::MakingOf(MohawkEngine_Myst *vm) :
-		MystScriptParser(vm) {
+		MystScriptParser(vm, kMakingOfStack) {
 	setupOpcodes();
 }
 
diff --git a/engines/mohawk/myst_stacks/mechanical.cpp b/engines/mohawk/myst_stacks/mechanical.cpp
index 495f40bee2..5c0e273913 100644
--- a/engines/mohawk/myst_stacks/mechanical.cpp
+++ b/engines/mohawk/myst_stacks/mechanical.cpp
@@ -37,7 +37,7 @@ namespace Mohawk {
 namespace MystStacks {
 
 Mechanical::Mechanical(MohawkEngine_Myst *vm) :
-		MystScriptParser(vm),
+		MystScriptParser(vm, kMechanicalStack),
 		_state(vm->_gameState->_mechanical) {
 	setupOpcodes();
 
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index a3e5685be1..03f4a3faf7 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -37,8 +37,8 @@
 namespace Mohawk {
 namespace MystStacks {
 
-Myst::Myst(MohawkEngine_Myst *vm) :
-		MystScriptParser(vm),
+Myst::Myst(MohawkEngine_Myst *vm, MystStack stackId) :
+		MystScriptParser(vm, stackId),
 		_state(_vm->_gameState->_myst),
 		_towerRotationCenter(Common::Point(383, 124)) {
 	setupOpcodes();
diff --git a/engines/mohawk/myst_stacks/myst.h b/engines/mohawk/myst_stacks/myst.h
index ee89af115d..3739630379 100644
--- a/engines/mohawk/myst_stacks/myst.h
+++ b/engines/mohawk/myst_stacks/myst.h
@@ -37,7 +37,7 @@ namespace MystStacks {
 
 class Myst : public MystScriptParser {
 public:
-	explicit Myst(MohawkEngine_Myst *vm);
+	explicit Myst(MohawkEngine_Myst *vm, MystStack stackId = kMystStack);
 	~Myst() override;
 
 	void disablePersistentScripts() override;
diff --git a/engines/mohawk/myst_stacks/preview.cpp b/engines/mohawk/myst_stacks/preview.cpp
index 348a195dea..8348c45478 100644
--- a/engines/mohawk/myst_stacks/preview.cpp
+++ b/engines/mohawk/myst_stacks/preview.cpp
@@ -35,7 +35,7 @@ namespace Mohawk {
 namespace MystStacks {
 
 Preview::Preview(MohawkEngine_Myst *vm) :
-		Myst(vm) {
+		Myst(vm, kDemoPreviewStack) {
 	setupOpcodes();
 	_vm->_cursor->hideCursor();
 
diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp
index 8d95cb5172..4ef7828a69 100644
--- a/engines/mohawk/myst_stacks/selenitic.cpp
+++ b/engines/mohawk/myst_stacks/selenitic.cpp
@@ -37,7 +37,7 @@ namespace Mohawk {
 namespace MystStacks {
 
 Selenitic::Selenitic(MohawkEngine_Myst *vm) :
-		MystScriptParser(vm),
+		MystScriptParser(vm, kSeleniticStack),
 		_state(vm->_gameState->_selenitic) {
 	setupOpcodes();
 
diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp
index 25d5cf480d..7524dde77d 100644
--- a/engines/mohawk/myst_stacks/slides.cpp
+++ b/engines/mohawk/myst_stacks/slides.cpp
@@ -34,7 +34,7 @@ namespace Mohawk {
 namespace MystStacks {
 
 Slides::Slides(MohawkEngine_Myst *vm) :
-		MystScriptParser(vm) {
+		MystScriptParser(vm, kDemoSlidesStack) {
 	setupOpcodes();
 
 	_vm->_cursor->hideCursor();
diff --git a/engines/mohawk/myst_stacks/stoneship.cpp b/engines/mohawk/myst_stacks/stoneship.cpp
index 0ae78c17d8..3791972325 100644
--- a/engines/mohawk/myst_stacks/stoneship.cpp
+++ b/engines/mohawk/myst_stacks/stoneship.cpp
@@ -38,7 +38,7 @@ namespace Mohawk {
 namespace MystStacks {
 
 Stoneship::Stoneship(MohawkEngine_Myst *vm) :
-		MystScriptParser(vm),
+		MystScriptParser(vm, kStoneshipStack),
 		_state(vm->_gameState->_stoneship) {
 	setupOpcodes();