aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/script_e2.cpp
diff options
context:
space:
mode:
authorTravis Howell2009-03-08 08:45:21 +0000
committerTravis Howell2009-03-08 08:45:21 +0000
commit2620d6836c001f2f295cb6efd6beab78f5a3c50f (patch)
tree81d5055b74abfc7b0be105bee13b39e6505fce91 /engines/agos/script_e2.cpp
parent7bfab75a0814d0655a2504bf4c461df0000da0e4 (diff)
downloadscummvm-rg350-2620d6836c001f2f295cb6efd6beab78f5a3c50f.tar.gz
scummvm-rg350-2620d6836c001f2f295cb6efd6beab78f5a3c50f.tar.bz2
scummvm-rg350-2620d6836c001f2f295cb6efd6beab78f5a3c50f.zip
Add initial support for Personal Nightmare.
Thanks to dreammaster for file decompression and icon decoding code. NOTE: setjmp/longjmp code will require conversion for portability. svn-id: r39216
Diffstat (limited to 'engines/agos/script_e2.cpp')
-rw-r--r--engines/agos/script_e2.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp
index 655fc16ff1..8802ed921d 100644
--- a/engines/agos/script_e2.cpp
+++ b/engines/agos/script_e2.cpp
@@ -574,9 +574,7 @@ void AGOSEngine_Elvira2::oe2_ifExitLocked() {
void AGOSEngine_Elvira2::oe2_playEffect() {
// 174: play sound
uint soundId = getVarOrWord();
- loadSound(soundId);
-
- debug(0, "oe2_playEffect: stub (%d)", soundId);
+ loadSound(soundId, 0, 0);
}
void AGOSEngine_Elvira2::oe2_getDollar2() {
@@ -636,7 +634,7 @@ void AGOSEngine_Elvira2::oe2_printMonsterDamage() {
void AGOSEngine_Elvira2::oe2_isAdjNoun() {
// 179: item unk1 unk2 is
Item *item = getNextItemPtr();
- int16 a = getNextWord(), b = getNextWord();
+ int16 a = getNextWord(), n = getNextWord();
if (getGameType() == GType_ELVIRA2) {
// WORKAROUND bug #1745996: A NULL item can occur when
@@ -647,7 +645,7 @@ void AGOSEngine_Elvira2::oe2_isAdjNoun() {
}
}
- setScriptCondition(item->adjective == a && item->noun == b);
+ setScriptCondition(item->adjective == a && item->noun == n);
}
void AGOSEngine_Elvira2::oe2_b2Set() {