[Scummvm-cvs-logs] SF.net SVN: scummvm: [28022] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 28022
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28022&view=rev
Author:   thebluegr
Date:     2007-07-10 20:21:29 -0700 (Tue, 10 Jul 2007)

Log Message:
-----------
IHNM: Narrowed down the places where the actors stop being drawn when changing scenes

Modified Paths:
--------------
    scummvm/trunk/engines/saga/scene.cpp
    scummvm/trunk/engines/saga/sfuncs.cpp

Modified: scummvm/trunk/engines/saga/scene.cpp
===================================================================
--- scummvm/trunk/engines/saga/scene.cpp	2007-07-11 01:01:22 UTC (rev 28021)
+++ scummvm/trunk/engines/saga/scene.cpp	2007-07-11 03:21:29 UTC (rev 28022)
@@ -570,8 +570,6 @@
 
 	_chapterPointsChanged = false;
 
-	_vm->_actor->showActors(false);
-
 	if ((_vm->getGameType() == GType_IHNM) && (loadSceneParams->chapter != NO_CHAPTER_CHANGE)) {
 		if (loadSceneParams->loadFlag != kLoadBySceneNumber) {
 			error("loadScene wrong usage");

Modified: scummvm/trunk/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/trunk/engines/saga/sfuncs.cpp	2007-07-11 01:01:22 UTC (rev 28021)
+++ scummvm/trunk/engines/saga/sfuncs.cpp	2007-07-11 03:21:29 UTC (rev 28022)
@@ -562,9 +562,17 @@
 	}
 
 	if (_vm->getGameType() == GType_IHNM) {
+		// WORKAROUND for the briefly appearing actors at the beginning of each chapter
+		// This will stop the actors being drawn in those specific scenes until the scene background has been drawn
+		if ((_vm->_scene->currentChapterNumber() == 1 && _vm->_scene->currentSceneNumber() == 6) ||
+			(_vm->_scene->currentChapterNumber() == 2 && _vm->_scene->currentSceneNumber() == 31) ||
+			(_vm->_scene->currentChapterNumber() == 3 && _vm->_scene->currentSceneNumber() == 58) ||
+			(_vm->_scene->currentChapterNumber() == 4 && _vm->_scene->currentSceneNumber() == 68) ||
+			(_vm->_scene->currentChapterNumber() == 5 && _vm->_scene->currentSceneNumber() == 91))
+				_vm->_actor->showActors(false);		// Stop showing actors before the background is drawn
+
 		// Since it doesn't look like the IHNM scripts remove the
-		// cutaway after the intro, this is probably the best place to
-		// to it.
+		// cutaway after the intro, this is probably the best place to do it
 		_vm->_anim->clearCutaway();
 	}
 


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