diff options
| author | Max Horn | 2010-03-10 20:56:54 +0000 |
|---|---|---|
| committer | Max Horn | 2010-03-10 20:56:54 +0000 |
| commit | 8d1431a5ab0efe7c4f84f7c0fcdff10f8fe39ad1 (patch) | |
| tree | 241947a898cc329c6f397b76e87793be0ba519e9 /engines/agos/script_e2.cpp | |
| parent | 80fae481b0d97b8de64803275067fa08dbe1c720 (diff) | |
| download | scummvm-rg350-8d1431a5ab0efe7c4f84f7c0fcdff10f8fe39ad1.tar.gz scummvm-rg350-8d1431a5ab0efe7c4f84f7c0fcdff10f8fe39ad1.tar.bz2 scummvm-rg350-8d1431a5ab0efe7c4f84f7c0fcdff10f8fe39ad1.zip | |
AGOS: cleanup
svn-id: r48227
Diffstat (limited to 'engines/agos/script_e2.cpp')
| -rw-r--r-- | engines/agos/script_e2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp index 827dbf620d..f8af7db214 100644 --- a/engines/agos/script_e2.cpp +++ b/engines/agos/script_e2.cpp @@ -644,17 +644,17 @@ void AGOSEngine_Elvira2::oe2_printMonsterDamage() { void AGOSEngine_Elvira2::oe2_isAdjNoun() { // 179: item unk1 unk2 is Item *item = getNextItemPtr(); - int16 a = getNextWord(), n = getNextWord(); + int16 a = getNextWord(); + int16 n = getNextWord(); - if (getGameType() == GType_ELVIRA2) { + if (getGameType() == GType_ELVIRA2 && item == NULL) { // WORKAROUND bug #1745996: A NULL item can occur when // interacting with items in the dinning room - if (item == NULL) { - setScriptCondition(false); - return; - } + setScriptCondition(false); + return; } + assert(item); setScriptCondition(item->adjective == a && item->noun == n); } |