[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.178,1.179

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv21471

Modified Files:
	script_v5.cpp 
Log Message:
cleanup

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- script_v5.cpp	10 Sep 2003 08:30:55 -0000	1.178
+++ script_v5.cpp	10 Sep 2003 22:35:35 -0000	1.179
@@ -2749,15 +2749,15 @@
 				int delay = (uint16)getVarOrDirectWord(0x40);
 
 				if (_gameId == GID_LOOM256) {
-					VAR(VAR_MUSIC_TIMER) = 0;
 					if (offset == 0 && delay == 0) {
+						VAR(VAR_MUSIC_TIMER) = 0;
 						_sound->stopCD();
 					} else {
 						// Loom specified the offset from the start of the CD;
 						// thus we have to subtract the length of the first track
 						// (22500 frames) plus the 2 second = 150 frame leadin.
 						// I.e. in total 22650 frames.
-						offset = (int)(offset * 7.5 - 22650);
+						offset = (int)(offset * 7.5 - 22500 - 2*75);
 
 						// Slightly increase the delay (5 frames = 1/25 of a second).
 						// This noticably improves the experience in Loom CD.