[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
- Previous message: [Scummvm-cvs-logs] CVS: residual actor.cpp,1.37,1.38 actor.h,1.19,1.20 localize.cpp,1.9,1.10 lua.cpp,1.90,1.91 textobject.cpp,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: residual debug.cpp,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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)
- Previous message: [Scummvm-cvs-logs] CVS: residual actor.cpp,1.37,1.38 actor.h,1.19,1.20 localize.cpp,1.9,1.10 lua.cpp,1.90,1.91 textobject.cpp,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: residual debug.cpp,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list