ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCUMM: (INDY3) - properly fix bug no. 1052

Browse Source 
(minor SCUMM 3 walk code fix)

This fixes it according to disasm, without relying on a hack.
This commit is contained in:
athrxx
2021-06-07 23:51:32 +02:00
parent dda46ebf08
commit ef0d76a2c7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/scumm/actor.cpp
+5 -5
View File
@@ -485,6 +485,11 @@ int Actor::calcMovementFactor(const Common::Point& next) {
diffY = next.y - _pos.y;
deltaYFactor = _speedy << 16;
// These two lines fix bug #1052 (INDY3: Hitler facing wrong directions in the Berlin scene).
// I can't see anything like this in the original SCUMM1/2 code, so I limit this to SCUMM3.
if (_vm->_game.version == 3 && (int)_speedx > ABS(diffX) && (int)_speedy > ABS(diffY))
return 0;
if (diffY < 0)
deltaYFactor = -deltaYFactor;
@@ -1419,11 +1424,6 @@ void Actor::setDirection(int direction) {
int i;
uint16 vald;
// HACK to fix bug #774783
// If Hitler's direction is being set to anything other than 90, set it to 90
if ((_vm->_game.id == GID_INDY3) && _vm->_roomResource == 46 && _number == 9 && direction != 90)
direction = 90;
// Do nothing if actor is already facing in the given direction
if (_facing == direction)
return;