[Scummvm-cvs-logs] scummvm master -> 50e735d68b0e42eae6648d1852c8a57a4ca22cac

[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:
1be77fc766 DRASCULA: Fix loading games in room 102 when still chained
50e735d68b NEWS: Add fix for loading savegame in Drascula pendulum scene


Commit: 1be77fc766689ba8310e4f49440d924465770784
    https://github.com/scummvm/scummvm/commit/1be77fc766689ba8310e4f49440d924465770784
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-10T21:22:07+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 9ac9031..358aecc 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -534,6 +534,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: 50e735d68b0e42eae6648d1852c8a57a4ca22cac
    https://github.com/scummvm/scummvm/commit/50e735d68b0e42eae6648d1852c8a57a4ca22cac
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-10T21:22:07+01:00

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

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index 30abf2e..ce1a682 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,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.