libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-06 10:17:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

o5_walkActorToActor cleanup, and fixed for V2

Browse Source 
svn-id: r7841
This commit is contained in:
Max Horn 2003-05-23 00:52:31 +00:00
parent edf5946c40
commit 4fc70168b4
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
scumm/script_v5.cpp
View File

@ -2353,54 +2353,46 @@ void Scumm_v5::o5_walkActorTo() {
}
void Scumm_v5::o5_walkActorToActor() {
int b, x, y;
int x;
Actor *a, *a2;
int nr;
int nr2 = getVarOrDirectByte(0x80);
a = derefActorSafe(nr2, "o5_walkActorToActor");
assert(a);
int nr = getVarOrDirectByte(0x80);
int nr2 = getVarOrDirectByte(0x40);
int dist = fetchScriptByte();
if (!a->isInCurrentRoom()) {
getVarOrDirectByte(0x40);
fetchScriptByte();
return;
}
nr = getVarOrDirectByte(0x40);
if (nr == 106 && _gameId == GID_INDY4) {
warning("Bypassing Indy4 bug");
fetchScriptByte();
return;
}
// warning("walk actor %d to actor %d", nr, nr2);
a2 = derefActorSafe(nr, "o5_walkActorToActor(2)");
assert(a2);
if (!a2->isInCurrentRoom()) {
fetchScriptByte();
a = derefActorSafe(nr, "o5_walkActorToActor");
assert(a);
if (!a->isInCurrentRoom())
return;
}
b = fetchScriptByte(); /* distance from actor */
if (b == 0xFF) {
b = a2->scalex * a->width / 0xFF;
b = b + b / 2;
a2 = derefActorSafe(nr2, "o5_walkActorToActor(2)");
assert(a2);
if (!a2->isInCurrentRoom())
return;
if (_features & GF_AFTER_V2)
dist *= 8;
else if (dist == 0xFF) {
dist = a2->scalex * a->width / 0xFF;
dist += dist / 2;
}
x = a2->x;
y = a2->y;
if (x < a->x)
x += b;
x += dist;
else
x -= b;
a->startWalkActor(x, y, -1);
x -= dist;
a->startWalkActor(x, a2->y, -1);
}
void Scumm_v5::o5_walkActorToObject() {
int obj;
Actor *a;
// warning("walk object to object");
a = derefActorSafe(getVarOrDirectByte(0x80), "o5_walkActorToObject");
obj = getVarOrDirectWord(0x40);
if (whereIsObject(obj) != WIO_NOT_FOUND) {