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

[lordhoto at users.sourceforge.net]

Revision: 25322
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25322&view=rev
Author:   lordhoto
Date:     2007-02-01 05:31:07 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
cleanup

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

Modified: scummvm/trunk/engines/kyra/script_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v1.cpp	2007-02-01 13:12:45 UTC (rev 25321)
+++ scummvm/trunk/engines/kyra/script_v1.cpp	2007-02-01 13:31:07 UTC (rev 25322)
@@ -758,24 +758,21 @@
 	if (maxTime - 1 <= 0)
 		maxTime = 1;
 
+	_movieObjects[wsaIndex]->setX(xpos);
+	_movieObjects[wsaIndex]->setY(ypos);
+	_movieObjects[wsaIndex]->setDrawPage(0);
+
 	// Workaround for bug #1498221 "KYRA1: Glitches when meeting Zanthia"
 	// the original didn'to do a forced screen update after displaying a wsa frame
 	// while we have to do it, which make brandon disappear for a short moment,
 	// which shouldn't happen. So we're not updating the screen for this special
 	// case too.
 	if (startFrame == 18 && endFrame == 18 && _currentRoom == 45) {
-		_movieObjects[wsaIndex]->setX(xpos);
-		_movieObjects[wsaIndex]->setY(ypos);
-		_movieObjects[wsaIndex]->setDrawPage(0);
 		_movieObjects[wsaIndex]->displayFrame(18);
 		delay(waitTime * _tickLength);
 		return 0;
 	}
 
-	_movieObjects[wsaIndex]->setX(xpos);
-	_movieObjects[wsaIndex]->setY(ypos);
-	_movieObjects[wsaIndex]->setDrawPage(0);
-
 	int curTime = 0;
 	_screen->hideMouse();
 	while (curTime < maxTime) {


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