aboutsummaryrefslogtreecommitdiff
path: root/sword2
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-11-02 10:12:08 +0000
committerPaweł Kołodziejski2003-11-02 10:12:08 +0000
commit9588a6fd31a050f3284b326541c4eedb7c108d8c (patch)
treefaf20ea8b693cc2b4d6e72214d3cd255f6e16f67 /sword2
parentb27a871f870df854a6db0f4530d4596483927bb1 (diff)
downloadscummvm-rg350-9588a6fd31a050f3284b326541c4eedb7c108d8c.tar.gz
scummvm-rg350-9588a6fd31a050f3284b326541c4eedb7c108d8c.tar.bz2
scummvm-rg350-9588a6fd31a050f3284b326541c4eedb7c108d8c.zip
fixed warnings
svn-id: r11046
Diffstat (limited to 'sword2')
-rw-r--r--sword2/controls.cpp2
-rw-r--r--sword2/driver/d_sound.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sword2/controls.cpp b/sword2/controls.cpp
index 71376c2911..bab8a55943 100644
--- a/sword2/controls.cpp
+++ b/sword2/controls.cpp
@@ -842,7 +842,7 @@ public:
// we need to update music volume immediately.
if (widget == _musicSwitch) {
- g_sound->muteMusic(result);
+ g_sound->muteMusic(result != 0);
} else if (widget == _musicSlider) {
g_sound->setMusicVolume(result);
g_sound->muteMusic(result == 0);
diff --git a/sword2/driver/d_sound.h b/sword2/driver/d_sound.h
index 8138acbf6f..8e7fab18c4 100644
--- a/sword2/driver/d_sound.h
+++ b/sword2/driver/d_sound.h
@@ -76,7 +76,7 @@ private:
OSystem::MutexRef _mutex;
RateConverter *_converter;
- uint32 _panTable[33];
+ int32 _panTable[33];
FxHandle _fx[MAXFX];
MusicHandle _music[MAXMUS + 1];