[Scummvm-cvs-logs] CVS: scummvm/scumm script_v7he.cpp,2.176,2.177 sound_he.cpp,2.12,2.13

kirben kirben at users.sourceforge.net
Sun Jan 15 01:39:02 CET 2006


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

Modified Files:
	script_v7he.cpp sound_he.cpp 
Log Message:

Ooops, looping should have been left enabled.


Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.176
retrieving revision 2.177
diff -u -d -r2.176 -r2.177
--- script_v7he.cpp	15 Jan 2006 08:37:00 -0000	2.176
+++ script_v7he.cpp	15 Jan 2006 09:38:15 -0000	2.177
@@ -591,7 +591,6 @@
 		res.unlock(rtRoomImage, resid);
 		break;
 	case 116:
-		error("CrunchHeap");
 		break;
 	case 117:		// SO_LOAD_CHARSET
 		resid = pop();

Index: sound_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound_he.cpp,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -d -r2.12 -r2.13
--- sound_he.cpp	15 Jan 2006 08:37:01 -0000	2.12
+++ sound_he.cpp	15 Jan 2006 09:38:15 -0000	2.13
@@ -359,9 +359,8 @@
 		}
 		musicFile.close();
 
-		_vm->_mixer->stopID(_currentMusic);
-		_currentMusic = soundID;
 		if (_vm->_heversion == 70) {
+			_vm->_mixer->stopHandle(_heSoundChannels[heChannel]);
 			_vm->_mixer->playRaw(&_heSoundChannels[heChannel], spoolPtr, size, 11025, flags, soundID);
 			return;
 		}
@@ -379,7 +378,7 @@
 
 	// TODO: Extra sound flags
 	if (heFlags & 1) {
-		//flags |= Audio::Mixer::FLAG_LOOP;
+		flags |= Audio::Mixer::FLAG_LOOP;
 	}
 
 	// Support for sound in later Backyard sports games





More information about the Scummvm-git-logs mailing list