From 9fddad6faf0d81107b362c7c6046366a27c604d3 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Tue, 30 Nov 2010 20:25:21 +0000
Subject: MOHAWK: Set the maze runner initial direction. Remove a hack that is
 not needed anymore thanks to keeping the old stack when changing stack.

svn-id: r54686
---
 engines/mohawk/myst_scripts.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'engines/mohawk/myst_scripts.cpp')

diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp
index b650ff6d2f..9c21887e43 100644
--- a/engines/mohawk/myst_scripts.cpp
+++ b/engines/mohawk/myst_scripts.cpp
@@ -867,15 +867,12 @@ void MystScriptParser::o_changeStack(uint16 op, uint16 var, uint16 argc, uint16
 
 			// 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);
-
-			handle = vm->_sound->playSound(soundIdLinkDst);
-			while (vm->_mixer->isSoundHandleActive(*handle))
-				vm->_system->delayMillis(10);
+			_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);
 		}
 	} else
 		unknown(op, var, argc, argv);
-- 
cgit v1.2.3