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

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 :-)

Browse source 
svn-id: r4404
This commit is contained in:
Max Horn 2002-06-04 23:32:53 +00:00
parent 31a2efd89c
commit d35eed21f1
9 changed files with 171 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

10
script_v1.cpp
View file

@ -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;
}