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

[bgk at users.sourceforge.net]

Revision: 54686
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54686&view=rev
Author:   bgk
Date:     2010-11-30 20:25:21 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
MOHAWK: Set the maze runner initial direction. Remove a hack that is not needed anymore thanks to keeping the old stack when changing stack.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/myst_scripts.cpp
    scummvm/trunk/engines/mohawk/myst_stacks/selenitic.cpp

Modified: scummvm/trunk/engines/mohawk/myst_scripts.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts.cpp	2010-11-30 20:15:02 UTC (rev 54685)
+++ scummvm/trunk/engines/mohawk/myst_scripts.cpp	2010-11-30 20:25:21 UTC (rev 54686)
@@ -867,15 +867,12 @@
 
 			// TODO: Play Flyby Entry Movie on Masterpiece Edition..? Only on Myst to Age Link?
 
-			// TODO: Fix properly. Past this point the class may have been destroyed
-			// and thus class instance data is not available anymore
-			MohawkEngine_Myst *vm = _vm;
-			vm->changeToStack(stack_map[targetStack]);
-			vm->changeToCard(start_card[targetStack], true);
+			_vm->changeToStack(stack_map[targetStack]);
+			_vm->changeToCard(start_card[targetStack], true);
 
-			handle = vm->_sound->playSound(soundIdLinkDst);
-			while (vm->_mixer->isSoundHandleActive(*handle))
-				vm->_system->delayMillis(10);
+			handle = _vm->_sound->playSound(soundIdLinkDst);
+			while (_vm->_mixer->isSoundHandleActive(*handle))
+				_vm->_system->delayMillis(10);
 		}
 	} else
 		unknown(op, var, argc, argv);

Modified: scummvm/trunk/engines/mohawk/myst_stacks/selenitic.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_stacks/selenitic.cpp	2010-11-30 20:15:02 UTC (rev 54685)
+++ scummvm/trunk/engines/mohawk/myst_stacks/selenitic.cpp	2010-11-30 20:25:21 UTC (rev 54686)
@@ -43,6 +43,7 @@
 	setupOpcodes();
 	_invokingResource = NULL;
 	_mazeRunnerPosition = 288;
+	_mazeRunnerDirection = 8;
 }
 
 MystScriptParser_Selenitic::~MystScriptParser_Selenitic() {


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