[Scummvm-cvs-logs] SF.net SVN: scummvm:[55304] scummvm/trunk/engines/mohawk

[mthreepwood at users.sourceforge.net]

Revision: 55304
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55304&view=rev
Author:   mthreepwood
Date:     2011-01-18 17:42:34 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
MOHAWK: Move Myst's o_quit opcode to the base class

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/myst_scripts.cpp
    scummvm/trunk/engines/mohawk/myst_scripts.h
    scummvm/trunk/engines/mohawk/myst_stacks/credits.cpp
    scummvm/trunk/engines/mohawk/myst_stacks/credits.h
    scummvm/trunk/engines/mohawk/myst_stacks/makingof.cpp
    scummvm/trunk/engines/mohawk/myst_stacks/makingof.h

Modified: scummvm/trunk/engines/mohawk/myst_scripts.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts.cpp	2011-01-18 17:08:17 UTC (rev 55303)
+++ scummvm/trunk/engines/mohawk/myst_scripts.cpp	2011-01-18 17:42:34 UTC (rev 55304)
@@ -909,4 +909,8 @@
 	// TODO: Implement
 }
 
+void MystScriptParser::o_quit(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+	_vm->_system->quit();
+}
+
 } // End of namespace Mohawk

Modified: scummvm/trunk/engines/mohawk/myst_scripts.h
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts.h	2011-01-18 17:08:17 UTC (rev 55303)
+++ scummvm/trunk/engines/mohawk/myst_scripts.h	2011-01-18 17:42:34 UTC (rev 55304)
@@ -83,6 +83,7 @@
 
 	DECLARE_OPCODE(unknown);
 
+	// Common opcodes
 	DECLARE_OPCODE(o_toggleVar);
 	DECLARE_OPCODE(o_setVar);
 	DECLARE_OPCODE(o_changeCardSwitch);
@@ -122,6 +123,9 @@
 	DECLARE_OPCODE(o_restoreMainCursor);
 	DECLARE_OPCODE(o_soundWaitStop);
 
+	// Used in multiple stacks
+	DECLARE_OPCODE(o_quit);
+
 	DECLARE_OPCODE(NOP);
 
 protected:

Modified: scummvm/trunk/engines/mohawk/myst_stacks/credits.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_stacks/credits.cpp	2011-01-18 17:08:17 UTC (rev 55303)
+++ scummvm/trunk/engines/mohawk/myst_stacks/credits.cpp	2011-01-18 17:42:34 UTC (rev 55304)
@@ -90,10 +90,6 @@
 	}
 }
 
-void MystScriptParser_Credits::o_quit(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
-	_vm->_system->quit();
-}
-
 void MystScriptParser_Credits::o_runCredits(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	// Activate the credits
 	_creditsRunning = true;

Modified: scummvm/trunk/engines/mohawk/myst_stacks/credits.h
===================================================================
--- scummvm/trunk/engines/mohawk/myst_stacks/credits.h	2011-01-18 17:08:17 UTC (rev 55303)
+++ scummvm/trunk/engines/mohawk/myst_stacks/credits.h	2011-01-18 17:42:34 UTC (rev 55304)
@@ -49,7 +49,6 @@
 	void setupOpcodes();
 	uint16 getVar(uint16 var);
 
-	DECLARE_OPCODE(o_quit);
 	DECLARE_OPCODE(o_runCredits);
 
 	bool _creditsRunning;

Modified: scummvm/trunk/engines/mohawk/myst_stacks/makingof.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_stacks/makingof.cpp	2011-01-18 17:08:17 UTC (rev 55303)
+++ scummvm/trunk/engines/mohawk/myst_stacks/makingof.cpp	2011-01-18 17:42:34 UTC (rev 55304)
@@ -56,8 +56,4 @@
 void MystScriptParser_MakingOf::runPersistentScripts() {
 }
 
-void MystScriptParser_MakingOf::o_quit(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
-	_vm->_system->quit();
-}
-
 } // End of namespace Mohawk

Modified: scummvm/trunk/engines/mohawk/myst_stacks/makingof.h
===================================================================
--- scummvm/trunk/engines/mohawk/myst_stacks/makingof.h	2011-01-18 17:08:17 UTC (rev 55303)
+++ scummvm/trunk/engines/mohawk/myst_stacks/makingof.h	2011-01-18 17:42:34 UTC (rev 55304)
@@ -47,8 +47,6 @@
 
 private:
 	void setupOpcodes();
-
-	DECLARE_OPCODE(o_quit);
 };
 
 } // End of namespace Mohawk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.