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

disable assert in o2_putActor for now (is triggered in Zak intro); cleanup

Browse source 
svn-id: r7592
This commit is contained in:
Max Horn 2003-05-17 01:01:05 +00:00
parent 56d6443b19
commit 3a145f50e7
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scumm/script_v2.cpp
View file

@ -403,8 +403,6 @@ void Scumm_v2::decodeParseString() {
} }
*ptr = 0; *ptr = 0;
printf("TODO: Scumm_v2::decodeParseString(\"%s\") from %d\n", buffer, vm.slot[_currentScript].number);
// For now, always use textSlot 0. Not sure if there are any situations where we might // For now, always use textSlot 0. Not sure if there are any situations where we might
// need to us another one? // need to us another one?
int textSlot = 0; int textSlot = 0;
@ -928,14 +926,20 @@ void Scumm_v2::o2_walkActorTo() {
} }
void Scumm_v2::o2_putActor() { void Scumm_v2::o2_putActor() {
int act = getVarOrDirectByte(0x80);
int x, y; int x, y;
Actor *a; Actor *a;
a = derefActorSafe(getVarOrDirectByte(0x80), "o2_putActor"); a = derefActorSafe(act, "o2_putActor");
x = getVarOrDirectByte(0x40) * 8; x = getVarOrDirectByte(0x40) * 8;
y = getVarOrDirectByte(0x20) * 2; y = getVarOrDirectByte(0x20) * 2;
assert(a); if (!a) {
// FIXME - this shouldn't be necessary but for now works around problems
// in the Zak intro.
warning("o2_putActor: actor %d not found", act);
return;
}
a->putActor(x, y, a->room); a->putActor(x, y, a->room);
} }
@ -945,8 +949,7 @@ void Scumm_v2::o2_startScript() {
} }
void Scumm_v2::o2_panCameraTo() { void Scumm_v2::o2_panCameraTo() {
panCameraTo(getVarOrDirectByte(0x80) * 8, 0); // FIXME: I'm pretty sure we actually pan panCameraTo(getVarOrDirectByte(0x80) * 8, 0);
// by strip, not X/Y, here. Hence *8
} }
void Scumm_v2::o2_walkActorToObject() { void Scumm_v2::o2_walkActorToObject() {
@ -954,6 +957,7 @@ void Scumm_v2::o2_walkActorToObject() {
Actor *a; Actor *a;
a = derefActorSafe(getVarOrDirectByte(0x80), "o2_walkActorToObject"); a = derefActorSafe(getVarOrDirectByte(0x80), "o2_walkActorToObject");
assert(a);
obj = getVarOrDirectByte(0x40); obj = getVarOrDirectByte(0x40);
if (whereIsObject(obj) != WIO_NOT_FOUND) { if (whereIsObject(obj) != WIO_NOT_FOUND) {
int x, y, dir; int x, y, dir;