aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v2.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-23 01:14:29 +0000
committerMax Horn2003-05-23 01:14:29 +0000
commitddd0b6aa69f3ab8c24e9cd8ea31ac967b0118fda (patch)
tree4407f0092a77c5ce46d423634d42fe0897bc24f3 /scumm/script_v2.cpp
parent9e588830097e7a1c3d5371296885094a8ac5107c (diff)
downloadscummvm-rg350-ddd0b6aa69f3ab8c24e9cd8ea31ac967b0118fda.tar.gz
scummvm-rg350-ddd0b6aa69f3ab8c24e9cd8ea31ac967b0118fda.tar.bz2
scummvm-rg350-ddd0b6aa69f3ab8c24e9cd8ea31ac967b0118fda.zip
fixed butterknife + cashcard
svn-id: r7843
Diffstat (limited to 'scumm/script_v2.cpp')
-rw-r--r--scumm/script_v2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 4682900995..4d3c1f78c0 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -968,13 +968,13 @@ void Scumm_v2::o2_drawSentence() {
void Scumm_v2::o2_ifClassOfIs() {
int obj = getVarOrDirectWord(0x80);
int clsop = getVarOrDirectByte(0x40);
+ byte *obcd = getOBCDFromObject(obj);
- if (getObjectIndex(obj) == -1) {
+ if (obcd == 0) {
o5_jumpRelative();
return;
}
- byte *obcd = getOBCDFromObject(obj);
byte cls = *(obcd + 6);
if ((cls & clsop) != clsop) {
o5_jumpRelative();