aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise/sound.h
diff options
context:
space:
mode:
authorTorbjörn Andersson2009-04-05 15:58:27 +0000
committerTorbjörn Andersson2009-04-05 15:58:27 +0000
commitf5fb20680f6524b6e317ba487efdc370e1f1f9ce (patch)
tree850a5d90fcdc2eab50f7663e2ffc9d26b5fb13ce /engines/cruise/sound.h
parent38737e9c07c04f53f2f00f81f1bade3e70ca7f12 (diff)
downloadscummvm-rg350-f5fb20680f6524b6e317ba487efdc370e1f1f9ce.tar.gz
scummvm-rg350-f5fb20680f6524b6e317ba487efdc370e1f1f9ce.tar.bz2
scummvm-rg350-f5fb20680f6524b6e317ba487efdc370e1f1f9ce.zip
Apart from a "const", the volume() and getVolume() function were identical.
Removed the volume() function. svn-id: r39868
Diffstat (limited to 'engines/cruise/sound.h')
-rw-r--r--engines/cruise/sound.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/cruise/sound.h b/engines/cruise/sound.h
index d2ffa080a8..2a2d6864ce 100644
--- a/engines/cruise/sound.h
+++ b/engines/cruise/sound.h
@@ -55,7 +55,7 @@ public:
~MusicPlayer();
void setVolume(int volume);
- int getVolume() { return _masterVolume; }
+ int getVolume() const { return _masterVolume; }
void stop();
void pause();
@@ -73,7 +73,6 @@ public:
bool songPlayed() const { return _songPlayed; }
bool isPlaying() const { return _isPlaying; }
bool looping() const { return _looping; }
- byte volume() const { return _masterVolume; }
byte *songData() { return _songPointer; }
void setPlaying(bool playing) { _isPlaying = playing; }
void setLoop(bool loop) { _looping = loop; }