[Scummvm-cvs-logs] SF.net SVN: scummvm:[43231] scummvm/trunk/engines/kyra/script_lok.cpp

[lordhoto at users.sourceforge.net]

Revision: 43231
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43231&view=rev
Author:   lordhoto
Date:     2009-08-10 22:18:33 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
Fix o1_makeAmuletAppear for Kyrandia 1 Amiga.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_lok.cpp

Modified: scummvm/trunk/engines/kyra/script_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lok.cpp	2009-08-10 22:18:18 UTC (rev 43230)
+++ scummvm/trunk/engines/kyra/script_lok.cpp	2009-08-10 22:18:33 UTC (rev 43231)
@@ -1321,9 +1321,11 @@
 
 int KyraEngine_LoK::o1_makeAmuletAppear(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_makeAmuletAppear(%p) ()", (const void *)script);
-	WSAMovie_v1 amulet(this);
-	amulet.open("AMULET.WSA", 1, 0);
-	if (amulet.opened()) {
+	Movie *amulet = createWSAMovie();
+	assert(amulet);
+	amulet->open("AMULET.WSA", 1, 0);
+
+	if (amulet->opened()) {
 		assert(_amuleteAnim);
 		_screen->hideMouse();
 		snd_playSoundEffect(0x70);
@@ -1341,7 +1343,7 @@
 			if (code == 14)
 				snd_playSoundEffect(0x73);
 
-			amulet.displayFrame(code, 0, 224, 152, 0, 0, 0);
+			amulet->displayFrame(code, 0, 224, 152, 0, 0, 0);
 			_animator->_updateScreen = true;
 
 			while (_system->getMillis() < nextTime) {
@@ -1353,6 +1355,8 @@
 		}
 		_screen->showMouse();
 	}
+
+	delete amulet;
 	setGameFlag(0x2D);
 	return 0;
 }


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