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

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Fri Feb 12 22:15:30 CET 2010


Revision: 48037
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48037&view=rev
Author:   mthreepwood
Date:     2010-02-12 21:15:30 +0000 (Fri, 12 Feb 2010)

Log Message:
-----------
Fix trap book external commands.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/riven_external.cpp

Modified: scummvm/trunk/engines/mohawk/riven_external.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/riven_external.cpp	2010-02-12 02:23:28 UTC (rev 48036)
+++ scummvm/trunk/engines/mohawk/riven_external.cpp	2010-02-12 21:15:30 UTC (rev 48037)
@@ -353,29 +353,21 @@
 
 void RivenExternal::xtrapbookback(uint16 argc, uint16 *argv) {
 	// Return to where we were before entering the book
+	*_vm->matchVarToString("atrap") = 0;
 	_vm->changeToStack(*_vm->matchVarToString("returnstackid"));
 	_vm->changeToCard(*_vm->matchVarToString("returncardid"));
 }
 
 void RivenExternal::xatrapbookclose(uint16 argc, uint16 *argv) {
 	// Close the trap book
-	_vm->_hotspots[1].enabled = false;
-	_vm->_hotspots[2].enabled = false;
-	_vm->_hotspots[3].enabled = false;
-	_vm->_hotspots[4].enabled = true;
-	_vm->_gfx->drawPLST(3);
-	_vm->_gfx->updateScreen();
+	*_vm->matchVarToString("atrap") = 0;
+	_vm->changeToCard(); // Refresh
 }
 
 void RivenExternal::xatrapbookopen(uint16 argc, uint16 *argv) {
 	// Open the trap book
-	_vm->_hotspots[1].enabled = true;
-	_vm->_hotspots[2].enabled = true;
-	_vm->_hotspots[3].enabled = true;
-	_vm->_hotspots[4].enabled = false;
-	_vm->_gfx->drawPLST(1);
-	// TODO: Play movie
-	_vm->_gfx->updateScreen();
+	*_vm->matchVarToString("atrap") = 1;
+	_vm->changeToCard(); // Refresh
 }
 
 void RivenExternal::xarestoregame(uint16 argc, uint16 *argv) {


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




More information about the Scummvm-git-logs mailing list