aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/wintermute/Base/BSoundMgr.cpp6
-rw-r--r--engines/wintermute/Base/BSubFrame.cpp2
-rw-r--r--engines/wintermute/Base/BSurface.h1
3 files changed, 7 insertions, 2 deletions
diff --git a/engines/wintermute/Base/BSoundMgr.cpp b/engines/wintermute/Base/BSoundMgr.cpp
index 6346971c54..0cc0020e1e 100644
--- a/engines/wintermute/Base/BSoundMgr.cpp
+++ b/engines/wintermute/Base/BSoundMgr.cpp
@@ -191,6 +191,8 @@ ERRORCODE CBSoundMgr::setVolume(Audio::Mixer::SoundType type, int volume) {
case Audio::Mixer::kMusicSoundType:
ConfMan.setInt("music_volume", volume);
break;
+ case Audio::Mixer::kPlainSoundType:
+ error("Plain sound type shouldn't be used in WME");
}
g_wintermute->syncSoundSettings();
@@ -228,11 +230,13 @@ ERRORCODE CBSoundMgr::setMasterVolume(byte value) {
for (int i = 0; i < _sounds.getSize(); i++) {
_sounds[i]->updateVolume();
}
+ return STATUS_OK;
}
//////////////////////////////////////////////////////////////////////////
ERRORCODE CBSoundMgr::setMasterVolumePercent(byte percent) {
setMasterVolume(percent * 255 / 100);
+ return STATUS_OK;
}
@@ -243,7 +247,7 @@ byte CBSoundMgr::getMasterVolumePercent() {
//////////////////////////////////////////////////////////////////////////
byte CBSoundMgr::getMasterVolume() {
- return _volumeMaster;
+ return (byte)_volumeMaster;
}
diff --git a/engines/wintermute/Base/BSubFrame.cpp b/engines/wintermute/Base/BSubFrame.cpp
index aa8ce926dc..19c1bcc5f2 100644
--- a/engines/wintermute/Base/BSubFrame.cpp
+++ b/engines/wintermute/Base/BSubFrame.cpp
@@ -253,7 +253,7 @@ ERRORCODE CBSubFrame::saveAsText(CBDynBuffer *buffer, int indent, bool complete)
if (complete)
buffer->putTextIndent(indent, "SUBFRAME {\n");
- if (_surface && _surface->getFileName() != "")
+ if (_surface && _surface->getFileNameStr() != "")
buffer->putTextIndent(indent + 2, "IMAGE = \"%s\"\n", _surface->getFileName());
if (_transparent != 0xFFFF00FF)
diff --git a/engines/wintermute/Base/BSurface.h b/engines/wintermute/Base/BSurface.h
index cb19a23271..fe00348488 100644
--- a/engines/wintermute/Base/BSurface.h
+++ b/engines/wintermute/Base/BSurface.h
@@ -83,6 +83,7 @@ public:
virtual int getHeight() {
return _height;
}
+ Common::String getFileNameStr() { return _filename; }
const char* getFileName() { return _filename.c_str(); }
//void SetWidth(int Width){ _width = Width; }
//void SetHeight(int Height){ _height = Height; }