[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.45,1.46
Pawel Kolodziejski
aquadran at users.sourceforge.net
Tue Jun 1 13:23:07 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.99,1.100 dimuse_sndmgr.cpp,1.44,1.45 dimuse_sndmgr.h,1.24,1.25 dimuse_track.cpp,1.23,1.24
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.122,1.123
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12872/scummvm/scumm/imuse_digi
Modified Files:
dimuse_sndmgr.cpp
Log Message:
better fix for unloaded sound resources in imuse digi
Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- dimuse_sndmgr.cpp 1 Jun 2004 19:32:36 -0000 1.45
+++ dimuse_sndmgr.cpp 1 Jun 2004 20:22:48 -0000 1.46
@@ -90,7 +90,6 @@
_sounds[slot].region = (_region *)malloc(sizeof(_region) * 70);
_sounds[slot].jump = (_jump *)malloc(sizeof(_jump));
_sounds[slot].resPtr = ptr;
- _vm->lock(rtSound, _sounds[slot].soundId);
_sounds[slot].bits = 8;
_sounds[slot].channels = 1;
@@ -302,6 +301,8 @@
if (soundName[0] == 0) {
_sounds[slot].name[0] = 0;
if ((soundType == IMUSE_RESOURCE)) {
+ _vm->ensureResourceLoaded(rtSound, soundId);
+ _vm->lock(rtSound, soundId);
ptr = _vm->getResourceAddress(rtSound, soundId);
if (ptr == NULL) {
closeSound(&_sounds[slot]);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.99,1.100 dimuse_sndmgr.cpp,1.44,1.45 dimuse_sndmgr.h,1.24,1.25 dimuse_track.cpp,1.23,1.24
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.122,1.123
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list