diff options
| author | Eugene Sandulenko | 2017-01-13 22:40:02 +0100 |
|---|---|---|
| committer | GitHub | 2017-01-13 22:40:02 +0100 |
| commit | 059cfbf69182f2a3f44fe1ab9680d012ce22884d (patch) | |
| tree | 3a679839a66fcdcd9d4a3f19c4e68286762a285c /engines | |
| parent | 1c203ea249e73f940a524b08d7aade1e8b40adb2 (diff) | |
| parent | c95b6a9f8db08d57a9e6a553fd68ece00d777315 (diff) | |
| download | scummvm-rg350-059cfbf69182f2a3f44fe1ab9680d012ce22884d.tar.gz scummvm-rg350-059cfbf69182f2a3f44fe1ab9680d012ce22884d.tar.bz2 scummvm-rg350-059cfbf69182f2a3f44fe1ab9680d012ce22884d.zip | |
Merge pull request #875 from segrax/master
SCUMM: V0/V1: Fix two graphical issues
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/actor.cpp | 5 | ||||
| -rw-r--r-- | engines/scumm/costume.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/script_v2.cpp | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index f09729a1ed..8465526243 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -1510,10 +1510,11 @@ void Actor::putActor(int dstX, int dstY, int newRoom) { ((Actor_v0 *)this)->_newWalkBoxEntered = false; ((Actor_v0 *)this)->_CurrentWalkTo = _pos; ((Actor_v0 *)this)->_NewWalkTo = _pos; + } - // V0 always sets the actor to face the camera upon entering a room + // V0-V1 Maniac always sets the actor to face the camera upon entering a room + if (_vm->_game.id == GID_MANIAC && _vm->_game.version <= 1 && _vm->_game.platform != Common::kPlatformNES) setDirection(oldDirToNewDir(2)); - } } static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) { diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp index 7470f13fa2..dc29414623 100644 --- a/engines/scumm/costume.cpp +++ b/engines/scumm/costume.cpp @@ -114,6 +114,10 @@ byte ClassicCostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) { v1.x = _actorX; v1.y = _actorY; + // V0/V1 games are off by 1 + if (_vm->_game.version <= 1) + v1.y += 1; + if (use_scaling) { /* Scale direction */ diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 88c26f8c9e..c58127eedc 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -1131,9 +1131,6 @@ void ScummEngine_v2::o2_putActor() { x = getVarOrDirectByte(PARAM_2); y = getVarOrDirectByte(PARAM_3); - if (_game.id == GID_MANIAC && _game.version <= 1 && _game.platform != Common::kPlatformNES) - a->setFacing(180); - a->putActor(x, y); } |