[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.387,1.388

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29392/scumm

Modified Files:
	actor.cpp 
Log Message:

Add additional checks in later HE games.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -d -r1.387 -r1.388
--- actor.cpp	29 Oct 2005 01:59:18 -0000	1.387
+++ actor.cpp	29 Oct 2005 04:48:47 -0000	1.388
@@ -1144,13 +1144,13 @@
 	bcr->_skipLimbs = (_heSkipLimbs != 0);
 	bcr->_paletteNum = _hePaletteNum;
 
-	if (_vm->_heversion >= 80 && _heNoTalkAnimation == 0) {
-		_heCondMask = (_heCondMask & ~0x3FF) | 1;
-		if (_vm->getTalkingActor() == _number) {
-			// Checks if talk sound is active?
-			// Otherwise just do rand animation
-			int rnd = _vm->_rnd.getRandomNumberRng(1, 10);
-			setTalkCondition(rnd);
+	if (_vm->_heversion >= 80 && _heNoTalkAnimation == 0 && _animProgress == 0) {
+		if (_vm->getTalkingActor() == _number && !_vm->_string[0].no_talk_anim) {
+			// Get sound var 19 of sound 1, if sound code is active.
+			// Otherwise choose random animation
+			setTalkCondition(_vm->_rnd.getRandomNumberRng(1, 10));
+		} else {
+			setTalkCondition(1);
 		}
 	}
 	_heNoTalkAnimation = 0;