diff options
| author | Travis Howell | 2007-07-02 00:14:53 +0000 |
|---|---|---|
| committer | Travis Howell | 2007-07-02 00:14:53 +0000 |
| commit | 3ef882041b5029a0de253af8332482f7f2ddb21c (patch) | |
| tree | 4e53fc7695aa579d10e482734e1bdfa3af5d4607 /engines/agos | |
| parent | d768edcd3aa7c743784c4bb7d755a11807f05dda (diff) | |
| download | scummvm-rg350-3ef882041b5029a0de253af8332482f7f2ddb21c.tar.gz scummvm-rg350-3ef882041b5029a0de253af8332482f7f2ddb21c.tar.bz2 scummvm-rg350-3ef882041b5029a0de253af8332482f7f2ddb21c.zip | |
Add work around for possible script bug in Elvira 2.
svn-id: r27844
Diffstat (limited to 'engines/agos')
| -rw-r--r-- | engines/agos/script_e2.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp index 0ddb982d3a..7a6c6327aa 100644 --- a/engines/agos/script_e2.cpp +++ b/engines/agos/script_e2.cpp @@ -652,6 +652,16 @@ void AGOSEngine_Elvira2::oe2_isAdjNoun() { // 179: item unk1 unk2 is Item *item = getNextItemPtr(); int16 a = getNextWord(), b = getNextWord(); + + if (getGameType() == GType_ELVIRA2) { + // WORKAROUND: A NULL item can occur when interacting with Wine Bottles + if (item == NULL) { + printf("Please report where exactly this occurs in Elvira 2.\n"); + setScriptCondition(false); + return; + } + } + setScriptCondition(item->adjective == a && item->noun == b); } |