[Scummvm-cvs-logs] scummvm branch-1-8 -> 8a69e0ed3b790afd1bf14e547fe9219db7820f55

[criezy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
72415d7884 DRASCULA: Fix character walking off screen
8a69e0ed3b NEWS: Add fix in drascula for character walking off screen


Commit: 72415d7884563ea94ac8bd23d6d43ad7f0ffb757
    https://github.com/scummvm/scummvm/commit/72415d7884563ea94ac8bd23d6d43ad7f0ffb757
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-09T15:54:23+01:00

Commit Message:
DRASCULA: Fix character walking off screen

There was an unhandled case in chapter 2 when the character is at
the exact Y location and close to the X location to where we asked
him to walk. The code started the walk but without properly setting
the curDirection and trackProtagonist variables. This resulted in the
walk never stopping.

I checked what the original source code is doing for this case and
implemented it in the same way: the character does not start walking.

This fixes bug #7112: DRASCULA: protagonist walking off the screen

Changed paths:
    engines/drascula/actors.cpp



diff --git a/engines/drascula/actors.cpp b/engines/drascula/actors.cpp
index 849e2cc..b41647d 100644
--- a/engines/drascula/actors.cpp
+++ b/engines/drascula/actors.cpp
@@ -123,6 +123,8 @@ void DrasculaEngine::startWalking() {
 			walkUp();
 		else if (roomY > curY + curHeight)
 			walkDown();
+		else
+			characterMoved = 0;
 	} else {
 		if ((roomX < curX + curWidth / 2 ) && (roomY <= (curY + curHeight)))
 			quadrant_1();


Commit: 8a69e0ed3b790afd1bf14e547fe9219db7820f55
    https://github.com/scummvm/scummvm/commit/8a69e0ed3b790afd1bf14e547fe9219db7820f55
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-09T15:55:04+01:00

Commit Message:
NEWS: Add fix in drascula for character walking off screen

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index cc5a4b7..bd5d65e 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ For a more comprehensive changelog of the latest experimental code, see:
 
  Drascula:
    - Fixed text alignment to be faithful to the original.
+   - Fixed character walking off screen.
 
  Gob:
    - Fixed lock up for some games during sound initialization.