diff options
| author | Filippos Karapetis | 2008-06-04 16:39:56 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-06-04 16:39:56 +0000 |
| commit | 659d2bb234da395c6f0425ab04e66670d5ab1ca1 (patch) | |
| tree | 696c1d96fe5aed634fda5c46acdad2193f2cab24 /engines | |
| parent | 735463de44f805dca91d4757e458351e2b9f8a2e (diff) | |
| download | scummvm-rg350-659d2bb234da395c6f0425ab04e66670d5ab1ca1.tar.gz scummvm-rg350-659d2bb234da395c6f0425ab04e66670d5ab1ca1.tar.bz2 scummvm-rg350-659d2bb234da395c6f0425ab04e66670d5ab1ca1.zip | |
Fixed regression from commit #32536
svn-id: r32538
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/drascula/rooms.cpp | 19 | ||||
| -rw-r--r-- | engines/drascula/staticdata.h | 5 |
2 files changed, 10 insertions, 14 deletions
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp index 2d4606564e..e318dccf27 100644 --- a/engines/drascula/rooms.cpp +++ b/engines/drascula/rooms.cpp @@ -226,15 +226,16 @@ void DrasculaEngine::room_7(int fl){ } void DrasculaEngine::room_8(int fl) { - if (roomParse(room8Actions, ARRAYSIZE(room8Actions), fl)) - return; - - if (pickedObject == kVerbLook && fl == 147 && flags[7] == 0) { - talk(58); - pickObject(15); - flags[7] = 1; - if (flags[7] == 1 && flags[26] == 1 && flags[34] == 1 && flags[35] == 1 && flags[37] == 1) - flags[38] = 1; + if (pickedObject == kVerbLook && fl == 147) { + if (flags[7] == 0) { + talk(58); + pickObject(15); + flags[7] = 1; + if (flags[7] == 1 && flags[26] == 1 && flags[34] == 1 && flags[35] == 1 && flags[37] == 1) + flags[38] = 1; + } else { + talk(59); + } } else hasAnswer = 0; } diff --git a/engines/drascula/staticdata.h b/engines/drascula/staticdata.h index 02f9360e6e..897fb15386 100644 --- a/engines/drascula/staticdata.h +++ b/engines/drascula/staticdata.h @@ -268,11 +268,6 @@ RoomTalkAction room7Actions[] = { { -1, kVerbLook, 169, 44 } }; -RoomTalkAction room8Actions[] = { - // num action object speech - { -1, kVerbLook, 147, 59 } -}; - RoomTalkAction room9Actions[] = { // num action object speech { -1, kVerbLook, 150, 35 }, |