thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed o2_ifClassOfIs

Browse source 
svn-id: r7826
This commit is contained in:
Max Horn 2003-05-22 13:57:34 +00:00
parent 552f9fad61
commit 711c698948
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scumm/script_v2.cpp
View file

@ -946,16 +946,16 @@ void Scumm_v2::o2_drawSentence() {
} }
void Scumm_v2::o2_ifClassOfIs() { void Scumm_v2::o2_ifClassOfIs() {
int act = getVarOrDirectWord(0x80); int obj = getVarOrDirectWord(0x80);
int clsop = getVarOrDirectByte(0x40); int clsop = getVarOrDirectByte(0x40);
if (getObjectIndex(act) == -1) { if (getObjectIndex(obj) == -1) {
o5_jumpRelative(); o5_jumpRelative();
return; return;
} }
ObjectData *od = &_objs[getObjectIndex(act)]; byte *obcd = getOBCDFromObject(obj);
byte cls = *(getResourceAddress(rtRoom, _currentRoom) + od->OBCDoffset + 10); byte cls = *(obcd + 6);
if ((cls & clsop) != clsop) { if ((cls & clsop) != clsop) {
o5_jumpRelative(); o5_jumpRelative();
return; return;