aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-09-07 16:28:41 +0000
committerMax Horn2003-09-07 16:28:41 +0000
commit17b4ce1c59b9b671aee55b953810874e33539be9 (patch)
tree5b954e7d7726c57b6cc4be6e24e8d522db2bfa4b
parent0012f7fa9669939dbdc4b31b5db432d08d2ce276 (diff)
downloadscummvm-rg350-17b4ce1c59b9b671aee55b953810874e33539be9.tar.gz
scummvm-rg350-17b4ce1c59b9b671aee55b953810874e33539be9.tar.bz2
scummvm-rg350-17b4ce1c59b9b671aee55b953810874e33539be9.zip
small tweak (hm, is IMuse::get_sound_active really still needed? or rather, does IMuse::getSoundStatus really have to return an int or can we cast it to boolean safely?)
svn-id: r10067
-rw-r--r--scumm/imuse_digi.cpp6
-rw-r--r--scumm/imuse_digi.h2
-rw-r--r--scumm/music.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp
index d48b570bcb..f3a8cf9e29 100644
--- a/scumm/imuse_digi.cpp
+++ b/scumm/imuse_digi.cpp
@@ -1164,15 +1164,15 @@ int32 IMuseDigital::doCommand(int a, int b, int c, int d, int e, int f, int g, i
}
}
-int IMuseDigital::getSoundStatus(int sound) {
+bool IMuseDigital::getSoundStatus(int sound) {
debug(5, "IMuseDigital::getSoundStatus(%d)", sound);
for (int l = 0; l < MAX_DIGITAL_CHANNELS; l++) {
if ((_channel[l]._idSound == sound) && _channel[l]._used) {
- return 1;
+ return true;
}
}
- return 0;
+ return false;
}
diff --git a/scumm/imuse_digi.h b/scumm/imuse_digi.h
index baa77c4f8a..e5774444bb 100644
--- a/scumm/imuse_digi.h
+++ b/scumm/imuse_digi.h
@@ -72,7 +72,7 @@ public:
void stopAll();
void pause(bool pause);
int32 doCommand(int a, int b, int c, int d, int e, int f, int g, int h);
- int getSoundStatus(int sound);
+ bool getSoundStatus(int sound);
};
#endif
diff --git a/scumm/music.h b/scumm/music.h
index 445e63f022..8529959ec8 100644
--- a/scumm/music.h
+++ b/scumm/music.h
@@ -33,7 +33,7 @@ public:
virtual void startSound(int sound) = 0;
virtual void stopSound(int sound) = 0;
// virtual void stopAllSounds() = 0;
-// virtual int getSoundStatus(int sound) = 0;
+// virtual bool getSoundStatus(int sound) const = 0;
};
#endif