[Scummvm-cvs-logs] SF.net SVN: scummvm: [21283] scummvm/trunk/engines/scumm/actor.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Tue Mar 14 05:17:02 CET 2006


Revision: 21283
Author:   kirben
Date:     2006-03-14 05:16:11 -0800 (Tue, 14 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21283&view=rev

Log Message:
-----------
An actor is completely reset by showActor() in SCUMM1-2 games. Fixes bug #902391

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/actor.cpp
Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp	2006-03-14 12:26:48 UTC (rev 21282)
+++ scummvm/trunk/engines/scumm/actor.cpp	2006-03-14 13:16:11 UTC (rev 21283)
@@ -810,19 +810,18 @@
 
 	_vm->ensureResourceLoaded(rtCostume, _costume);
 
-	if (_costumeNeedsInit) {
+	if (_vm->_game.version <= 2) {
+		_cost.reset();
+		startAnimActor(_standFrame);
 		startAnimActor(_initFrame);
-		if (_vm->_game.version <= 2) {
-			startAnimActor(_standFrame);
-			startAnimActor(_talkStopFrame);
+		startAnimActor(_talkStopFrame);
+	} else {
+		if (_costumeNeedsInit) {
+				startAnimActor(_initFrame);
+			_costumeNeedsInit = false;
 		}
-		_costumeNeedsInit = false;
 	}
 
-	// FIXME: Evil hack to work around bug #770717
-	if (!_moving && _vm->_game.version <= 2)
-		startAnimActor(_standFrame);
-
 	stopActorMoving();
 	_visible = true;
 	_needRedraw = true;


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