MOHAWK: Put togeter the Myst stack classes in a namespace

25 files changed, 96 insertions, 40 deletions

diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index d8c9786fcf..2150b9668a 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -417,45 +417,45 @@ void MohawkEngine_Myst::changeToStack(uint16 stack, uint16 card, uint16 linkSrcS
 	switch (_curStack) {
 	case kChannelwoodStack:
 		_gameState->_globals.currentAge = 4;
-		_scriptParser = new MystScriptParser_Channelwood(this);
+		_scriptParser = new MystStacks::MystScriptParser_Channelwood(this);
 		break;
 	case kCreditsStack:
-		_scriptParser = new MystScriptParser_Credits(this);
+		_scriptParser = new MystStacks::MystScriptParser_Credits(this);
 		break;
 	case kDemoStack:
-		_scriptParser = new MystScriptParser_Demo(this);
+		_scriptParser = new MystStacks::MystScriptParser_Demo(this);
 		break;
 	case kDniStack:
 		_gameState->_globals.currentAge = 6;
-		_scriptParser = new MystScriptParser_Dni(this);
+		_scriptParser = new MystStacks::MystScriptParser_Dni(this);
 		break;
 	case kIntroStack:
-		_scriptParser = new MystScriptParser_Intro(this);
+		_scriptParser = new MystStacks::MystScriptParser_Intro(this);
 		break;
 	case kMakingOfStack:
-		_scriptParser = new MystScriptParser_MakingOf(this);
+		_scriptParser = new MystStacks::MystScriptParser_MakingOf(this);
 		break;
 	case kMechanicalStack:
 		_gameState->_globals.currentAge = 3;
-		_scriptParser = new MystScriptParser_Mechanical(this);
+		_scriptParser = new MystStacks::MystScriptParser_Mechanical(this);
 		break;
 	case kMystStack:
 		_gameState->_globals.currentAge = 2;
-		_scriptParser = new MystScriptParser_Myst(this);
+		_scriptParser = new MystStacks::MystScriptParser_Myst(this);
 		break;
 	case kDemoPreviewStack:
-		_scriptParser = new MystScriptParser_Preview(this);
+		_scriptParser = new MystStacks::MystScriptParser_Preview(this);
 		break;
 	case kSeleniticStack:
 		_gameState->_globals.currentAge = 0;
-		_scriptParser = new MystScriptParser_Selenitic(this);
+		_scriptParser = new MystStacks::MystScriptParser_Selenitic(this);
 		break;
 	case kDemoSlidesStack:
-		_scriptParser = new MystScriptParser_Slides(this);
+		_scriptParser = new MystStacks::MystScriptParser_Slides(this);
 		break;
 	case kStoneshipStack:
 		_gameState->_globals.currentAge = 1;
-		_scriptParser = new MystScriptParser_Stoneship(this);
+		_scriptParser = new MystStacks::MystScriptParser_Stoneship(this);
 		break;
 	default:
 		error("Unknown Myst stack");
diff --git a/engines/mohawk/myst_stacks/channelwood.cpp b/engines/mohawk/myst_stacks/channelwood.cpp
index 6e367d0167..e2598ef880 100644
--- a/engines/mohawk/myst_stacks/channelwood.cpp
+++ b/engines/mohawk/myst_stacks/channelwood.cpp
@@ -35,6 +35,7 @@
 #include "gui/message.h"
 
 namespace Mohawk {
+namespace MystStacks {
 
 MystScriptParser_Channelwood::MystScriptParser_Channelwood(MohawkEngine_Myst *vm) :
 		MystScriptParser(vm), _state(vm->_gameState->_channelwood) {
@@ -738,4 +739,5 @@ void MystScriptParser_Channelwood::o_drawer_init(uint16 op, uint16 var, uint16 a
 	_siriusDrawerState = 0;
 }
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/channelwood.h b/engines/mohawk/myst_stacks/channelwood.h
index 8c52f864cd..b74cefc881 100644
--- a/engines/mohawk/myst_stacks/channelwood.h
+++ b/engines/mohawk/myst_stacks/channelwood.h
@@ -32,11 +32,13 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_Channelwood : public MystScriptParser {
 public:
 	MystScriptParser_Channelwood(MohawkEngine_Myst *vm);
@@ -99,6 +101,7 @@ private:
 	bool pipeChangeValve(bool open, uint16 mask);
 };
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
 
 #undef DECLARE_OPCODE
diff --git a/engines/mohawk/myst_stacks/credits.cpp b/engines/mohawk/myst_stacks/credits.cpp
index 6c0b2c2951..9e2a5c8baf 100644
--- a/engines/mohawk/myst_stacks/credits.cpp
+++ b/engines/mohawk/myst_stacks/credits.cpp
@@ -33,6 +33,7 @@
 #include "gui/message.h"
 
 namespace Mohawk {
+namespace MystStacks {
 
 // NOTE: Credits Start Card is 10000
 
@@ -97,4 +98,5 @@ void MystScriptParser_Credits::o_runCredits(uint16 op, uint16 var, uint16 argc,
 	_startTime = _vm->_system->getMillis();
 }
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/credits.h b/engines/mohawk/myst_stacks/credits.h
index 46d23c67ca..5e71be2d36 100644
--- a/engines/mohawk/myst_stacks/credits.h
+++ b/engines/mohawk/myst_stacks/credits.h
@@ -32,11 +32,13 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_Credits : public MystScriptParser {
 public:
 	MystScriptParser_Credits(MohawkEngine_Myst *vm);
@@ -55,6 +57,7 @@ private:
 	uint16 _curImage; // 56
 };
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
 
 #undef DECLARE_OPCODE
diff --git a/engines/mohawk/myst_stacks/demo.cpp b/engines/mohawk/myst_stacks/demo.cpp
index 548a2d5390..6937931f74 100644
--- a/engines/mohawk/myst_stacks/demo.cpp
+++ b/engines/mohawk/myst_stacks/demo.cpp
@@ -29,6 +29,7 @@
 #include "gui/message.h"
 
 namespace Mohawk {
+namespace MystStacks {
 
 MystScriptParser_Demo::MystScriptParser_Demo(MohawkEngine_Myst *vm) : MystScriptParser_Intro(vm) {
 	setupOpcodes();
@@ -123,4 +124,5 @@ void MystScriptParser_Demo::opcode_300(uint16 op, uint16 var, uint16 argc, uint1
 	// TODO: Fill in Function...
 }
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/demo.h b/engines/mohawk/myst_stacks/demo.h
index f693ea4c35..8b33e76e2c 100644
--- a/engines/mohawk/myst_stacks/demo.h
+++ b/engines/mohawk/myst_stacks/demo.h
@@ -32,11 +32,13 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_Demo : public MystScriptParser_Intro {
 public:
 	MystScriptParser_Demo(MohawkEngine_Myst *vm);
@@ -59,6 +61,7 @@ private:
 	bool _enabled201;
 };
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
 
 #undef DECLARE_OPCODE
diff --git a/engines/mohawk/myst_stacks/dni.cpp b/engines/mohawk/myst_stacks/dni.cpp
index 47382b7b81..361666a1b3 100644
--- a/engines/mohawk/myst_stacks/dni.cpp
+++ b/engines/mohawk/myst_stacks/dni.cpp
@@ -32,6 +32,7 @@
 #include "mohawk/myst_stacks/dni.h"
 
 namespace Mohawk {
+namespace MystStacks {
 
 MystScriptParser_Dni::MystScriptParser_Dni(MohawkEngine_Myst *vm) :
 		MystScriptParser(vm) {
@@ -194,4 +195,5 @@ void MystScriptParser_Dni::o_atrus_init(uint16 op, uint16 var, uint16 argc, uint
 	_atrusRunning = true;
 }
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/dni.h b/engines/mohawk/myst_stacks/dni.h
index 85900ad562..bd7c586786 100644
--- a/engines/mohawk/myst_stacks/dni.h
+++ b/engines/mohawk/myst_stacks/dni.h
@@ -32,11 +32,13 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_Dni : public MystScriptParser {
 public:
 	MystScriptParser_Dni(MohawkEngine_Myst *vm);
@@ -67,6 +69,7 @@ private:
 	bool _atrusLeft; // 80
 };
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
 
 #undef DECLARE_OPCODE
diff --git a/engines/mohawk/myst_stacks/intro.cpp b/engines/mohawk/myst_stacks/intro.cpp
index a4a8cf2a89..60ab7b8a04 100644
--- a/engines/mohawk/myst_stacks/intro.cpp
+++ b/engines/mohawk/myst_stacks/intro.cpp
@@ -34,6 +34,7 @@
 #include "gui/message.h"
 
 namespace Mohawk {
+namespace MystStacks {
 
 MystScriptParser_Intro::MystScriptParser_Intro(MohawkEngine_Myst *vm) : MystScriptParser(vm) {
 	setupOpcodes();
@@ -183,4 +184,5 @@ void MystScriptParser_Intro::o_mystLinkBook_init(uint16 op, uint16 var, uint16 a
 	_linkBookRunning = true;
 }
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/intro.h b/engines/mohawk/myst_stacks/intro.h
index a40d268d7d..9aabd9f255 100644
--- a/engines/mohawk/myst_stacks/intro.h
+++ b/engines/mohawk/myst_stacks/intro.h
@@ -32,12 +32,14 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 class MystResourceType6;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_Intro : public MystScriptParser {
 public:
 	MystScriptParser_Intro(MohawkEngine_Myst *vm);
@@ -65,6 +67,7 @@ private:
 	MystResourceType6 *_linkBookMovie;
 };
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
 
 #undef DECLARE_OPCODE
diff --git a/engines/mohawk/myst_stacks/makingof.cpp b/engines/mohawk/myst_stacks/makingof.cpp
index 28b8665f52..16167ba96a 100644
--- a/engines/mohawk/myst_stacks/makingof.cpp
+++ b/engines/mohawk/myst_stacks/makingof.cpp
@@ -33,6 +33,7 @@
 #include "gui/message.h"
 
 namespace Mohawk {
+namespace MystStacks {
 
 MystScriptParser_MakingOf::MystScriptParser_MakingOf(MohawkEngine_Myst *vm) : MystScriptParser(vm) {
 	setupOpcodes();
@@ -56,4 +57,5 @@ void MystScriptParser_MakingOf::disablePersistentScripts() {
 void MystScriptParser_MakingOf::runPersistentScripts() {
 }
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/makingof.h b/engines/mohawk/myst_stacks/makingof.h
index ab919fd174..495bc432e8 100644
--- a/engines/mohawk/myst_stacks/makingof.h
+++ b/engines/mohawk/myst_stacks/makingof.h
@@ -32,11 +32,13 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_MakingOf : public MystScriptParser {
 public:
 	MystScriptParser_MakingOf(MohawkEngine_Myst *vm);
@@ -49,6 +51,7 @@ private:
 	void setupOpcodes();
 };
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
 
 #undef DECLARE_OPCODE
diff --git a/engines/mohawk/myst_stacks/mechanical.cpp b/engines/mohawk/myst_stacks/mechanical.cpp
index b1f30933c2..33d3f0bf6f 100644
--- a/engines/mohawk/myst_stacks/mechanical.cpp
+++ b/engines/mohawk/myst_stacks/mechanical.cpp
@@ -34,6 +34,7 @@
 #include "gui/message.h"
 
 namespace Mohawk {
+namespace MystStacks {
 
 MystScriptParser_Mechanical::MystScriptParser_Mechanical(MohawkEngine_Myst *vm) :
 		MystScriptParser(vm), _state(vm->_gameState->_mechanical) {
@@ -537,4 +538,5 @@ void MystScriptParser_Mechanical::opcode_300(uint16 op, uint16 var, uint16 argc,
 	// TODO: Fill in Logic. Clearing Variable for View?
 }
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/mechanical.h b/engines/mohawk/myst_stacks/mechanical.h
index 1853a56418..35cfab068b 100644
--- a/engines/mohawk/myst_stacks/mechanical.h
+++ b/engines/mohawk/myst_stacks/mechanical.h
@@ -32,11 +32,13 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_Mechanical : public MystScriptParser {
 public:
 	MystScriptParser_Mechanical(MohawkEngine_Myst *vm);
@@ -100,6 +102,7 @@ private:
 	MystResourceType6 *_snakeBox; // 156
 };
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
 
 #undef DECLARE_OPCODE
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index 3bcc83527b..af4888582e 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -37,8 +37,7 @@
 #include "gui/message.h"
 
 namespace Mohawk {
-
-// NOTE: Credits Start Card is 10000
+namespace MystStacks {
 
 MystScriptParser_Myst::MystScriptParser_Myst(MohawkEngine_Myst *vm) :
 		MystScriptParser(vm), _state(_vm->_gameState->_myst) {
@@ -3646,4 +3645,5 @@ void MystScriptParser_Myst::o_generatorControlRoom_exit(uint16 op, uint16 var, u
 	_generatorVoltage = _state.generatorVoltage;
 }
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/myst.h b/engines/mohawk/myst_stacks/myst.h
index e41527a5b8..3b759160b1 100644
--- a/engines/mohawk/myst_stacks/myst.h
+++ b/engines/mohawk/myst_stacks/myst.h
@@ -32,11 +32,13 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_Myst : public MystScriptParser {
 public:
 	MystScriptParser_Myst(MohawkEngine_Myst *vm);
@@ -333,6 +335,7 @@ private:
 	void observatoryUpdateTime();
 };
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
 
 #undef DECLARE_OPCODE
diff --git a/engines/mohawk/myst_stacks/preview.cpp b/engines/mohawk/myst_stacks/preview.cpp
index bbf324714b..354e353936 100644
--- a/engines/mohawk/myst_stacks/preview.cpp
+++ b/engines/mohawk/myst_stacks/preview.cpp
@@ -33,6 +33,7 @@
 #include "gui/message.h"
 
 namespace Mohawk {
+namespace MystStacks {
 
 MystScriptParser_Preview::MystScriptParser_Preview(MohawkEngine_Myst *vm) : MystScriptParser_Myst(vm) {
 	setupOpcodes();
@@ -135,4 +136,5 @@ void MystScriptParser_Preview::opcode_299(uint16 op, uint16 var, uint16 argc, ui
 	// can change the Myst Library to Red..
 }
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/preview.h b/engines/mohawk/myst_stacks/preview.h
index 25f0ab514f..bd0d2e7869 100644
--- a/engines/mohawk/myst_stacks/preview.h
+++ b/engines/mohawk/myst_stacks/preview.h
@@ -32,11 +32,13 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_Preview : public MystScriptParser_Myst {
 public:
 	MystScriptParser_Preview(MohawkEngine_Myst *vm);
@@ -54,6 +56,7 @@ private:
 	DECLARE_OPCODE(opcode_299);
 };
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
 
 #undef DECLARE_OPCODE
diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp
index 3e00d242be..a9c77af7bd 100644
--- a/engines/mohawk/myst_stacks/selenitic.cpp
+++ b/engines/mohawk/myst_stacks/selenitic.cpp
@@ -35,6 +35,7 @@
 #include "gui/message.h"
 
 namespace Mohawk {
+namespace MystStacks {
 
 MystScriptParser_Selenitic::MystScriptParser_Selenitic(MohawkEngine_Myst *vm) :
 		MystScriptParser(vm), _state(vm->_gameState->_selenitic) {
@@ -1723,4 +1724,5 @@ const uint8 MystScriptParser_Selenitic::_mazeRunnerVideos[300][4] = {
 	{0, 0, 0, 0}
 };
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/selenitic.h b/engines/mohawk/myst_stacks/selenitic.h
index 54e9db4d66..d758a318ca 100644
--- a/engines/mohawk/myst_stacks/selenitic.h
+++ b/engines/mohawk/myst_stacks/selenitic.h
@@ -32,12 +32,14 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 class MystResourceType8;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_Selenitic : public MystScriptParser {
 public:
 	MystScriptParser_Selenitic(MohawkEngine_Myst *vm);
@@ -135,6 +137,7 @@ private:
 	void mazeRunnerBacktrack(uint16 &oldPosition);
 };
 
+} // End of namespace MystStacks
 }
 
 #undef DECLARE_OPCODE
diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp
index 128505d266..0fb7eb2456 100644
--- a/engines/mohawk/myst_stacks/slides.cpp
+++ b/engines/mohawk/myst_stacks/slides.cpp
@@ -33,8 +33,7 @@
 #include "gui/message.h"
 
 namespace Mohawk {
-
-// NOTE: Credits Start Card is 10000
+namespace MystStacks {
 
 MystScriptParser_Slides::MystScriptParser_Slides(MohawkEngine_Myst *vm) : MystScriptParser(vm) {
 	setupOpcodes();
@@ -81,4 +80,5 @@ void MystScriptParser_Slides::o_setCardSwap(uint16 op, uint16 var, uint16 argc,
 		unknown(op, var, argc, argv);
 }
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/slides.h b/engines/mohawk/myst_stacks/slides.h
index 7230eead25..6799556f31 100644
--- a/engines/mohawk/myst_stacks/slides.h
+++ b/engines/mohawk/myst_stacks/slides.h
@@ -32,11 +32,13 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_Slides : public MystScriptParser {
 public:
 	MystScriptParser_Slides(MohawkEngine_Myst *vm);
@@ -57,6 +59,7 @@ private:
 	uint32 _lastCardTime;
 };
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
 
 #undef DECLARE_OPCODE
diff --git a/engines/mohawk/myst_stacks/stoneship.cpp b/engines/mohawk/myst_stacks/stoneship.cpp
index ebf7f75d88..1b6a18d701 100644
--- a/engines/mohawk/myst_stacks/stoneship.cpp
+++ b/engines/mohawk/myst_stacks/stoneship.cpp
@@ -35,6 +35,7 @@
 #include "gui/message.h"
 
 namespace Mohawk {
+namespace MystStacks {
 
 MystScriptParser_Stoneship::MystScriptParser_Stoneship(MohawkEngine_Myst *vm) :
 		MystScriptParser(vm), _state(vm->_gameState->_stoneship) {
@@ -990,4 +991,5 @@ void MystScriptParser_Stoneship::o_cloudOrb_init(uint16 op, uint16 var, uint16 a
 	_cloudOrbStopSound = argv[1];
 }
 
+} // End of namespace MystStacks
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_stacks/stoneship.h b/engines/mohawk/myst_stacks/stoneship.h
index eb58bd6543..3845121707 100644
--- a/engines/mohawk/myst_stacks/stoneship.h
+++ b/engines/mohawk/myst_stacks/stoneship.h
@@ -32,11 +32,13 @@
 
 namespace Mohawk {
 
-#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
-
 class MohawkEngine_Myst;
 struct MystScriptEntry;
 
+namespace MystStacks {
+
+#define DECLARE_OPCODE(x) void x(uint16 op, uint16 var, uint16 argc, uint16 *argv)
+
 class MystScriptParser_Stoneship : public MystScriptParser {
 public:
 	MystScriptParser_Stoneship(MohawkEngine_Myst *vm);
@@ -142,6 +144,7 @@ private:
 	uint16 batteryRemainingCharge();
 };
 
+} // End of namespace MystStacks
 }
 
 #undef DECLARE_OPCODE