From 1a1c663ddd3531542610e7d0b2cb941add382916 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Thu, 24 Oct 2019 08:06:16 +0200 Subject: GRIFFON: Some renaming --- engines/griffon/cutscenes.cpp | 12 +++++----- engines/griffon/dialogs.cpp | 44 +++++++++++++++++------------------ engines/griffon/engine.cpp | 6 ++--- engines/griffon/griffon.cpp | 4 ++-- engines/griffon/griffon.h | 5 ++-- engines/griffon/sound.cpp | 53 +++++++++++++++++++++++-------------------- 6 files changed, 63 insertions(+), 61 deletions(-) (limited to 'engines/griffon') diff --git a/engines/griffon/cutscenes.cpp b/engines/griffon/cutscenes.cpp index 79bc5dac2c..ef77c76fdf 100644 --- a/engines/griffon/cutscenes.cpp +++ b/engines/griffon/cutscenes.cpp @@ -182,8 +182,8 @@ void GriffonEngine::intro() { if (config.music) { haltSoundChannel(-1); - _musicchannel = playSound(_mendofgame, true); - setChannelVolume(_musicchannel, 0); + _musicChannel = playSound(_mendofgame, true); + setChannelVolume(_musicChannel, 0); } _secsingame = 0; @@ -200,7 +200,7 @@ void GriffonEngine::intro() { if ((int)ld > config.musicvol) ld = config.musicvol; if (!ldstop) { - setChannelVolume(_musicchannel, (int)ld); + setChannelVolume(_musicChannel, (int)ld); if ((int)ld == config.musicvol) ldstop = true; } @@ -276,8 +276,8 @@ void GriffonEngine::endOfGame() { if (config.music) { haltSoundChannel(-1); - _musicchannel = playSound(_mendofgame, true); - setChannelVolume(_musicchannel, 0); + _musicChannel = playSound(_mendofgame, true); + setChannelVolume(_musicChannel, 0); } int ticks1 = _ticks; @@ -295,7 +295,7 @@ void GriffonEngine::endOfGame() { if (ld > config.musicvol) ld = config.musicvol; if (!ldstop) { - setChannelVolume(_musicchannel, (int)ld); + setChannelVolume(_musicChannel, (int)ld); if ((int)ld == config.musicvol) ldstop = true; } diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp index cefc30b3e8..7ef03ef909 100644 --- a/engines/griffon/dialogs.cpp +++ b/engines/griffon/dialogs.cpp @@ -67,11 +67,11 @@ void GriffonEngine::title(int mode) { int ticks1 = _ticks; if (config.music) { - setChannelVolume(_musicchannel, 0); - pauseSoundChannel(_musicchannel); + setChannelVolume(_musicChannel, 0); + pauseSoundChannel(_musicChannel); - _menuchannel = playSound(_mmenu, true); - setChannelVolume(_menuchannel, config.musicvol); + _menuChannel = playSound(_mmenu, true); + setChannelVolume(_menuChannel, config.musicvol); _pmenu = true; } @@ -85,7 +85,7 @@ void GriffonEngine::title(int mode) { if (ld > config.musicvol) ld = config.musicvol; if (!ldstop) { - setChannelVolume(_menuchannel, (int)ld); + setChannelVolume(_menuChannel, (int)ld); if ((int)ld == config.musicvol) ldstop = true; } @@ -203,9 +203,9 @@ void GriffonEngine::title(int mode) { _itemticks = _ticks + 210; if (config.music) { - haltSoundChannel(_menuchannel); - resumeSoundChannel(_musicchannel); - setChannelVolume(_musicchannel, config.musicvol); + haltSoundChannel(_menuChannel); + resumeSoundChannel(_musicChannel); + setChannelVolume(_musicChannel, config.musicvol); _pmenu = false; } } @@ -362,16 +362,16 @@ void GriffonEngine::configMenu() { if (config.musicvol < 0) config.musicvol = 0; - setChannelVolume(_musicchannel, config.musicvol); - setChannelVolume(_menuchannel, config.musicvol); + setChannelVolume(_musicChannel, config.musicvol); + setChannelVolume(_menuChannel, config.musicvol); } else if (cursel == 12) { config.effectsvol -= 25; if (config.effectsvol < 0) config.effectsvol = 0; setChannelVolume(-1, config.effectsvol); - setChannelVolume(_musicchannel, config.musicvol); - setChannelVolume(_menuchannel, config.musicvol); + setChannelVolume(_musicChannel, config.musicvol); + setChannelVolume(_menuChannel, config.musicvol); if (config.effects) { int snd = playSound(_sfx[kSndDoor]); @@ -385,16 +385,16 @@ void GriffonEngine::configMenu() { if (config.musicvol > 255) config.musicvol = 255; - setChannelVolume(_musicchannel, config.musicvol); - setChannelVolume(_menuchannel, config.musicvol); + setChannelVolume(_musicChannel, config.musicvol); + setChannelVolume(_menuChannel, config.musicvol); } else if (cursel == 12) { config.effectsvol += 25; if (config.effectsvol > 255) config.effectsvol = 255; setChannelVolume(-1, config.effectsvol); - setChannelVolume(_musicchannel, config.musicvol); - setChannelVolume(_menuchannel, config.musicvol); + setChannelVolume(_musicChannel, config.musicvol); + setChannelVolume(_menuChannel, config.musicvol); if (config.effects) { int snd = playSound(_sfx[kSndDoor]); @@ -417,13 +417,13 @@ void GriffonEngine::configMenu() { if (_event.kbd.keycode == Common::KEYCODE_RETURN) { if (cursel == 7 && !config.music) { config.music = true; - _menuchannel = playSound(_mmenu, true); - setChannelVolume(_menuchannel, config.musicvol); + _menuChannel = playSound(_mmenu, true); + setChannelVolume(_menuChannel, config.musicvol); } if (cursel == 8 && config.music) { config.music = false; - haltSoundChannel(_musicchannel); - haltSoundChannel(_menuchannel); + haltSoundChannel(_musicChannel); + haltSoundChannel(_menuChannel); } if (cursel == 9 && !config.effects) { config.effects = true; @@ -560,8 +560,8 @@ void GriffonEngine::saveLoadNew() { attacking = false; _player.attackSpeed = 1.5f; - _pgardens = false; - _pboss = false; + _playingGardens = false; + _playingBoss = false; haltSoundChannel(-1); diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp index 00aed92a21..b8f7e30079 100644 --- a/engines/griffon/engine.cpp +++ b/engines/griffon/engine.cpp @@ -52,7 +52,7 @@ void GriffonEngine::mainLoop() { swash(); if (_pmenu) { - haltSoundChannel(_menuchannel); + haltSoundChannel(_menuChannel); _pmenu = false; } @@ -315,8 +315,8 @@ void GriffonEngine::newGame() { _player.py = 6 * 16 - 4; _player.walkDir = 1; - _pgardens = false; - _pboss = false; + _playingGardens = false; + _playingBoss = false; loadMap(2); diff --git a/engines/griffon/griffon.cpp b/engines/griffon/griffon.cpp index 33d1134d11..aaa69c71e6 100644 --- a/engines/griffon/griffon.cpp +++ b/engines/griffon/griffon.cpp @@ -48,8 +48,8 @@ GriffonEngine::GriffonEngine(OSystem *syst) : Engine(syst) { _shouldQuit = false; - _musicchannel = -1; - _menuchannel = -1; + _musicChannel = -1; + _menuChannel = -1; _loopseta = 0; clouddeg = 0.0f; diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h index 364e769bbb..d82d44b147 100644 --- a/engines/griffon/griffon.h +++ b/engines/griffon/griffon.h @@ -484,9 +484,8 @@ private: // music info DataChunk *_mgardens, *_mgardens2, *_mgardens3, *_mgardens4, *_mboss, *_mmenu, *_mendofgame; - int _musicchannel, _menuchannel; - bool _pboss; - bool _pgardens; + int _musicChannel, _menuChannel; + bool _playingBoss, _playingGardens; int _loopseta; DataChunk *_sfx[21]; diff --git a/engines/griffon/sound.cpp b/engines/griffon/sound.cpp index f80050d014..59e7b075c1 100644 --- a/engines/griffon/sound.cpp +++ b/engines/griffon/sound.cpp @@ -193,50 +193,53 @@ void GriffonEngine::updateMusic() { DataChunk *iplaysound = NULL; if (config.music) { - // if(_curmap > 5 && _curmap < 42) iplaysound = macademy; // if(_curmap > 47) iplaysound = _mgardens; iplaysound = _mgardens; if (_roomlock) iplaysound = _mboss; - if (iplaysound == _mboss && _pboss) + if (iplaysound == _mboss && _playingBoss) iplaysound = NULL; - if (iplaysound == _mgardens && _pgardens) + if (iplaysound == _mgardens && _playingGardens) iplaysound = NULL; if (iplaysound != NULL) { - haltSoundChannel(_musicchannel); - - _pboss = false; - _pgardens = false; + haltSoundChannel(_musicChannel); - if (iplaysound == _mboss) - _pboss = true; - if (iplaysound == _mgardens) - _pgardens = true; + _playingBoss = (iplaysound == _mboss); + _playingGardens = (iplaysound == _mgardens); - _musicchannel = playSound(iplaysound, true); - setChannelVolume(_musicchannel, config.musicvol); + _musicChannel = playSound(iplaysound, true); + setChannelVolume(_musicChannel, config.musicvol); } else { - if (!isSoundChannelPlaying(_musicchannel)) { + if (!isSoundChannelPlaying(_musicChannel)) { _loopseta += 1; if (_loopseta == 4) _loopseta = 0; - if (_pgardens) { - haltSoundChannel(_musicchannel); - if (_pgardens && _loopseta == 0) - _musicchannel = playSound(_mgardens); - if (_pgardens && _loopseta == 1) - _musicchannel = playSound(_mgardens2); - if (_pgardens && _loopseta == 2) - _musicchannel = playSound(_mgardens3); - if (_pgardens && _loopseta == 3) - _musicchannel = playSound(_mgardens4); + if (_playingGardens) { + haltSoundChannel(_musicChannel); + if (_playingGardens) { + switch (_loopseta) { + case 0: + playSound(_mgardens); + break; + case 1: + playSound(_mgardens2); + break; + case 2: + playSound(_mgardens3); + break; + case 3: + playSound(_mgardens4); + default: + break; + } + } } - setChannelVolume(_musicchannel, config.musicvol); + setChannelVolume(_musicChannel, config.musicvol); } } } -- cgit v1.2.3