aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph-Eugene Winzer2017-12-21 03:47:56 +0100
committerThierry Crozat2018-01-23 02:15:44 +0000
commitdbb2632d1ee99be7dd99b14e0b47eb7d79c91b40 (patch)
tree8f6ecc5b564da6511a69420a4cedffdf1b22050a
parent4a042c8465e286d884607ae513c03f9cbe74b0cf (diff)
downloadscummvm-rg350-dbb2632d1ee99be7dd99b14e0b47eb7d79c91b40.tar.gz
scummvm-rg350-dbb2632d1ee99be7dd99b14e0b47eb7d79c91b40.tar.bz2
scummvm-rg350-dbb2632d1ee99be7dd99b14e0b47eb7d79c91b40.zip
SUPERNOVA: Rename kAudioUndef2 to kAudioSmash
-rw-r--r--engines/supernova/msn_def.h2
-rw-r--r--engines/supernova/rooms.cpp12
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h
index 0aa62e6931..e625bd91cd 100644
--- a/engines/supernova/msn_def.h
+++ b/engines/supernova/msn_def.h
@@ -55,7 +55,7 @@ enum AudioIndex {
kAudioCrash, // 45|0
kAudioVoiceHalt, // 46|0
kAudioGunShot, // 46|2510
- kAudioUndef2, // 46|4020
+ kAudioSmash, // 46|4020
kAudioVoiceSupernova, // 47|0
kAudioVoiceYeah, // 47|24010
kAudioUndef3, // 48|0
diff --git a/engines/supernova/rooms.cpp b/engines/supernova/rooms.cpp
index 2ec0836687..da6eafabc5 100644
--- a/engines/supernova/rooms.cpp
+++ b/engines/supernova/rooms.cpp
@@ -2845,7 +2845,7 @@ bool AxacussExit::interact(Action verb, Object &obj1, Object &obj2) {
for (int i = 4; i <= 11; i++) {
_vm->renderImage(i);
if (i == 11)
- _vm->playSound(kAudioUndef2); // 046/4020
+ _vm->playSound(kAudioSmash); // 046/4020
_gm->wait2(1);
_vm->renderImage(i + 128);
}
@@ -2878,7 +2878,7 @@ bool AxacussOffice1::interact(Action verb, Object &obj1, Object &obj2) {
} else if ((verb == ACTION_USE) && Object::combine(obj1, obj2, COMPUTER, MAGNET)) {
_vm->renderImage(4);
setSectionVisible(16, false);
- _vm->playSound(kAudioUndef2);
+ _vm->playSound(kAudioSmash);
} else if ((verb == ACTION_LOOK) && (obj1._id == COMPUTER)) {
if (isSectionVisible(4))
_vm->renderMessage(kStringBroken);
@@ -2959,7 +2959,7 @@ bool AxacussOffice2::interact(Action verb, Object &obj1, Object &obj2) {
} else if ((verb == ACTION_USE) && Object::combine(obj1, obj2, COMPUTER, MAGNET)) {
_vm->renderImage(4);
setSectionVisible(16, false);
- _vm->playSound(kAudioUndef2);
+ _vm->playSound(kAudioSmash);
} else if ((verb == ACTION_LOOK) && (obj1._id == COMPUTER)) {
if (isSectionVisible(4))
_vm->renderMessage(kStringBroken);
@@ -2984,7 +2984,7 @@ bool AxacussOffice3::interact(Action verb, Object &obj1, Object &obj2) {
_vm->playSound(kAudioDoorOpen);
} else if ((verb == ACTION_USE) && Object::combine(obj1, obj2, COMPUTER, MAGNET)) {
_vm->renderImage(4);
- _vm->playSound(kAudioUndef2);
+ _vm->playSound(kAudioSmash);
} else if ((verb == ACTION_LOOK) && (obj1._id == COMPUTER)) {
if (isSectionVisible(4))
_vm->renderMessage(kStringBroken);
@@ -3012,7 +3012,7 @@ bool AxacussOffice4::interact(Action verb, Object &obj1, Object &obj2) {
_vm->playSound(kAudioDoorOpen);
} else if ((verb == ACTION_USE) && Object::combine(obj1, obj2, COMPUTER, MAGNET)) {
_vm->renderImage(4);
- _vm->playSound(kAudioUndef2);
+ _vm->playSound(kAudioSmash);
} else if ((verb == ACTION_LOOK) && (obj1._id == COMPUTER)) {
if (isSectionVisible(4))
_vm->renderMessage(kStringBroken);
@@ -3031,7 +3031,7 @@ void AxacussOffice5::onEntrance() {
bool AxacussOffice5::interact(Action verb, Object &obj1, Object &obj2) {
if ((verb == ACTION_USE) && Object::combine(obj1, obj2, COMPUTER, MAGNET)) {
_vm->renderImage(4);
- _vm->playSound(kAudioUndef2);
+ _vm->playSound(kAudioSmash);
} else if ((verb == ACTION_TAKE) && (obj1._id == TICKETS)) {
_vm->renderImage(_gm->invertSection(5));
obj1._click = 255;