diff options
| author | Max Horn | 2002-06-04 23:32:53 +0000 |
|---|---|---|
| committer | Max Horn | 2002-06-04 23:32:53 +0000 |
| commit | d35eed21f1cbd769bdad4e3028d16361c7bf9f74 (patch) | |
| tree | 3d38928c8c0f89bdbc51dd660cdb79da4b5e30c6 /script_v1.cpp | |
| parent | 31a2efd89cdae6f8722af77177dba2a7763a94a5 (diff) | |
| download | scummvm-rg350-d35eed21f1cbd769bdad4e3028d16361c7bf9f74.tar.gz scummvm-rg350-d35eed21f1cbd769bdad4e3028d16361c7bf9f74.tar.bz2 scummvm-rg350-d35eed21f1cbd769bdad4e3028d16361c7bf9f74.zip | |
more Actor class cleanup; renamed unkRoomFunc4 to palManipulate and added an icky, wrong implementation for it - yes this is complete nonsense but I'll try to replace it with the right thing RSN :-)
svn-id: r4404
Diffstat (limited to 'script_v1.cpp')
| -rw-r--r-- | script_v1.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/script_v1.cpp b/script_v1.cpp index 70c35d2e13..abb2f8c484 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -801,7 +801,7 @@ void Scumm::o5_actorSet() a->ignoreBoxes = 1; a->forceClip = 0; FixRoom: - if (a->room == _currentRoom) + if (a->isInCurrentRoom()) putActor(a, a->x, a->y, a->room); break; case 21: /* followboxes */ @@ -2047,14 +2047,14 @@ void Scumm::o5_roomOps() ; warning("roomops:14 load-string(%d,\"%s\") not implemented", a, buf); break; - case 15: /* palmanip? */ + case 15: /* palmanip */ a = getVarOrDirectByte(0x80); _opcode = fetchScriptByte(); b = getVarOrDirectByte(0x80); c = getVarOrDirectByte(0x40); _opcode = fetchScriptByte(); d = getVarOrDirectByte(0x80); - unkRoomFunc4(b, c, a, d, 1); + palManipulate(b, c, a, d, 1); break; case 16: @@ -2566,7 +2566,7 @@ void Scumm::o5_walkActorToActor() if (!a) return; - if (a->room != _currentRoom) { + if (!a->isInCurrentRoom()) { getVarOrDirectByte(0x40); fetchScriptByte(); return; @@ -2583,7 +2583,7 @@ void Scumm::o5_walkActorToActor() if (!a2) return; - if (a2->room != _currentRoom) { + if (!a2->isInCurrentRoom()) { fetchScriptByte(); return; } |