[Scummvm-git-logs] scummvm master -> 6138b36d012f237b947a6fcf0242f9050a356b61

[criezy]

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

Summary:
b0588526e8 DRASCULA: Increase debug level for copyBackground
e5ef7a6398 DRASCULA: Fix bug when talking to drunkard in chapter 2
6138b36d01 NEWS: Mention Drascula drunkard talk bug fix


Commit: b0588526e865ebe91997b181e2998bdd2b85e273
    https://github.com/scummvm/scummvm/commit/b0588526e865ebe91997b181e2998bdd2b85e273
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-12-08T22:44:07Z

Commit Message:
DRASCULA: Increase debug level for copyBackground

This function is called a lot, and having a debug level of 1 made it very
difficult to find any other debug prints.

Changed paths:
    engines/drascula/graphics.cpp


diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp
index 8634b6c..09ff3c6 100644
--- a/engines/drascula/graphics.cpp
+++ b/engines/drascula/graphics.cpp
@@ -154,7 +154,7 @@ void DrasculaEngine::showFrame(Common::SeekableReadStream *stream, bool firstFra
 }
 
 void DrasculaEngine::copyBackground(int xorg, int yorg, int xdes, int ydes, int width, int height, byte *src, byte *dest) {
-	debug(1, "DrasculaEngine::copyBackground(xorg:%d, yorg:%d, xdes:%d, ydes:%d width:%d height:%d, src, dest)", xorg, yorg, xdes, ydes, width,height);
+	debug(5, "DrasculaEngine::copyBackground(xorg:%d, yorg:%d, xdes:%d, ydes:%d width:%d height:%d, src, dest)", xorg, yorg, xdes, ydes, width,height);
 	dest += xdes + ydes * 320;
 	src += xorg + yorg * 320;
 	/* Unoptimized code


Commit: e5ef7a63982523e109d82f5949db6757816c036d
    https://github.com/scummvm/scummvm/commit/e5ef7a63982523e109d82f5949db6757816c036d
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-12-08T22:44:07Z

Commit Message:
DRASCULA: Fix bug when talking to drunkard in chapter 2

The bug made it possible to only talk once to the drunkard. Any
further attempt to talk to him did nothing. This led to a dead end
if we did not ask about Von Braun the first time around.

This was a bug in ScummVM. The original game did not have the bug.

Changed paths:
    engines/drascula/animation.cpp


diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index 8b3299a..792b272 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -1836,6 +1836,8 @@ void DrasculaEngine::animation_13_2() {
 
 	if (flags[41] == 0) {
 		playTalkSequence(13);	// sequence 13, chapter 2
+	} else {
+		converse(2);
 	}
 
 	loadPic(964, frontSurface);


Commit: 6138b36d012f237b947a6fcf0242f9050a356b61
    https://github.com/scummvm/scummvm/commit/6138b36d012f237b947a6fcf0242f9050a356b61
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-12-08T22:44:08Z

Commit Message:
NEWS: Mention Drascula drunkard talk bug fix

Changed paths:
    NEWS


diff --git a/NEWS b/NEWS
index f1650f0..e5fce13 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,9 @@ For a more comprehensive changelog of the latest experimental code, see:
  Composer:
    - Added save/load from General Main Menu.
 
+ Drascula:
+   - Fix bug that made it impossible to talk to the drunkard more than once in the inn.
+
 1.9.1 (YYYY-MM-DD)
  General:
    - Added bilinear filtering option for SDL2 fullscreen mode.