aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/res_snd.cpp
diff options
context:
space:
mode:
authorTravis Howell2007-06-21 06:37:00 +0000
committerTravis Howell2007-06-21 06:37:00 +0000
commit00829f15c87689e649489ec4d97c78d8b8748f83 (patch)
treed61352a43056c44e16eac710129254173ee5d427 /engines/agos/res_snd.cpp
parentd2e7058b59e8f3a26f8e2fdbfd104749854ce950 (diff)
downloadscummvm-rg350-00829f15c87689e649489ec4d97c78d8b8748f83.tar.gz
scummvm-rg350-00829f15c87689e649489ec4d97c78d8b8748f83.tar.bz2
scummvm-rg350-00829f15c87689e649489ec4d97c78d8b8748f83.zip
Minor cleanup.
svn-id: r27580
Diffstat (limited to 'engines/agos/res_snd.cpp')
-rw-r--r--engines/agos/res_snd.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index a764756224..779ed67e58 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -120,7 +120,7 @@ void AGOSEngine::skipSpeech() {
}
}
-void AGOSEngine::loadMusic(uint music) {
+void AGOSEngine::loadMusic(uint16 music) {
char buf[4];
stopMusic();
@@ -139,7 +139,7 @@ void AGOSEngine::loadMusic(uint music) {
_nextMusicToPlay = -1;
}
-void AGOSEngine::playModule(uint music) {
+void AGOSEngine::playModule(uint16 music) {
char filename[15];
File f;
@@ -265,7 +265,7 @@ void AGOSEngine::stopMusic() {
_mixer->stopHandle(_modHandle);
}
-void AGOSEngine::playSting(uint a) {
+void AGOSEngine::playSting(uint16 soundId) {
if (!_midi._enable_sfx)
return;
@@ -279,13 +279,13 @@ void AGOSEngine::playSting(uint a) {
if (!mus_file.isOpen())
error("playSting: Can't load sound effect from '%s'", filename);
- mus_file.seek(a * 2, SEEK_SET);
+ mus_file.seek(soundId * 2, SEEK_SET);
mus_offset = mus_file.readUint16LE();
if (mus_file.ioFailed())
- error("playSting: Can't read sting %d offset", a);
+ error("playSting: Can't read sting %d offset", soundId);
mus_file.seek(mus_offset, SEEK_SET);
- _midi.loadSMF(&mus_file, a, true);
+ _midi.loadSMF(&mus_file, soundId, true);
_midi.startTrack(0);
}
@@ -301,7 +301,7 @@ static const byte elvira1_soundTable[100] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};
-bool AGOSEngine::loadVGASoundFile(uint id, uint type) {
+bool AGOSEngine::loadVGASoundFile(uint16 id, uint8 type) {
File in;
char filename[15];
byte *dst;