[Scummvm-cvs-logs] CVS: residual actor.cpp,1.38,1.39

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Jan 2 05:58:05 CET 2005


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

Modified Files:
	actor.cpp 
Log Message:
talk stop chore when id is -1

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/actor.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- actor.cpp	2 Jan 2005 13:34:50 -0000	1.38
+++ actor.cpp	2 Jan 2005 13:57:16 -0000	1.39
@@ -241,7 +241,7 @@
 void Actor::shutUp() {
 	if (_lipSynch != NULL) {
 		g_imuse->stopSound(_talkSoundName.c_str());
-		if (_talkChore[_talkAnim] >= 0)
+		if ((_talkAnim != -1) && (_talkChore[_talkAnim] >= 0))
 			_talkCostume[_talkAnim]->stopChore(_talkChore[_talkAnim]);
 		_lipSynch = NULL;
 	} else if (_mumbleChore >= 0)





More information about the Scummvm-git-logs mailing list