aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.cpp
diff options
context:
space:
mode:
authorMax Horn2002-10-21 13:23:25 +0000
committerMax Horn2002-10-21 13:23:25 +0000
commit8af300fec3a760cc5c153c5be92134c1a99169a4 (patch)
tree422e11a861066b333615f602a0357944007c99e0 /scumm/sound.cpp
parent0006197cf11187fc9756c7aba5de239cf719c4a4 (diff)
downloadscummvm-rg350-8af300fec3a760cc5c153c5be92134c1a99169a4.tar.gz
scummvm-rg350-8af300fec3a760cc5c153c5be92134c1a99169a4.tar.bz2
scummvm-rg350-8af300fec3a760cc5c153c5be92134c1a99169a4.zip
The terms Word and DWord are somewhat Windows centric; in fact there are systems on which word is 32bit, as opposed to our 16 bits. Hence, use the uin16/uint32 naming scheme, which is not ambigious
svn-id: r5216
Diffstat (limited to 'scumm/sound.cpp')
-rw-r--r--scumm/sound.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 2d8a065d72..2f7e561942 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -823,17 +823,17 @@ File * Sound::openSfxFile() {
int size, compressed_offset;
MP3OffsetTable *cur;
- compressed_offset = file->readDwordBE();
+ compressed_offset = file->readUint32BE();
offset_table = (MP3OffsetTable *) malloc(compressed_offset);
num_sound_effects = compressed_offset / 16;
size = compressed_offset;
cur = offset_table;
while (size > 0) {
- cur[0].org_offset = file->readDwordBE();
- cur[0].new_offset = file->readDwordBE() + compressed_offset + 4; /* The + 4 is to take into accound the 'size' field */
- cur[0].num_tags = file->readDwordBE();
- cur[0].compressed_size = file->readDwordBE();
+ cur[0].org_offset = file->readUint32BE();
+ cur[0].new_offset = file->readUint32BE() + compressed_offset + 4; /* The + 4 is to take into accound the 'size' field */
+ cur[0].num_tags = file->readUint32BE();
+ cur[0].compressed_size = file->readUint32BE();
size -= 4 * 4;
cur++;
}