[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.51,1.52

Andrew Kurushin h00ligan at users.sourceforge.net
Fri Dec 24 06:49:01 CET 2004


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

Modified Files:
	actor.cpp 
Log Message:
- fixed actors state after end of speech

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- actor.cpp	24 Dec 2004 14:21:47 -0000	1.51
+++ actor.cpp	24 Dec 2004 14:47:52 -0000	1.52
@@ -324,6 +324,12 @@
 			removeFirst = true;
 		}		
 		_activeSpeech.playing = false;
+		if (_activeSpeech.actorIds[0] != 0) {
+			actor = getActor(_activeSpeech.actorIds[0]);
+			if (!(_activeSpeech.speechFlags & kSpeakNoAnimate)) {
+				actor->currentAction = kActionWait;
+			}
+		}
 	}
 
 	if (removeFirst) {





More information about the Scummvm-git-logs mailing list