aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-12-27 16:55:07 +0100
committerStrangerke2014-12-27 16:55:07 +0100
commit6a7834a05ed880cba32f0adb87950179c4ec404c (patch)
tree9ca8dc2ef58011c405a2c04c484dfd51f3b1439a /engines
parent3c3ff0a3aab13b876e0425c365402ff334743282 (diff)
downloadscummvm-rg350-6a7834a05ed880cba32f0adb87950179c4ec404c.tar.gz
scummvm-rg350-6a7834a05ed880cba32f0adb87950179c4ec404c.tar.bz2
scummvm-rg350-6a7834a05ed880cba32f0adb87950179c4ec404c.zip
ACCESS: Rename loadSoundTable
Diffstat (limited to 'engines')
-rw-r--r--engines/access/amazon/amazon_logic.cpp4
-rw-r--r--engines/access/amazon/amazon_scripts.cpp2
-rw-r--r--engines/access/sound.cpp4
-rw-r--r--engines/access/sound.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index c045377f8a..82f0edfa6e 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -317,8 +317,8 @@ void Opening::doTitle() {
_vm->_events->hideCursor();
if (!_vm->isDemo()) {
- _vm->_sound->queueSound(0, 98, 30);
- _vm->_sound->queueSound(1, 98, 8);
+ _vm->_sound->loadSoundTable(0, 98, 30);
+ _vm->_sound->loadSoundTable(1, 98, 8);
_vm->_files->_setPaletteFlag = false;
_vm->_files->loadScreen(0, 3);
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 0b2ddbc854..92acb3686d 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -95,7 +95,7 @@ void AmazonScripts::mWhile1() {
_vm->_oldRects.clear();
_sequence = 2200;
- _vm->_sound->queueSound(0, 14, 15);
+ _vm->_sound->loadSoundTable(0, 14, 15);
do {
cLoop();
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index fc574dc083..53b611b65b 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -56,8 +56,8 @@ void SoundManager::clearSounds() {
}
}
-void SoundManager::queueSound(int idx, int fileNum, int subfile) {
- debugC(1, kDebugSound, "queueSound(%d, %d, %d)", idx, fileNum, subfile);
+void SoundManager::loadSoundTable(int idx, int fileNum, int subfile) {
+ debugC(1, kDebugSound, "loadSoundTable(%d, %d, %d)", idx, fileNum, subfile);
Resource *soundResource;
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 384e9ac615..7109438f43 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -60,7 +60,7 @@ public:
SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
~SoundManager();
- void queueSound(int idx, int fileNum, int subfile);
+ void loadSoundTable(int idx, int fileNum, int subfile);
void playSound(int soundIndex);
void checkSoundQueue();