aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2010-10-28 23:56:36 +0000
committerJohannes Schickel2010-10-28 23:56:36 +0000
commit607920c869b16646be595a1e5938576f7476f950 (patch)
treeaf998214c62f82a0718e727eb483bf8109f0ee11 /engines/kyra
parentd7f8fc108e788057e174e454481fcdd739193176 (diff)
downloadscummvm-rg350-607920c869b16646be595a1e5938576f7476f950.tar.gz
scummvm-rg350-607920c869b16646be595a1e5938576f7476f950.tar.bz2
scummvm-rg350-607920c869b16646be595a1e5938576f7476f950.zip
KYRA: Fix some code errors reported by ICC (i.e. subclasses not overwriting methods by missing a const.)
svn-id: r53911
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/sound.h2
-rw-r--r--engines/kyra/sound_adlib.cpp2
-rw-r--r--engines/kyra/sound_adlib.h2
-rw-r--r--engines/kyra/sound_intern.h2
-rw-r--r--engines/kyra/sound_midi.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index 3b0fbbed0a..8b83796d46 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -94,7 +94,7 @@ public:
* @param track track number
* @return true if available, false otherwise
*/
- virtual bool hasSoundFile(uint file) { return (fileListEntry(file) != 0); }
+ virtual bool hasSoundFile(uint file) const { return (fileListEntry(file) != 0); }
/**
* Load a specifc sound file for use of
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index 8458d751de..a45972ece7 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -2304,7 +2304,7 @@ void SoundAdLibPC::haltTrack() {
//_vm->_system->delayMillis(3 * 60);
}
-bool SoundAdLibPC::isPlaying() {
+bool SoundAdLibPC::isPlaying() const {
return _driver->callback(7, int(0)) != 0;
}
diff --git a/engines/kyra/sound_adlib.h b/engines/kyra/sound_adlib.h
index 0607e1dd7a..aaca1b9138 100644
--- a/engines/kyra/sound_adlib.h
+++ b/engines/kyra/sound_adlib.h
@@ -76,7 +76,7 @@ public:
void playTrack(uint8 track);
void haltTrack();
- bool isPlaying();
+ bool isPlaying() const;
void playSoundEffect(uint8 track);
diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h
index f8738bc791..bc1c2be1e2 100644
--- a/engines/kyra/sound_intern.h
+++ b/engines/kyra/sound_intern.h
@@ -68,7 +68,7 @@ public:
void playTrack(uint8 track);
void haltTrack();
- bool isPlaying();
+ bool isPlaying() const;
void playSoundEffect(uint8 track);
void stopAllSoundEffects();
diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp
index c24ce5a95b..8982c1cca4 100644
--- a/engines/kyra/sound_midi.cpp
+++ b/engines/kyra/sound_midi.cpp
@@ -683,7 +683,7 @@ void SoundMidiPC::haltTrack() {
_output->deinitSource(0);
}
-bool SoundMidiPC::isPlaying() {
+bool SoundMidiPC::isPlaying() const {
Common::StackLock lock(_mutex);
return _music->isPlaying();