[Scummvm-cvs-logs] CVS: residual actor.cpp,1.48,1.49
James Brown
ender at users.sourceforge.net
Sun Mar 27 20:01:28 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: residual actor.cpp,1.47,1.48 actor.h,1.22,1.23 lua.cpp,1.113,1.114 vector3d.h,1.9,1.10 walkplane.cpp,1.13,1.14 walkplane.h,1.12,1.13
- Next message: [Scummvm-cvs-logs] CVS: residual lua.cpp,1.114,1.115
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18976
Modified Files:
actor.cpp
Log Message:
In theory this should be more appropriate than the shutUp clause below it (which doesn't trigger in long conversation scenes and is probably wrong)... Doesn't help solve much except a bit of overlap.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/actor.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- actor.cpp 28 Mar 2005 01:56:40 -0000 1.48
+++ actor.cpp 28 Mar 2005 04:00:59 -0000 1.49
@@ -478,6 +478,9 @@
}
}
+ if (!talking())
+ shutUp();
+
if (!g_imuse->isVoicePlaying())
shutUp();
- Previous message: [Scummvm-cvs-logs] CVS: residual actor.cpp,1.47,1.48 actor.h,1.22,1.23 lua.cpp,1.113,1.114 vector3d.h,1.9,1.10 walkplane.cpp,1.13,1.14 walkplane.h,1.12,1.13
- Next message: [Scummvm-cvs-logs] CVS: residual lua.cpp,1.114,1.115
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list