libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

possible fix for bug #833854 - I rechecked the assembly, there actually is a check for box flag 0x20 in there. However, that flag has a differeing meaning in older engine versions, so I put a version check in and updated the comments. Please test.

Browse Source 
svn-id: r11019
This commit is contained in:
Max Horn 2003-11-01 01:17:15 +00:00
parent 4952fb11ac
commit 9f33b3abbe
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scumm/actor.cpp
View File

@ -393,7 +393,6 @@ int Actor::actorWalkStep() {
void Actor::setupActorScale() {
uint16 scale;
if (_vm->_features & GF_NO_SCALING) {
scalex = 0xFF;
@ -404,26 +403,13 @@ void Actor::setupActorScale() {
if (ignoreBoxes)
return;
// FIXME: The following two lines we apparenly added to fix bug #551944,
// which deals with "Script race in mystery vortex" in Sam&Max.
// (this was added in the *old* CVS repository in rev 1.61 of actor.cpp).
// The comment on that bug says: "Fixed by initial guesswork from jah.
// Turned out we need to check the box locking state."
// However:
// 1) Contrary to the bug comment, this doesn't check the box locking flag
// 2) For all Scumm versions from 1-5 this is definitely wrong
// 3) I checked a Sam&Max IDA DB, and found no evidence for this either
// 4) From a purely logical point of view (i.e. considering how actors,
// scaling etc. work), this makes no sense either.
//
// Hence, I am hereby commenting out this code. It may cause regressions,
// esp. in the Mystery Vortex; it would be very good if people could hence
// playtest the Vortex. Should it turn out the Vortex needs this, we could
// re-enable it, although it would be preferable to find a proper fix :-)
// if (_vm->getBoxFlags(walkbox) & kBoxPlayerOnly)
// return;
// For some boxes, we ignore the scaling and use whatever values the
// scripts set. This is used e.g. in the Mystery Vortex in Sam&Max.
// Older games used the flag 0x20 differently, though.
if (_vm->_version >= 6 && (_vm->getBoxFlags(walkbox) & kBoxIgnoreScale))
return;
scale = _vm->getScale(walkbox, _pos.x, _pos.y);
uint16 scale = _vm->getScale(walkbox, _pos.x, _pos.y);
assert(scale <= 0xFF);
scalex = scaley = (byte)scale;

1
scumm/boxes.h
View File

@ -35,6 +35,7 @@ namespace Scumm {
typedef enum {
kBoxXFlip = 0x08,
kBoxYFlip = 0x10,
kBoxIgnoreScale = 0x20,
kBoxPlayerOnly = 0x20,
kBoxLocked = 0x40,
kBoxInvisible = 0x80