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

[cyx at users.sourceforge.net]

Revision: 26517
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26517&view=rev
Author:   cyx
Date:     2007-04-15 13:45:55 -0700 (Sun, 15 Apr 2007)

Log Message:
-----------
simplification (_useTalkAnims is not used in >= V7)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/actor.cpp

Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp	2007-04-15 20:36:44 UTC (rev 26516)
+++ scummvm/trunk/engines/scumm/actor.cpp	2007-04-15 20:45:55 UTC (rev 26517)
@@ -1862,21 +1862,16 @@
 	}
 	if (_actorToPrintStrFor == 0xFF) {
 		setTalkingActor(0xFF);
+		_charsetColor = (byte)_string[0].color;
 	} else {
 		a = derefActor(_actorToPrintStrFor, "actorTalk");
 		setTalkingActor(a->_number);
 		if (!_string[0].no_talk_anim) {
 			a->runActorTalkScript(a->_talkStartFrame);
-			_useTalkAnims = true;
 		}
-	}
-
-	if (getTalkingActor() > 0x7F) {
-		_charsetColor = (byte)_string[0].color;
-	} else {
-		a = derefActor(getTalkingActor(), "actorTalk(2)");
 		_charsetColor = a->_talkColor;
 	}
+
 	_charsetBufPos = 0;
 	_talkDelay = 0;
 	_haveMsg = 1;


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