MOHAWK: Prepare empty classes for the Riven stacks

21 files changed, 726 insertions, 2 deletions

diff --git a/engines/mohawk/module.mk b/engines/mohawk/module.mk
index 7de2a1636c..2f6d2165f2 100644
--- a/engines/mohawk/module.mk
+++ b/engines/mohawk/module.mk
@@ -60,7 +60,16 @@ MODULE_OBJS += \
 	riven_scripts.o \
 	riven_sound.o \
 	riven_stack.o \
-	riven_vars.o
+	riven_vars.o \
+	riven_stacks/aspit.o \
+	riven_stacks/bspit.o \
+	riven_stacks/domespit.o \
+	riven_stacks/gspit.o \
+	riven_stacks/jspit.o \
+	riven_stacks/ospit.o \
+	riven_stacks/pspit.o \
+	riven_stacks/rspit.o \
+	riven_stacks/tspit.o
 endif
 
 # This module can be built as a plugin
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 485d4bb174..d6c6754c66 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -37,6 +37,14 @@
 #include "mohawk/riven_saveload.h"
 #include "mohawk/riven_sound.h"
 #include "mohawk/riven_stack.h"
+#include "mohawk/riven_stacks/aspit.h"
+#include "mohawk/riven_stacks/bspit.h"
+#include "mohawk/riven_stacks/gspit.h"
+#include "mohawk/riven_stacks/jspit.h"
+#include "mohawk/riven_stacks/ospit.h"
+#include "mohawk/riven_stacks/pspit.h"
+#include "mohawk/riven_stacks/rspit.h"
+#include "mohawk/riven_stacks/tspit.h"
 #include "mohawk/dialogs.h"
 #include "mohawk/video.h"
 #include "mohawk/console.h"
@@ -341,7 +349,30 @@ void MohawkEngine_Riven::changeToStack(uint16 n) {
 	_sound->stopAllSLST();
 
 	delete _stack;
-	_stack = new RivenStack(this, n);
+	_stack = constructStackById(n);
+}
+
+RivenStack *MohawkEngine_Riven::constructStackById(uint16 id) {
+	switch (id) {
+		case kStackAspit:
+			return new RivenStacks::ASpit(this);
+		case kStackBspit:
+			return new RivenStacks::BSpit(this);
+		case kStackGspit:
+			return new RivenStacks::GSpit(this);
+		case kStackJspit:
+			return new RivenStacks::JSpit(this);
+		case kStackOspit:
+			return new RivenStacks::OSpit(this);
+		case kStackPspit:
+			return new RivenStacks::PSpit(this);
+		case kStackRspit:
+			return new RivenStacks::RSpit(this);
+		case kStackTspit:
+			return new RivenStacks::TSpit(this);
+		default:
+			error("Unknown stack id '%d'", id);
+	}
 }
 
 // Riven uses some hacks to change stacks for linking books
diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h
index 84b8f975b5..6d268d92aa 100644
--- a/engines/mohawk/riven.h
+++ b/engines/mohawk/riven.h
@@ -172,6 +172,8 @@ public:
 	void installCardTimer();
 	void checkTimer();
 	void removeTimer();
+
+	RivenStack *constructStackById(uint16 id);
 };
 
 } // End of namespace Mohawk
diff --git a/engines/mohawk/riven_stacks/aspit.cpp b/engines/mohawk/riven_stacks/aspit.cpp
new file mode 100644
index 0000000000..f8aa53af8a
--- /dev/null
+++ b/engines/mohawk/riven_stacks/aspit.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "mohawk/riven_stacks/aspit.h"
+
+#include "engines/mohawk/riven.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+ASpit::ASpit(MohawkEngine_Riven *vm) :
+		RivenStack(vm, kStackAspit) {
+
+}
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
diff --git a/engines/mohawk/riven_stacks/aspit.h b/engines/mohawk/riven_stacks/aspit.h
new file mode 100644
index 0000000000..3a55714e00
--- /dev/null
+++ b/engines/mohawk/riven_stacks/aspit.h
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef RIVEN_STACKS_ASPIT_H
+#define RIVEN_STACKS_ASPIT_H
+
+#include "mohawk/riven_stack.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+class ASpit : public RivenStack {
+public:
+	ASpit(MohawkEngine_Riven *vm);
+
+};
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/riven_stacks/bspit.cpp b/engines/mohawk/riven_stacks/bspit.cpp
new file mode 100644
index 0000000000..791317c561
--- /dev/null
+++ b/engines/mohawk/riven_stacks/bspit.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "mohawk/riven_stacks/bspit.h"
+
+#include "engines/mohawk/riven.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+BSpit::BSpit(MohawkEngine_Riven *vm) :
+		DomeSpit(vm, kStackBspit) {
+
+}
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
diff --git a/engines/mohawk/riven_stacks/bspit.h b/engines/mohawk/riven_stacks/bspit.h
new file mode 100644
index 0000000000..be3c052d00
--- /dev/null
+++ b/engines/mohawk/riven_stacks/bspit.h
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef RIVEN_STACKS_BSPIT_H
+#define RIVEN_STACKS_BSPIT_H
+
+#include "mohawk/riven_stacks/domespit.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+class BSpit : public DomeSpit {
+public:
+	BSpit(MohawkEngine_Riven *vm);
+
+};
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/riven_stacks/domespit.cpp b/engines/mohawk/riven_stacks/domespit.cpp
new file mode 100644
index 0000000000..4674a24d2f
--- /dev/null
+++ b/engines/mohawk/riven_stacks/domespit.cpp
@@ -0,0 +1,34 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "mohawk/riven_stacks/domespit.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+DomeSpit::DomeSpit(MohawkEngine_Riven *vm, uint16 id) :
+		RivenStack(vm, id) {
+
+}
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
diff --git a/engines/mohawk/riven_stacks/domespit.h b/engines/mohawk/riven_stacks/domespit.h
new file mode 100644
index 0000000000..776736db85
--- /dev/null
+++ b/engines/mohawk/riven_stacks/domespit.h
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef RIVEN_STACKS_DOMESPIT_H
+#define RIVEN_STACKS_DOMESPIT_H
+
+#include "mohawk/riven_stack.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+class DomeSpit : public RivenStack {
+public:
+	DomeSpit(MohawkEngine_Riven *vm, uint16 id);
+
+};
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/riven_stacks/gspit.cpp b/engines/mohawk/riven_stacks/gspit.cpp
new file mode 100644
index 0000000000..8617b285eb
--- /dev/null
+++ b/engines/mohawk/riven_stacks/gspit.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "mohawk/riven_stacks/gspit.h"
+
+#include "engines/mohawk/riven.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+GSpit::GSpit(MohawkEngine_Riven *vm) :
+		DomeSpit(vm, kStackGspit) {
+
+}
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
diff --git a/engines/mohawk/riven_stacks/gspit.h b/engines/mohawk/riven_stacks/gspit.h
new file mode 100644
index 0000000000..794a95bde5
--- /dev/null
+++ b/engines/mohawk/riven_stacks/gspit.h
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef RIVEN_STACKS_GSPIT_H
+#define RIVEN_STACKS_GSPIT_H
+
+#include "mohawk/riven_stacks/domespit.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+class GSpit : public DomeSpit {
+public:
+	GSpit(MohawkEngine_Riven *vm);
+
+};
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/riven_stacks/jspit.cpp b/engines/mohawk/riven_stacks/jspit.cpp
new file mode 100644
index 0000000000..e19d28952c
--- /dev/null
+++ b/engines/mohawk/riven_stacks/jspit.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "mohawk/riven_stacks/jspit.h"
+
+#include "engines/mohawk/riven.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+JSpit::JSpit(MohawkEngine_Riven *vm) :
+		DomeSpit(vm, kStackJspit) {
+
+}
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
diff --git a/engines/mohawk/riven_stacks/jspit.h b/engines/mohawk/riven_stacks/jspit.h
new file mode 100644
index 0000000000..9e82a137aa
--- /dev/null
+++ b/engines/mohawk/riven_stacks/jspit.h
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef RIVEN_STACKS_JSPIT_H
+#define RIVEN_STACKS_JSPIT_H
+
+#include "mohawk/riven_stacks/domespit.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+class JSpit : public DomeSpit {
+public:
+	JSpit(MohawkEngine_Riven *vm);
+
+};
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/riven_stacks/ospit.cpp b/engines/mohawk/riven_stacks/ospit.cpp
new file mode 100644
index 0000000000..f36be94cb7
--- /dev/null
+++ b/engines/mohawk/riven_stacks/ospit.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "mohawk/riven_stacks/ospit.h"
+
+#include "engines/mohawk/riven.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+OSpit::OSpit(MohawkEngine_Riven *vm) :
+		RivenStack(vm, kStackOspit) {
+
+}
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
diff --git a/engines/mohawk/riven_stacks/ospit.h b/engines/mohawk/riven_stacks/ospit.h
new file mode 100644
index 0000000000..0792571d5d
--- /dev/null
+++ b/engines/mohawk/riven_stacks/ospit.h
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef RIVEN_STACKS_OSPIT_H
+#define RIVEN_STACKS_OSPIT_H
+
+#include "mohawk/riven_stack.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+class OSpit : public RivenStack {
+public:
+	OSpit(MohawkEngine_Riven *vm);
+
+};
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/riven_stacks/pspit.cpp b/engines/mohawk/riven_stacks/pspit.cpp
new file mode 100644
index 0000000000..c6b1b97ec7
--- /dev/null
+++ b/engines/mohawk/riven_stacks/pspit.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "mohawk/riven_stacks/pspit.h"
+
+#include "engines/mohawk/riven.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+PSpit::PSpit(MohawkEngine_Riven *vm) :
+		DomeSpit(vm, kStackPspit) {
+
+}
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
diff --git a/engines/mohawk/riven_stacks/pspit.h b/engines/mohawk/riven_stacks/pspit.h
new file mode 100644
index 0000000000..797eb29000
--- /dev/null
+++ b/engines/mohawk/riven_stacks/pspit.h
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef RIVEN_STACKS_PSPIT_H
+#define RIVEN_STACKS_PSPIT_H
+
+#include "mohawk/riven_stacks/domespit.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+class PSpit : public DomeSpit {
+public:
+	PSpit(MohawkEngine_Riven *vm);
+
+};
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/riven_stacks/rspit.cpp b/engines/mohawk/riven_stacks/rspit.cpp
new file mode 100644
index 0000000000..c099c43417
--- /dev/null
+++ b/engines/mohawk/riven_stacks/rspit.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "mohawk/riven_stacks/rspit.h"
+
+#include "engines/mohawk/riven.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+RSpit::RSpit(MohawkEngine_Riven *vm) :
+		RivenStack(vm, kStackRspit) {
+
+}
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
diff --git a/engines/mohawk/riven_stacks/rspit.h b/engines/mohawk/riven_stacks/rspit.h
new file mode 100644
index 0000000000..67384cb4c5
--- /dev/null
+++ b/engines/mohawk/riven_stacks/rspit.h
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef RIVEN_STACKS_RSPIT_H
+#define RIVEN_STACKS_RSPIT_H
+
+#include "mohawk/riven_stack.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+class RSpit : public RivenStack {
+public:
+	RSpit(MohawkEngine_Riven *vm);
+
+};
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/riven_stacks/tspit.cpp b/engines/mohawk/riven_stacks/tspit.cpp
new file mode 100644
index 0000000000..aa4634adf7
--- /dev/null
+++ b/engines/mohawk/riven_stacks/tspit.cpp
@@ -0,0 +1,36 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "mohawk/riven_stacks/tspit.h"
+
+#include "engines/mohawk/riven.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+TSpit::TSpit(MohawkEngine_Riven *vm) :
+		DomeSpit(vm, kStackTspit) {
+
+}
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
diff --git a/engines/mohawk/riven_stacks/tspit.h b/engines/mohawk/riven_stacks/tspit.h
new file mode 100644
index 0000000000..90c62a0272
--- /dev/null
+++ b/engines/mohawk/riven_stacks/tspit.h
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef RIVEN_STACKS_TSPIT_H
+#define RIVEN_STACKS_TSPIT_H
+
+#include "mohawk/riven_stacks/domespit.h"
+
+namespace Mohawk {
+namespace RivenStacks {
+
+class TSpit : public DomeSpit {
+public:
+	TSpit(MohawkEngine_Riven *vm);
+
+};
+
+} // End of namespace RivenStacks
+} // End of namespace Mohawk
+
+#endif