[Scummvm-cvs-logs] scummvm branch-1-8 -> 4955b0b4dfdcd3d1b89608530b2e54ca74f9f7ff

[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:
0af4c9ffd3 DRASCULA: Fix loading games in room 102 when still chained
4955b0b4df NEWS: Add fix for loading savegame in Drascula pendulum scene


Commit: 0af4c9ffd3d35b237400f7aec321d3cec406e1b8
    https://github.com/scummvm/scummvm/commit/0af4c9ffd3d35b237400f7aec321d3cec406e1b8
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-10T21:22:28+01:00

Commit Message:
DRASCULA: Fix loading games in room 102 when still chained

Room 102 has two states. The first one has an animation of a
pendulum while the protagonist is chained to a table beneath it.
The second state is after the protagonist free himself. In the second
state the pendulum has stopped. When saving in the first state,
loading the save game did not properly setup the pendulum
animation causing graphic glitches.

This fixes bug #7113 DRASCULA: Serious sprite glitches

Changed paths:
    engines/drascula/drascula.cpp



diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index c72d77c..7f30b87 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -536,6 +536,10 @@ bool DrasculaEngine::runCurrentChapter() {
 			if (!loadGame(_currentSaveSlot)) {
 				return true;
 			}
+			// When loading room 102 while being attached below the pendulum we
+			// need to call activatePendulum() to properly initialized the scene.
+			if (_roomNumber == 102 && flags[1] == 2)
+				activatePendulum();
 			loadPic("auxdr.alg", drawSurface2);
 		}
 	}


Commit: 4955b0b4dfdcd3d1b89608530b2e54ca74f9f7ff
    https://github.com/scummvm/scummvm/commit/4955b0b4dfdcd3d1b89608530b2e54ca74f9f7ff
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-10T21:22:51+01:00

Commit Message:
NEWS: Add fix for loading savegame in Drascula pendulum scene

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index bd5d65e..36b1ab4 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,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.
+   - Fixed loading savegames in the Pendulum scene.
 
  Gob:
    - Fixed lock up for some games during sound initialization.