aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/engine
diff options
context:
space:
mode:
authorathrxx2019-04-13 19:43:17 +0200
committerathrxx2019-04-13 19:43:17 +0200
commit7766eec9db7ca788725c76bed06c9cf05c9b737b (patch)
tree47b3ac285c7660c08a9c94bd5b6b79f38aa61c37 /engines/kyra/engine
parentb7552e46ea71be70c6f21831750c9ae39caca737 (diff)
downloadscummvm-rg350-7766eec9db7ca788725c76bed06c9cf05c9b737b.tar.gz
scummvm-rg350-7766eec9db7ca788725c76bed06c9cf05c9b737b.tar.bz2
scummvm-rg350-7766eec9db7ca788725c76bed06c9cf05c9b737b.zip
KYRA: (EOB) - silence -Wshadow warning
Diffstat (limited to 'engines/kyra/engine')
-rw-r--r--engines/kyra/engine/eobcommon.cpp4
-rw-r--r--engines/kyra/engine/eobcommon.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/engine/eobcommon.cpp b/engines/kyra/engine/eobcommon.cpp
index 153d17971f..4b6e88437f 100644
--- a/engines/kyra/engine/eobcommon.cpp
+++ b/engines/kyra/engine/eobcommon.cpp
@@ -2674,8 +2674,8 @@ void EoBCoreEngine::snd_stopSound() {
_sound->stopAllSoundEffects();
}
-void EoBCoreEngine::snd_fadeOut(int delay) {
- _sound->beginFadeOut(delay);
+void EoBCoreEngine::snd_fadeOut(int del) {
+ _sound->beginFadeOut(del);
}
} // End of namespace Kyra
diff --git a/engines/kyra/engine/eobcommon.h b/engines/kyra/engine/eobcommon.h
index 97d7ea3167..e476f8a852 100644
--- a/engines/kyra/engine/eobcommon.h
+++ b/engines/kyra/engine/eobcommon.h
@@ -1179,7 +1179,7 @@ protected:
void snd_playSong(int id);
void snd_playSoundEffect(int id, int volume=0xFF);
void snd_stopSound();
- void snd_fadeOut(int speed = 160);
+ void snd_fadeOut(int del = 160);
virtual void snd_loadAmigaSounds(int level, int sub) = 0;
const char **_amigaSoundMap;