diff options
author | Max Horn | 2006-09-17 20:36:48 +0000 |
---|---|---|
committer | Max Horn | 2006-09-17 20:36:48 +0000 |
commit | 51017cf1b21f450acad9c735e9364f5bb5d35f17 (patch) | |
tree | c61007341218b4522350f23cf646a2376b0bf3be /engines/scumm/he/sound_he.cpp | |
parent | 8c0b0c012007d938ab500c5ccc64f6e0cbcf13e0 (diff) | |
download | scummvm-rg350-51017cf1b21f450acad9c735e9364f5bb5d35f17.tar.gz scummvm-rg350-51017cf1b21f450acad9c735e9364f5bb5d35f17.tar.bz2 scummvm-rg350-51017cf1b21f450acad9c735e9364f5bb5d35f17.zip |
Renamed ScummEngine::res to _res and allocate the ResourceManager on the heap (i.e. _res is a pointer now)
svn-id: r23922
Diffstat (limited to 'engines/scumm/he/sound_he.cpp')
-rw-r--r-- | engines/scumm/he/sound_he.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index d0af600899..8b12dd191e 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -528,7 +528,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) musicFile.seek(music_offs, SEEK_SET); _vm->_mixer->stopHandle(_heSoundChannels[heChannel]); - spoolPtr = _vm->res.createResource(rtSpoolBuffer, heChannel, size); + spoolPtr = _vm->_res->createResource(rtSpoolBuffer, heChannel, size); assert(spoolPtr); musicFile.read(spoolPtr, size); musicFile.close(); @@ -686,13 +686,13 @@ void SoundHE::startHETalkSound(uint32 offset) { } _sfxMode |= 2; - _vm->res.nukeResource(rtSound, 1); + _vm->_res->nukeResource(rtSound, 1); _sfxFile->seek(offset + 4, SEEK_SET); size = _sfxFile->readUint32BE(); _sfxFile->seek(offset, SEEK_SET); - _vm->res.createResource(rtSound, 1, size); + _vm->_res->createResource(rtSound, 1, size); ptr = _vm->getResourceAddress(rtSound, 1); _sfxFile->read(ptr, size); |