[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.50,1.51

Pawel Kolodziejski aquadran at users.sourceforge.net
Tue Mar 23 15:03:01 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26853

Modified Files:
	dimuse.cpp 
Log Message:
changed a little hook id code

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- dimuse.cpp	2 Mar 2004 20:35:48 -0000	1.50
+++ dimuse.cpp	23 Mar 2004 22:51:44 -0000	1.51
@@ -211,9 +211,17 @@
 	if (jumpId != -1) {
 		int region = _sound->getRegionIdByJumpId(_track[track].soundHandle, jumpId);
 		if (region != -1) {
-			_track[track].curRegion = region;
-			debug(5, "switchToNextRegion-sound(%d) jump to %d region, curHookId: %d", _track[track].soundId, _track[track].curRegion, _track[track].curHookId);
-			_track[track].curHookId = 0;
+			int sampleHookId = _sound->getJumpHookId(_track[track].soundHandle, jumpId);
+			if (sampleHookId != 0) {
+				if (_track[track].curHookId == sampleHookId) {
+					_track[track].curRegion = region;
+					debug(5, "switchToNextRegion-sound(%d) jump to %d region, curHookId: %d", _track[track].soundId, _track[track].curRegion, _track[track].curHookId);
+					_track[track].curHookId = 0;
+				}
+			} else {
+				_track[track].curRegion = region;
+				debug(5, "switchToNextRegion-sound(%d) jump to %d region, curHookId: %d", _track[track].soundId, _track[track].curRegion, _track[track].curHookId);
+			}
 		}
 	}
 





More information about the Scummvm-git-logs mailing list