diff options
| author | Joseph-Eugene Winzer | 2017-12-27 23:01:31 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-23 02:15:45 +0000 |
| commit | 7ba9d94a899fc978c61f126ccc5d03be33e25a63 (patch) | |
| tree | 00c410fc993080e64256063288917f22a0fd17d3 | |
| parent | c1f6d41ce0b879f6a170f64214059c4572d90b9c (diff) | |
| download | scummvm-rg350-7ba9d94a899fc978c61f126ccc5d03be33e25a63.tar.gz scummvm-rg350-7ba9d94a899fc978c61f126ccc5d03be33e25a63.tar.bz2 scummvm-rg350-7ba9d94a899fc978c61f126ccc5d03be33e25a63.zip | |
SUPERNOVA: Renames audio constants
| -rw-r--r-- | engines/supernova/msn_def.h | 10 | ||||
| -rw-r--r-- | engines/supernova/rooms.cpp | 14 | ||||
| -rw-r--r-- | engines/supernova/state.cpp | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h index 874d71e4d0..7d6076ab01 100644 --- a/engines/supernova/msn_def.h +++ b/engines/supernova/msn_def.h @@ -51,23 +51,23 @@ enum MessagePosition { }; enum AudioIndex { - kAudioGreat, // 44|0 + kAudioFoundLocation, // 44|0 kAudioCrash, // 45|0 kAudioVoiceHalt, // 46|0 kAudioGunShot, // 46|2510 kAudioSmash, // 46|4020 kAudioVoiceSupernova, // 47|0 kAudioVoiceYeah, // 47|24010 - kAudioUndef3, // 48|0 - kAudioUndef4, // 48|2510 + kAudioRobotShock, // 48|0 + kAudioRobotBreaks, // 48|2510 kAudioShock, // 48|10520 kAudioTurntable, // 48|13530 kAudioSiren, // 50|0 - kAudioUndef6, // 50|12786 + kAudioSnoring, // 50|12786 kAudioRocks, // 51|0 kAudioDeath, // 53|0 kAudioAlarm, // 54|0 - kAudioUndef7, // 54|8010 + kAudioSuccess, // 54|8010 kAudioDoorSound, // 54|24020 kAudioDoorOpen, // 54|30030 kAudioDoorClose, // 54|31040 diff --git a/engines/supernova/rooms.cpp b/engines/supernova/rooms.cpp index 4ab3a6708b..bd06524a68 100644 --- a/engines/supernova/rooms.cpp +++ b/engines/supernova/rooms.cpp @@ -457,15 +457,15 @@ void Intro::cutscene() { _vm->_brightness = 0; _vm->paletteBrightness(); exitOnEscape(10); - _vm->playSound(kAudioUndef6); + _vm->playSound(kAudioSnoring); while (_vm->_mixer->isSoundHandleActive(_vm->_soundHandle)) ; exitOnEscape(10); - _vm->playSound(kAudioUndef6); + _vm->playSound(kAudioSnoring); while (_vm->_mixer->isSoundHandleActive(_vm->_soundHandle)) ; exitOnEscape(10); - _vm->playSound(kAudioUndef6); + _vm->playSound(kAudioSnoring); while (_vm->_mixer->isSoundHandleActive(_vm->_soundHandle)) ; exitOnEscape(30); @@ -1446,7 +1446,7 @@ void ArsanoMeetup::onEntrance() { _vm->renderImage(_gm->invertSection(6)); } if (!(_gm->_state._greatFlag & 0x8000)) { - _vm->playSound(kAudioGreat); + _vm->playSound(kAudioFoundLocation); _gm->_state._greatFlag |= 0x8000; } } @@ -2396,7 +2396,7 @@ void AxacussCell::animation() { _vm->renderImage(30); getObject(8)->_click = 12; getObject(7)->_click = 14; - _vm->playSound(kAudioUndef4); + _vm->playSound(kAudioRobotBreaks); } else if (_gm->_state._timeRobot == 10010) --_gm->_state._timeRobot; @@ -2410,7 +2410,7 @@ void AxacussCell::animation() { if ((isSectionVisible(6)) && ((_gm->_state._timeRobot == 310) || (_gm->_state._timeRobot == 610))) { - _vm->playSound(kAudioUndef3); + _vm->playSound(kAudioRobotShock); _gm->_state._timeRobot = 10000; } @@ -3078,7 +3078,7 @@ bool AxacussElevator::interact(Action verb, Object &obj1, Object &obj2) { getObject(3)->_click = 2; _vm->renderImage(_gm->invertSection(1)); if (!(_gm->_state._greatFlag & 0x4000)) { - _vm->playSound(kAudioGreat); + _vm->playSound(kAudioFoundLocation); _gm->_state._greatFlag |= 0x4000; } } diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp index 5eabbda581..7dc34cfc24 100644 --- a/engines/supernova/state.cpp +++ b/engines/supernova/state.cpp @@ -1289,7 +1289,7 @@ void GameManager::great(uint number) { if (number && (_state._greatFlag & (1 << number))) return; - _vm->playSound(kAudioUndef7); + _vm->playSound(kAudioSuccess); _state._greatFlag |= 1 << number; } |