diff options
| -rw-r--r-- | base/main.cpp | 2 | ||||
| -rw-r--r-- | sword2/controls.cpp | 2 | ||||
| -rw-r--r-- | sword2/driver/d_sound.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/base/main.cpp b/base/main.cpp index a494715a6a..9f02ba4350 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -283,7 +283,7 @@ int main(int argc, char *argv[]) { } // (De)activate fullscreen mode as determined by the config settings - if (ConfMan.getBool("fullscreen") != system->property(OSystem::PROP_GET_FULLSCREEN, 0)) + if (ConfMan.getBool("fullscreen") != (system->property(OSystem::PROP_GET_FULLSCREEN, 0) != 0)) system->property(OSystem::PROP_TOGGLE_FULLSCREEN, 0); // Create the game engine 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]; |