diff options
| -rw-r--r-- | engines/kyra/gui_lok.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/gui_lol.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/gui_v2.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/kyra_mr.cpp | 5 | ||||
| -rw-r--r-- | engines/kyra/kyra_mr.h | 2 | ||||
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/sound.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/sound.h | 2 | ||||
| -rw-r--r-- | engines/kyra/sound_midi.cpp | 3 |
9 files changed, 8 insertions, 20 deletions
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp index 4153edc29d..eba2f8f279 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui_lok.cpp @@ -579,8 +579,8 @@ void GUI_LoK::setupSavegames(Menu &menu, int num) { // Trim long GMM save descriptions to fit our save slots _screen->_charWidth = -2; int fC = _screen->getTextWidth(_savegameNames[i]); - while (strlen(_savegameNames[i]) && (fC > 240 || strlen(_savegameNames[i]) >= ARRAYSIZE(_savegameNames[0]))) { - _savegameNames[i][strlen(_savegameNames[i]) - 1] = 0; + while (_savegameNames[i][0] && (fC > 240 )) { + _savegameNames[i][strlen(_savegameNames[i]) - 1] = 0; fC = _screen->getTextWidth(_savegameNames[i]); } _screen->_charWidth = 0; diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp index 531079bc98..c64d3e7723 100644 --- a/engines/kyra/gui_lol.cpp +++ b/engines/kyra/gui_lol.cpp @@ -2580,7 +2580,7 @@ void GUI_LoL::setupSaveMenuSlots(Menu &menu, int num) { // Trim long GMM save descriptions to fit our save slots int fC = _screen->getTextWidth(s); - while (strlen(s) && fC >= saveSlotMaxLen) { + while (s[0] && fC >= saveSlotMaxLen) { s[strlen(s) - 1] = 0; fC = _screen->getTextWidth(s); } diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp index f086ef368f..dcc53b7c9e 100644 --- a/engines/kyra/gui_v2.cpp +++ b/engines/kyra/gui_v2.cpp @@ -460,7 +460,7 @@ void GUI_v2::setupSavegameNames(Menu &menu, int num) { // Trim long GMM save descriptions to fit our save slots _screen->_charWidth = -2; int fC = _screen->getTextWidth(s); - while (strlen(s) && fC > 240) { + while (s[0] && fC > 240) { s[strlen(s) - 1] = 0; fC = _screen->getTextWidth(s); } diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index c6a5d60bb8..f5bcd04ea0 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -1195,11 +1195,6 @@ void KyraEngine_MR::updateMouse() { } } -void KyraEngine_MR::pauseEngineIntern(bool pause) { - _mixer->pauseAll(pause); - _timer->pause(pause); -} - #pragma mark - void KyraEngine_MR::makeCharFacingMouse() { diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h index e03ae08559..b762648d29 100644 --- a/engines/kyra/kyra_mr.h +++ b/engines/kyra/kyra_mr.h @@ -105,8 +105,6 @@ private: void updateWithText(); void updateMouse(); - void pauseEngineIntern(bool pause); - // sound specific private: void playMenuAudioFile(); diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 3d81368d2d..3b2c9b67eb 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -83,7 +83,9 @@ KyraEngine_v1::KyraEngine_v1(OSystem *system, const GameFlags &flags) } void KyraEngine_v1::pauseEngineIntern(bool pause) { - _sound->pause(pause); + Engine::pauseEngineIntern(pause); + if (_sound) + _sound->pause(pause); _timer->pause(pause); } diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 3713537afd..4da35cc28b 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -43,10 +43,6 @@ Sound::Sound(KyraEngine_v1 *vm, Audio::Mixer *mixer) Sound::~Sound() { } -void Sound::pause(bool paused) { - _mixer->pauseAll(paused); -} - bool Sound::voiceFileIsPresent(const char *file) { for (int i = 0; _supportedCodecs[i].fileext; ++i) { Common::String f = file; diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index 566b37ff43..c3c32331be 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -156,7 +156,7 @@ public: /** * Stops all audio playback when paused. Continues after end of pause. */ - virtual void pause(bool paused); + virtual void pause(bool paused) {} void enableMusic(int enable) { _musicEnabled = enable; } int musicEnabled() const { return _musicEnabled; } diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp index dc0f8c11ec..26b6b31d0a 100644 --- a/engines/kyra/sound_midi.cpp +++ b/engines/kyra/sound_midi.cpp @@ -716,9 +716,6 @@ void SoundMidiPC::beginFadeOut() { } void SoundMidiPC::pause(bool paused) { - // Stop all mixer related sounds - Sound::pause(paused); - Common::StackLock lock(_mutex); if (paused) { |