aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/inter_v2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/gob/inter_v2.cpp')
-rw-r--r--engines/gob/inter_v2.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index 47b3b77ffa..7fce867982 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -933,7 +933,7 @@ void Inter_v2::o2_stub0x85(void) {
int16 Inter_v2::loadSound(int16 search) {
int16 id; // si
int16 slot; // di
- int32 i;
+ uint32 i;
bool isADL;
char sndfile[14];
char *extData;
@@ -1003,21 +1003,25 @@ int16 Inter_v2::loadSound(int16 search) {
_vm->_game->_soundSamples[slot] = soundDesc;
_vm->_game->_soundFromExt[slot] = 1;
} else { // loc_99BC
- extData = _vm->_game->loadExtData(id, 0, 0);
+ uint32 dataSize;
+
+ extData = _vm->_game->loadExtData(id, 0, 0, &dataSize);
if (extData == 0)
return slot;
_vm->_game->_soundTypes[slot] = 1;
if (!isADL)
- _vm->_game->loadSound(slot, extData);
+ _vm->_game->loadSound(slot, extData, dataSize);
else
// TODO: This is very ugly
_vm->_game->_soundSamples[slot] = (Snd::SoundDesc *) extData;
_vm->_game->_soundFromExt[slot] = 1;
}
} else { // loc_9A13
- extData = _vm->_game->loadTotResource(id);
+ int16 dataSize;
+
+ extData = _vm->_game->loadTotResource(id, &dataSize);
if (!isADL)
- _vm->_game->loadSound(slot, extData);
+ _vm->_game->loadSound(slot, extData, dataSize);
else
// TODO: This is very ugly
_vm->_game->_soundSamples[slot] = (Snd::SoundDesc *) extData;