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_v2.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_v2.cpp')
| -rw-r--r-- | script_v2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/script_v2.cpp b/script_v2.cpp index ccad06cb1b..800e4e56c7 100644 --- a/script_v2.cpp +++ b/script_v2.cpp @@ -1351,7 +1351,7 @@ void Scumm::o6_walkActorToObj() a2 = derefActorSafe(obj, "o6_walkActorToObj(2)"); if (!a2) return; - if (a2->room != _currentRoom || a->room != _currentRoom) + if (!a->isInCurrentRoom() || !a->isInCurrentRoom()) return; if (dist == 0) { dist = a2->scalex * a2->width / 0xFF; @@ -1883,7 +1883,7 @@ void Scumm::o6_roomOps() c = pop(); b = pop(); a = pop(); - unkRoomFunc4(a, b, c, d, 1); + palManipulate(a, b, c, d, 1); break; case 187: /* color cycle delay */ @@ -2001,7 +2001,7 @@ void Scumm::o6_actorSet() else a->forceClip = 0; FixRooms:; - if (a->room == _currentRoom) + if (a->isInCurrentRoom()) putActor(a, a->x, a->y, a->room); break; case 96: @@ -2049,7 +2049,7 @@ void Scumm::o6_actorSet() a->startAnimActor(a->standFrame); break; case 230: /* set direction */ - a->moving &= ~4; + a->moving &= ~MF_TURN; a->setActorDirection(pop()); break; case 231: /* turn to direction */ @@ -2369,7 +2369,7 @@ void Scumm::o6_wait() case 226:{ /* wait until actor drawn */ Actor *a = derefActorSafe(pop(), "o6_wait:226"); int offs = (int16) fetchScriptWord(); - if (a->room == _currentRoom && a->needRedraw) { + if (a->isInCurrentRoom() && a->needRedraw) { _scriptPointer += offs; o6_breakHere(); } @@ -2378,7 +2378,7 @@ void Scumm::o6_wait() case 232:{ /* wait until actor stops turning */ Actor *a = derefActorSafe(pop(), "o6_wait:226"); int offs = (int16) fetchScriptWord(); - if (a->room == _currentRoom && a->moving & 4) { + if (a->isInCurrentRoom() && a->moving & MF_TURN) { _scriptPointer += offs; o6_breakHere(); } |