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

[bgk at users.sourceforge.net]

Revision: 54604
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54604&view=rev
Author:   bgk
Date:     2010-11-29 20:52:33 +0000 (Mon, 29 Nov 2010)

Log Message:
-----------
MOHAWK; Post rebase fixes :
- Restore invoking resource change
- Update the screen after drawing a conditional image

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/myst.cpp
    scummvm/trunk/engines/mohawk/myst_areas.cpp

Modified: scummvm/trunk/engines/mohawk/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst.cpp	2010-11-29 20:52:20 UTC (rev 54603)
+++ scummvm/trunk/engines/mohawk/myst.cpp	2010-11-29 20:52:33 UTC (rev 54604)
@@ -473,14 +473,14 @@
 		error("Unknown sound action %d", soundAction);
 	}
 
+	// Run the entrance script (if present)
+	runInitScript();
+
 	// Update the images of each area too
 	drawResourceImages();
 
 	// TODO: Handle Script Resources
 
-	// Run the entrance script (if present)
-	runInitScript();
-
 	// Make sure we have the right cursor showing
 	_curResource = -1;
 	checkCurrentResource();

Modified: scummvm/trunk/engines/mohawk/myst_areas.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_areas.cpp	2010-11-29 20:52:20 UTC (rev 54603)
+++ scummvm/trunk/engines/mohawk/myst_areas.cpp	2010-11-29 20:52:33 UTC (rev 54604)
@@ -92,12 +92,12 @@
 
 void MystResourceType5::handleMouseUp(Common::Point *mouse) {
 
-//	MystResource *invoking = this;
-//	while (invoking->_parent) {
-//		invoking = invoking->_parent;
-//	}
+	MystResource *invoking = this;
+	while (invoking->_parent) {
+		invoking = invoking->_parent;
+	}
 
-	_vm->_scriptParser->runScript(_script, this);
+	_vm->_scriptParser->runScript(_script, invoking);
 }
 
 // In Myst/Making of Myst, the paths are hardcoded ala Windows style without extension. Convert them.
@@ -448,6 +448,7 @@
 			imageToDraw = _subImages[subImageId].wdib;
 
 		_vm->_gfx->copyImageSectionToScreen(imageToDraw, _subImages[subImageId].rect, _rect);
+		_vm->_gfx->updateScreen();
 	}
 }
 


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