MOHAWK: Move Myst stack-specific code to its own directory

svn-id: r54648

6 files changed, 17 insertions, 15 deletions

diff --git a/engines/mohawk/module.mk b/engines/mohawk/module.mk
index 7af2db7b29..6d2253d3e5 100644
--- a/engines/mohawk/module.mk
+++ b/engines/mohawk/module.mk
@@ -14,8 +14,6 @@ MODULE_OBJS = \
 	myst_vars.o \
 	myst_saveload.o \
 	myst_scripts.o \
-	myst_scripts_myst.o \
-	myst_scripts_selenitic.o \
 	resource.o \
 	resource_cache.o \
 	riven.o \
@@ -24,7 +22,9 @@ MODULE_OBJS = \
 	riven_scripts.o \
 	riven_vars.o \
 	sound.o \
-	video.o
+	video.o \
+	myst_stacks/myst.o \
+	myst_stacks/selenitic.o
 
 
 # This module can be built as a plugin
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index b04e4f72d0..6cab8f8eec 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -32,14 +32,16 @@
 #include "mohawk/myst.h"
 #include "mohawk/myst_areas.h"
 #include "mohawk/myst_scripts.h"
-#include "mohawk/myst_scripts_myst.h"
-#include "mohawk/myst_scripts_selenitic.h"
 #include "mohawk/myst_saveload.h"
 #include "mohawk/dialogs.h"
 #include "mohawk/resource.h"
 #include "mohawk/resource_cache.h"
 #include "mohawk/video.h"
 
+// The stacks
+#include "mohawk/myst_stacks/myst.h"
+#include "mohawk/myst_stacks/selenitic.h"
+
 namespace Mohawk {
 
 MohawkEngine_Myst::MohawkEngine_Myst(OSystem *syst, const MohawkGameDescription *gamedesc) : MohawkEngine(syst, gamedesc) {
diff --git a/engines/mohawk/myst_scripts_myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index 92054e540e..cd6e375fd5 100644
--- a/engines/mohawk/myst_scripts_myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -18,17 +18,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/engines/mohawk/myst_scripts.cpp $
- * $Id: myst_scripts.cpp 54107 2010-11-07 01:03:29Z fingolfin $
+ * $URL$
+ * $Id$
  *
  */
 
 #include "mohawk/myst.h"
 #include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
-#include "mohawk/myst_scripts_myst.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
+#include "mohawk/myst_stacks/myst.h"
 
 #include "gui/message.h"
 
diff --git a/engines/mohawk/myst_scripts_myst.h b/engines/mohawk/myst_stacks/myst.h
index 3702e94954..ccdeb89860 100644
--- a/engines/mohawk/myst_scripts_myst.h
+++ b/engines/mohawk/myst_stacks/myst.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/engines/mohawk/myst_scripts.h $
- * $Id: myst_scripts.h 47541 2010-01-25 01:39:44Z lordhoto $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/engines/mohawk/myst_scripts_selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp
index 35896d4a8f..fde037dbcd 100644
--- a/engines/mohawk/myst_scripts_selenitic.cpp
+++ b/engines/mohawk/myst_stacks/selenitic.cpp
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/engines/mohawk/myst_scripts.cpp $
- * $Id: myst_scripts.cpp 54107 2010-11-07 01:03:29Z fingolfin $
+ * $URL$
+ * $Id$
  *
  */
 
@@ -27,10 +27,10 @@
 #include "mohawk/myst.h"
 #include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
-#include "mohawk/myst_scripts_selenitic.h"
 #include "mohawk/myst_saveload.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
+#include "mohawk/myst_stacks/selenitic.h"
 
 #include "gui/message.h"
 
diff --git a/engines/mohawk/myst_scripts_selenitic.h b/engines/mohawk/myst_stacks/selenitic.h
index 5b9cc52d24..8ea12012eb 100644
--- a/engines/mohawk/myst_scripts_selenitic.h
+++ b/engines/mohawk/myst_stacks/selenitic.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/engines/mohawk/myst_scripts.h $
- * $Id: myst_scripts.h 47541 2010-01-25 01:39:44Z lordhoto $
+ * $URL$
+ * $Id$
  *
  */