[Scummvm-cvs-logs] CVS: residual/imuse imuse_script.cpp,1.13,1.14

Erich Edgar Hoover compholio at users.sourceforge.net
Sun Jul 31 20:51:07 CEST 2005


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

Modified Files:
	imuse_script.cpp 
Log Message:
fixed some actor movement issues - fixed several scene changing issues - fixed memory bugs in LocalizeString and isVoicePlaying - fixed start_script called with LUA_T_NIL

Index: imuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_script.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- imuse_script.cpp	17 Jul 2005 23:40:21 -0000	1.13
+++ imuse_script.cpp	1 Aug 2005 03:49:02 -0000	1.14
@@ -100,7 +100,10 @@
 	StackLock lock(_mutex);
 	for (int l = 0; l < MAX_IMUSE_TRACKS; l++) {
 		Track *track = _track[l];
-		if (track->volGroupId == IMUSE_VOLGRP_VOICE) {
+		// Make sure the track is in use before checking the group ID,
+		// otherwise volGroupId can be uninitialized or reference an
+		// old track.
+		if (track->used && track->volGroupId == IMUSE_VOLGRP_VOICE) {
 			if (track->handle.isActive()) {
 				return true;
 			}





More information about the Scummvm-git-logs mailing list