diff options
author | Strangerke | 2019-10-31 21:28:42 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2019-11-13 22:07:08 +0100 |
commit | 8438b9c9bbd52841ee8ef35e42dd660f0ab88e1a (patch) | |
tree | ef8bb0385addc8d643705e58ba98651e9754c7b9 | |
parent | b4b6f249f8ae965e295e395d268918b5b50613df (diff) | |
download | scummvm-rg350-8438b9c9bbd52841ee8ef35e42dd660f0ab88e1a.tar.gz scummvm-rg350-8438b9c9bbd52841ee8ef35e42dd660f0ab88e1a.tar.bz2 scummvm-rg350-8438b9c9bbd52841ee8ef35e42dd660f0ab88e1a.zip |
GRIFFON: Some more renaming
-rw-r--r-- | engines/griffon/combat.cpp | 52 | ||||
-rw-r--r-- | engines/griffon/config.cpp | 14 | ||||
-rw-r--r-- | engines/griffon/config.h | 8 | ||||
-rw-r--r-- | engines/griffon/cutscenes.cpp | 16 | ||||
-rw-r--r-- | engines/griffon/dialogs.cpp | 54 | ||||
-rw-r--r-- | engines/griffon/draw.cpp | 4 | ||||
-rw-r--r-- | engines/griffon/engine.cpp | 4 | ||||
-rw-r--r-- | engines/griffon/griffon.cpp | 2 | ||||
-rw-r--r-- | engines/griffon/griffon.h | 2 | ||||
-rw-r--r-- | engines/griffon/input.cpp | 14 | ||||
-rw-r--r-- | engines/griffon/logic.cpp | 36 | ||||
-rw-r--r-- | engines/griffon/sound.cpp | 38 |
12 files changed, 122 insertions, 122 deletions
diff --git a/engines/griffon/combat.cpp b/engines/griffon/combat.cpp index ee76536716..c469b02b75 100644 --- a/engines/griffon/combat.cpp +++ b/engines/griffon/combat.cpp @@ -71,7 +71,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -81,7 +81,7 @@ void GriffonEngine::attack() { } else { if (config.effects) { int snd = playSound(_sfx[kSndChest]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } eventText("Cannot Carry any more Flasks!"); @@ -105,7 +105,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -120,7 +120,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -139,7 +139,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -160,7 +160,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -181,7 +181,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } _objectMapFull[_curMap][lx][ly - 1] = 1; @@ -194,7 +194,7 @@ void GriffonEngine::attack() { } else { if (config.effects) { int snd = playSound(_sfx[kSndChest]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } eventText("Cannot Carry Any More Keys"); @@ -209,7 +209,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -219,7 +219,7 @@ void GriffonEngine::attack() { } else { if (config.effects) { int snd = playSound(_sfx[kSndChest]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } eventText("Cannot Carry any more Mega Flasks!"); @@ -237,7 +237,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -247,7 +247,7 @@ void GriffonEngine::attack() { } else { if (config.effects) { int snd = playSound(_sfx[kSndChest]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } eventText("Cannot Carry any more Mega Flasks!"); @@ -264,7 +264,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -274,7 +274,7 @@ void GriffonEngine::attack() { } else { if (config.effects) { int snd = playSound(_sfx[kSndChest]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } eventText("Cannot Carry any more Lightning Bombs!"); @@ -290,7 +290,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -307,26 +307,26 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndLever]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } else if (_curMap == 58 && _scriptFlag[kScriptLever][0] > 0) { if (config.effects) { int snd = playSound(_sfx[kSndDoor]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } eventText("It's stuck!"); } else if (_curMap == 54 && _scriptFlag[kScriptLever][0] == 1) { if (config.effects) { int snd = playSound(_sfx[kSndLever]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } _scriptFlag[kScriptLever][0] = 2; } else if (_curMap == 54 && _scriptFlag[kScriptLever][0] > 1) { if (config.effects) { int snd = playSound(_sfx[kSndDoor]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } eventText("It's stuck!"); @@ -342,7 +342,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -360,7 +360,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -378,7 +378,7 @@ void GriffonEngine::attack() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } if (_objectInfo[o][4] == 1) @@ -438,7 +438,7 @@ void GriffonEngine::castSpell(int spellnum, float homex, float homey, float enem case 1: if (config.effects) { int snd = playSound(_sfx[kSndThrow]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } break; case 2: @@ -458,7 +458,7 @@ void GriffonEngine::castSpell(int spellnum, float homex, float homey, float enem case 5: if (config.effects) { int snd = playSound(_sfx[kSndCrystal]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } break; case 6: { @@ -487,7 +487,7 @@ void GriffonEngine::castSpell(int spellnum, float homex, float homey, float enem case 9: if (config.effects) { int snd = playSound(_sfx[kSndLightning]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } break; default: @@ -538,7 +538,7 @@ void GriffonEngine::checkHit() { if (hit) { if (config.effects) { int snd = playSound(_sfx[kSndSwordHit]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } damageNPC(i, damage, 0); diff --git a/engines/griffon/config.cpp b/engines/griffon/config.cpp index 58ee59d051..5b9b39644e 100644 --- a/engines/griffon/config.cpp +++ b/engines/griffon/config.cpp @@ -41,7 +41,7 @@ namespace Griffon { CONFIG config; -void config_load(CONFIG *config) { +void loadConfig(CONFIG *config) { bool mute = false; config->music = config->effects = false; @@ -53,16 +53,16 @@ void config_load(CONFIG *config) { config->effects = !ConfMan.getBool("sfx_mute"); } - config->musicvol = ConfMan.getInt("music_volume"); - config->effectsvol = ConfMan.getInt("sfx_volume"); + config->musicVol = ConfMan.getInt("music_volume"); + config->effectsVol = ConfMan.getInt("sfx_volume"); } -void config_save(CONFIG *config) { - ConfMan.setBool("mute", !(config->music || config->effectsvol)); +void saveConfig(CONFIG *config) { + ConfMan.setBool("mute", !(config->music || config->effectsVol)); ConfMan.setBool("music_mute", !config->music); ConfMan.setBool("sfx_mute", !config->effects); - ConfMan.setInt("music_volume", config->musicvol); - ConfMan.setInt("sfx_volume", config->effectsvol); + ConfMan.setInt("music_volume", config->musicVol); + ConfMan.setInt("sfx_volume", config->effectsVol); ConfMan.flushToDisk(); } diff --git a/engines/griffon/config.h b/engines/griffon/config.h index 686b8efa7f..0c46e62537 100644 --- a/engines/griffon/config.h +++ b/engines/griffon/config.h @@ -41,15 +41,15 @@ namespace Griffon { struct CONFIG { bool music; - int musicvol; + int musicVol; bool effects; - int effectsvol; + int effectsVol; }; extern CONFIG config; -void config_load(CONFIG *config); -void config_save(CONFIG *config); +void loadConfig(CONFIG *config); +void saveConfig(CONFIG *config); } // end of namespace Griffon diff --git a/engines/griffon/cutscenes.cpp b/engines/griffon/cutscenes.cpp index 994fcadb9e..f97b28420b 100644 --- a/engines/griffon/cutscenes.cpp +++ b/engines/griffon/cutscenes.cpp @@ -182,7 +182,7 @@ void GriffonEngine::intro() { if (config.music) { haltSoundChannel(-1); - _musicChannel = playSound(_mendofgame, true); + _musicChannel = playSound(_musicEndOfGame, true); setChannelVolume(_musicChannel, 0); } @@ -197,11 +197,11 @@ void GriffonEngine::intro() { Common::Rect rc; ld += 4 * _fpsr; - if ((int)ld > config.musicvol) - ld = config.musicvol; + if ((int)ld > config.musicVol) + ld = config.musicVol; if (!ldstop) { setChannelVolume(_musicChannel, (int)ld); - if ((int)ld == config.musicvol) + if ((int)ld == config.musicVol) ldstop = true; } @@ -276,7 +276,7 @@ void GriffonEngine::endOfGame() { if (config.music) { haltSoundChannel(-1); - _musicChannel = playSound(_mendofgame, true); + _musicChannel = playSound(_musicEndOfGame, true); setChannelVolume(_musicChannel, 0); } @@ -292,11 +292,11 @@ void GriffonEngine::endOfGame() { do { ld = ld + 4 * _fpsr; - if (ld > config.musicvol) - ld = config.musicvol; + if (ld > config.musicVol) + ld = config.musicVol; if (!ldstop) { setChannelVolume(_musicChannel, (int)ld); - if ((int)ld == config.musicvol) + if ((int)ld == config.musicVol) ldstop = true; } diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp index 7d09d0e257..fbcabc7ed9 100644 --- a/engines/griffon/dialogs.cpp +++ b/engines/griffon/dialogs.cpp @@ -72,8 +72,8 @@ void GriffonEngine::title(int mode) { setChannelVolume(_musicChannel, 0); pauseSoundChannel(_musicChannel); - _menuChannel = playSound(_mmenu, true); - setChannelVolume(_menuChannel, config.musicvol); + _menuChannel = playSound(_musicMenu, true); + setChannelVolume(_menuChannel, config.musicVol); _pmenu = true; } @@ -84,11 +84,11 @@ void GriffonEngine::title(int mode) { Common::Rect rc; ld += 4.0 * _fpsr; - if (ld > config.musicvol) - ld = config.musicvol; + if (ld > config.musicVol) + ld = config.musicVol; if (!ldstop) { setChannelVolume(_menuChannel, (int)ld); - if ((int)ld == config.musicvol) + if ((int)ld == config.musicVol) ldstop = true; } @@ -221,7 +221,7 @@ void GriffonEngine::title(int mode) { if (config.music) { haltSoundChannel(_menuChannel); resumeSoundChannel(_musicChannel); - setChannelVolume(_musicChannel, config.musicvol); + setChannelVolume(_musicChannel, config.musicVol); _pmenu = false; } } @@ -299,7 +299,7 @@ void GriffonEngine::configMenu() { else if (i == 13 && !config.effects) destColumn = 0; else if (i == 15 || i == 17) { - int vol = (i == 15 ? config.musicvol : config.effectsvol) * 9 / 255; + int vol = (i == 15 ? config.musicVol : config.effectsVol) * 9 / 255; vol = CLIP(vol, 0, 9); strcpy(line, "[----------]"); @@ -373,36 +373,36 @@ void GriffonEngine::configMenu() { if (_event.kbd.keycode == Common::KEYCODE_LEFT) { if (cursel == 11) { - config.musicvol = CLIP(config.musicvol - 25, 0, 255); - setChannelVolume(_musicChannel, config.musicvol); - setChannelVolume(_menuChannel, config.musicvol); + config.musicVol = CLIP(config.musicVol - 25, 0, 255); + setChannelVolume(_musicChannel, config.musicVol); + setChannelVolume(_menuChannel, config.musicVol); } else if (cursel == 12) { - config.effectsvol = CLIP(config.effectsvol - 25, 0, 255); - setChannelVolume(-1, config.effectsvol); - setChannelVolume(_musicChannel, config.musicvol); - setChannelVolume(_menuChannel, config.musicvol); + config.effectsVol = CLIP(config.effectsVol - 25, 0, 255); + setChannelVolume(-1, config.effectsVol); + setChannelVolume(_musicChannel, config.musicVol); + setChannelVolume(_menuChannel, config.musicVol); if (config.effects) { int snd = playSound(_sfx[kSndDoor]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } if (_event.kbd.keycode == Common::KEYCODE_RIGHT) { if (cursel == 11) { - config.musicvol = CLIP(config.musicvol + 25, 0, 255); - setChannelVolume(_musicChannel, config.musicvol); - setChannelVolume(_menuChannel, config.musicvol); + config.musicVol = CLIP(config.musicVol + 25, 0, 255); + setChannelVolume(_musicChannel, config.musicVol); + setChannelVolume(_menuChannel, config.musicVol); } else if (cursel == 12) { - config.effectsvol = CLIP(config.effectsvol + 25, 0, 255); + config.effectsVol = CLIP(config.effectsVol + 25, 0, 255); - setChannelVolume(-1, config.effectsvol); - setChannelVolume(_musicChannel, config.musicvol); - setChannelVolume(_menuChannel, config.musicvol); + setChannelVolume(-1, config.effectsVol); + setChannelVolume(_musicChannel, config.musicVol); + setChannelVolume(_menuChannel, config.musicVol); if (config.effects) { int snd = playSound(_sfx[kSndDoor]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } @@ -423,8 +423,8 @@ void GriffonEngine::configMenu() { case 7: if (!config.music) { config.music = true; - _menuChannel = playSound(_mmenu, true); - setChannelVolume(_menuChannel, config.musicvol); + _menuChannel = playSound(_musicMenu, true); + setChannelVolume(_menuChannel, config.musicVol); } break; case 8: @@ -438,7 +438,7 @@ void GriffonEngine::configMenu() { if (!config.effects) { config.effects = true; int snd = playSound(_sfx[kSndDoor]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } break; case 10: @@ -446,7 +446,7 @@ void GriffonEngine::configMenu() { config.effects = false; break; case 13: - config_save(&config); + saveConfig(&config); // no break on purpose case 14: exitMenu = true; diff --git a/engines/griffon/draw.cpp b/engines/griffon/draw.cpp index 70fb073f82..6575e0e754 100644 --- a/engines/griffon/draw.cpp +++ b/engines/griffon/draw.cpp @@ -839,7 +839,7 @@ void GriffonEngine::drawNPCs(int mode) { damagePlayer(damage); if (config.effects) { int snd = playSound(_sfx[kSndFire]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } @@ -865,7 +865,7 @@ void GriffonEngine::drawNPCs(int mode) { damagePlayer(damage); if (config.effects) { int snd = playSound(_sfx[kSndFire]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp index 9aa1c1b78a..2a8c865656 100644 --- a/engines/griffon/engine.cpp +++ b/engines/griffon/engine.cpp @@ -170,7 +170,7 @@ void GriffonEngine::updateEngine() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } @@ -232,7 +232,7 @@ void GriffonEngine::updateEngine() { _player.hpflashb = 0; if (config.effects && _player.hpflashb == 0 && _player.hp < _player.maxHp / 4) { int snd = playSound(_sfx[kSndBeep]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } diff --git a/engines/griffon/griffon.cpp b/engines/griffon/griffon.cpp index ad9b665f04..653c899cb7 100644 --- a/engines/griffon/griffon.cpp +++ b/engines/griffon/griffon.cpp @@ -65,7 +65,7 @@ GriffonEngine::GriffonEngine(OSystem *syst) : Engine(syst) { // Synchronize the sound settings from ScummVM syncSoundSettings(); - config_load(&config); + loadConfig(&config); } GriffonEngine::~GriffonEngine() { diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h index 556a7014cd..366dda2e14 100644 --- a/engines/griffon/griffon.h +++ b/engines/griffon/griffon.h @@ -485,7 +485,7 @@ private: int _lastNpc; // music info - DataChunk *_mgardens, *_mgardens2, *_mgardens3, *_mgardens4, *_mboss, *_mmenu, *_mendofgame; + DataChunk *_musicGardens1, *_musicGardens2, *_musicGardens3, *_musicGardens4, *_musicBoss, *_musicMenu, *_musicEndOfGame; int _musicChannel, _menuChannel; bool _playingBoss, _playingGardens; diff --git a/engines/griffon/input.cpp b/engines/griffon/input.cpp index 7f8f5992b0..5d66b65b4c 100644 --- a/engines/griffon/input.cpp +++ b/engines/griffon/input.cpp @@ -104,7 +104,7 @@ void GriffonEngine::checkInputs() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } _itemSelOn = false; @@ -130,7 +130,7 @@ void GriffonEngine::checkInputs() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } _itemSelOn = false; @@ -556,7 +556,7 @@ void GriffonEngine::handleWalking() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } @@ -570,7 +570,7 @@ void GriffonEngine::handleWalking() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } @@ -586,7 +586,7 @@ void GriffonEngine::handleWalking() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } @@ -601,7 +601,7 @@ void GriffonEngine::handleWalking() { if (config.effects) { int snd = playSound(_sfx[kSndPowerUp]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } @@ -672,7 +672,7 @@ void GriffonEngine::processTrigger(int trignum) { if (tmap > 0) { if (config.effects) { int snd = playSound(_sfx[kSndDoor]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } loadMap(tmap); diff --git a/engines/griffon/logic.cpp b/engines/griffon/logic.cpp index 1918cc333f..81133e2fa2 100644 --- a/engines/griffon/logic.cpp +++ b/engines/griffon/logic.cpp @@ -539,7 +539,7 @@ void GriffonEngine::updateNPCs() { if ((int)(RND() * 2) == 0) { if (config.effects) { int snd = playSound(_sfx[kSndEnemyHit]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } _npcInfo[i].attacking = true; @@ -566,7 +566,7 @@ void GriffonEngine::updateNPCs() { if ((dist) < 24) { if (config.effects) { int snd = playSound(_sfx[kSndBite]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } _npcInfo[i].attacking = true; @@ -672,7 +672,7 @@ void GriffonEngine::updateNPCs() { if ((dist) < 36) { if (config.effects) { int snd = playSound(_sfx[kSndBite]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } _npcInfo[i].attacking = true; @@ -852,7 +852,7 @@ void GriffonEngine::updateNPCs() { if ((dist) < 24) { if (config.effects) { int snd = playSound(_sfx[kSndBite]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } _npcInfo[i].attacking = true; @@ -926,7 +926,7 @@ void GriffonEngine::updateNPCs() { if ((int)(RND() * 2) == 0) { if (config.effects) { int snd = playSound(_sfx[kSndEnemyHit]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } _npcInfo[i].attacking = true; @@ -951,7 +951,7 @@ void GriffonEngine::updateNPCs() { if ((int)(RND() * 2) == 0) { if (config.effects) { int snd = playSound(_sfx[kSndIce]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } _npcInfo[i].attacking = true; _npcInfo[i].attackframe = 0; @@ -1323,7 +1323,7 @@ void GriffonEngine::updateSpells() { damageNPC(e, damage, 1); if (config.effects) { int snd = playSound(_sfx[kSndIce]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } @@ -1351,7 +1351,7 @@ void GriffonEngine::updateSpells() { if (config.effects) { int snd = playSound(_sfx[kSndIce]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } @@ -1402,7 +1402,7 @@ void GriffonEngine::updateSpells() { damageNPC(e, damage, 1); if (config.effects) { int snd = playSound(_sfx[kSndMetalHit]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } @@ -1442,7 +1442,7 @@ void GriffonEngine::updateSpells() { damagePlayer(damage); if (config.effects) { int snd = playSound(_sfx[kSndMetalHit]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } @@ -1470,7 +1470,7 @@ void GriffonEngine::updateSpells() { if (config.effects) { int snd = playSound(_sfx[kSndMetalHit]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } @@ -1521,7 +1521,7 @@ void GriffonEngine::updateSpells() { damageNPC(e, damage, 1); if (config.effects) { int snd = playSound(_sfx[kSndRocks]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } @@ -1550,7 +1550,7 @@ void GriffonEngine::updateSpells() { if (config.effects) { int snd = playSound(_sfx[kSndRocks]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } @@ -1750,7 +1750,7 @@ void GriffonEngine::updateSpells() { if (config.effects) { int snd = playSound(_sfx[kSndFire]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } @@ -2229,7 +2229,7 @@ void GriffonEngine::updateSpellsUnder() { damageNPC(e, damage, 1); if (config.effects) { int snd = playSound(_sfx[kSndFire]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } @@ -2248,7 +2248,7 @@ void GriffonEngine::updateSpellsUnder() { if (config.effects) { int snd = playSound(_sfx[kSndFire]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } } @@ -2273,7 +2273,7 @@ void GriffonEngine::updateSpellsUnder() { if (config.effects) { int snd = playSound(_sfx[kSndFire]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } addFloatIcon(99, _postInfo[e][0], _postInfo[e][1]); @@ -2340,7 +2340,7 @@ void GriffonEngine::updateSpellsUnder() { damagePlayer(damage); if (config.effects) { int snd = playSound(_sfx[kSndFire]); - setChannelVolume(snd, config.effectsvol); + setChannelVolume(snd, config.effectsVol); } } diff --git a/engines/griffon/sound.cpp b/engines/griffon/sound.cpp index 2e79320e39..b0e75fcf95 100644 --- a/engines/griffon/sound.cpp +++ b/engines/griffon/sound.cpp @@ -143,19 +143,19 @@ void GriffonEngine::setupAudio() { rcDest.top = 116 + 12 + 12; rcDest.setHeight(8); - _mboss = cacheSound("music/boss.ogg"); + _musicBoss = cacheSound("music/boss.ogg"); drawProgress(1, 21); - _mgardens = cacheSound("music/gardens.ogg"); + _musicGardens1 = cacheSound("music/gardens.ogg"); drawProgress(2, 21); - _mgardens2 = cacheSound("music/gardens2.ogg"); + _musicGardens2 = cacheSound("music/gardens2.ogg"); drawProgress(3, 21); - _mgardens3 = cacheSound("music/gardens3.ogg"); + _musicGardens3 = cacheSound("music/gardens3.ogg"); drawProgress(4, 21); - _mgardens4 = cacheSound("music/gardens4.ogg"); + _musicGardens4 = cacheSound("music/gardens4.ogg"); drawProgress(5, 21); - _mendofgame = cacheSound("music/endofgame.ogg"); + _musicEndOfGame = cacheSound("music/endofgame.ogg"); drawProgress(6, 21); - _mmenu = cacheSound("music/menu.ogg"); + _musicMenu = cacheSound("music/menu.ogg"); drawProgress(7, 21); _sfx[kSndBite] = cacheSound("sfx/bite.ogg"); @@ -197,23 +197,23 @@ void GriffonEngine::updateMusic() { if (config.music) { // if(_curmap > 5 && _curmap < 42) iplaysound = macademy; // if(_curmap > 47) iplaysound = _mgardens; - iplaysound = _mgardens; + iplaysound = _musicGardens1; if (_roomLock) - iplaysound = _mboss; + iplaysound = _musicBoss; - if (iplaysound == _mboss && _playingBoss) + if (iplaysound == _musicBoss && _playingBoss) iplaysound = NULL; - if (iplaysound == _mgardens && _playingGardens) + if (iplaysound == _musicGardens1 && _playingGardens) iplaysound = NULL; if (iplaysound != NULL) { haltSoundChannel(_musicChannel); - _playingBoss = (iplaysound == _mboss); - _playingGardens = (iplaysound == _mgardens); + _playingBoss = (iplaysound == _musicBoss); + _playingGardens = (iplaysound == _musicGardens1); _musicChannel = playSound(iplaysound, true); - setChannelVolume(_musicChannel, config.musicvol); + setChannelVolume(_musicChannel, config.musicVol); } else { if (!isSoundChannelPlaying(_musicChannel)) { loopseta += 1; @@ -225,23 +225,23 @@ void GriffonEngine::updateMusic() { if (_playingGardens) { switch (loopseta) { case 0: - playSound(_mgardens); + playSound(_musicGardens1); break; case 1: - playSound(_mgardens2); + playSound(_musicGardens2); break; case 2: - playSound(_mgardens3); + playSound(_musicGardens3); break; case 3: - playSound(_mgardens4); + playSound(_musicGardens4); default: break; } } } - setChannelVolume(_musicChannel, config.musicvol); + setChannelVolume(_musicChannel, config.musicVol); } } } |