[Scummvm-cvs-logs] scummvm master -> c80fe53efce05f52be9d9d0a67032fbc134565b8

[criezy]

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

Summary:
e90f01bc0c DRASCULA: Fix axe visibility flag when entering room 31
e44470ab54 DRASCULA: Fix noise when playing sound.
d05d4263e5 DRASCULA: Remove delay for select verb
6393315a8e DRASCULA: Remove delays when showing and hiding the inventory
c80fe53efc NEWS: Add multiple bug fix in drascula for 1.8.1


Commit: e90f01bc0c802ed69e2a4a39deeeb92fcdd1dc1b
    https://github.com/scummvm/scummvm/commit/e90f01bc0c802ed69e2a4a39deeeb92fcdd1dc1b
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-17T22:14:20+01:00

Commit Message:
DRASCULA: Fix axe visibility flag when entering room 31

The visible[1] flag in room 31 (i.e. for the axe) is now reset according
to flags[13] (which indicate if we picked up the axe already or not).

This fixes bug #7118 Drascula: Axe item can be picked up infinite
times

Changed paths:
    engines/drascula/objects.cpp



diff --git a/engines/drascula/objects.cpp b/engines/drascula/objects.cpp
index 823c073..02846ab 100644
--- a/engines/drascula/objects.cpp
+++ b/engines/drascula/objects.cpp
@@ -272,6 +272,8 @@ void DrasculaEngine::updateVisible() {
 			visible[2] = 0;
 		if (_roomNumber == 26 && flags[12] == 1)
 			visible[1] = 0;
+		if (_roomNumber == 31 && flags[13] == 1)
+			visible[1] = 0;
 		if (_roomNumber == 35 && flags[14] == 1)
 			visible[2] = 0;
 		if (_roomNumber == 35 && flags[17] == 1)


Commit: e44470ab545721f77ce55509de6dcee739f606eb
    https://github.com/scummvm/scummvm/commit/e44470ab545721f77ce55509de6dcee739f606eb
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-17T22:17:01+01:00

Commit Message:
DRASCULA: Fix noise when playing sound.

The original engine skipped the first 32 and last 32 bytes of the
data when playing a sound. We did not do it in ScummVM which
resulted in noise at the start and/or end of some speech. This
was most noticeable with Spanish speech but also occurred
occasionally with English speech.

This fixes bug #7120 Drascula: Audio noise before every voice in
the game

Changed paths:
    engines/drascula/sound.cpp



diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp
index 204a6f2..62ec796 100644
--- a/engines/drascula/sound.cpp
+++ b/engines/drascula/sound.cpp
@@ -166,8 +166,8 @@ void DrasculaEngine::MusicFadeout() {
 void DrasculaEngine::playFile(const char *fname) {
 	Common::SeekableReadStream *stream = _archives.open(fname);
 	if (stream) {
-		int startOffset = 0;
-		int soundSize = stream->size() - startOffset;
+		int startOffset = 32;
+		int soundSize = stream->size() - 64;
 
 		if (!strcmp(fname, "3.als") && soundSize == 145166 && _lang != kSpanish) {
 			// WORKAROUND: File 3.als with English speech files has a big silence at


Commit: d05d4263e54ffcd56a2782c58d268cb766212d68
    https://github.com/scummvm/scummvm/commit/d05d4263e54ffcd56a2782c58d268cb766212d68
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-17T23:23:23+01:00

Commit Message:
DRASCULA: Remove delay for select verb

The delay, since it updates the mouse position, resulted in a
different verb being selected than the one we clicked on when
moving the mouse quickly after the clic. This was quite confusing
and frustrating. I can't see any reason for this delay and it seems
to work well without it. The initial commit adding it indicates this
was "for better mouse response", but it added a lot of other delays
at the same time, and removing this one doesn't see to impact the
mouse response (on the contrary, we get the new cursor quicker).

Changed paths:
    engines/drascula/drascula.cpp



diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index d7b1fd6..de7027d 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -652,7 +652,6 @@ bool DrasculaEngine::runCurrentChapter() {
 #endif
 
 		if (_leftMouseButton == 1 && _menuBar) {
-			delay(100);
 			selectVerbFromBar();
 		} else if (_leftMouseButton == 1 && takeObject == 0) {
 			delay(100);


Commit: 6393315a8ee9d22983dd00efbcf97fe7221a5817
    https://github.com/scummvm/scummvm/commit/6393315a8ee9d22983dd00efbcf97fe7221a5817
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-17T23:41:32+01:00

Commit Message:
DRASCULA: Remove delays when showing and hiding the inventory

I don't see any purpose to this delays and they were not present in
the original engine. It works fine without those and the interface
seems more responsive.

This fixes bug #7121 DRASCULA: Delay and freeze when pressing
right mouse click on game

Also move a delay when left clicking to after performing the action.
With the delay between the left click and the action, the mouse
position could have moved when performing the action, resulting
in the wrong action being performed (e.g. activating the wrong verb
or picking the wrong object in the inventory). But removing the
delay altogether causes flickering when picking objects from the
inventory.

Changed paths:
    engines/drascula/drascula.cpp



diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index de7027d..ab91056 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -595,7 +595,6 @@ bool DrasculaEngine::runCurrentChapter() {
 		if (_rightMouseButton == 1 && _menuScreen) {
 #endif
 			_rightMouseButton = 0;
-			delay(100);
 			if (currentChapter == 2) {
 				loadPic(menuBackground, cursorSurface);
 				loadPic(menuBackground, backSurface);
@@ -624,7 +623,6 @@ bool DrasculaEngine::runCurrentChapter() {
 			!(currentChapter == 5 && pickedObject == 16)) {
 #endif
 			_rightMouseButton = 0;
-			delay(100);
 			characterMoved = 0;
 			if (trackProtagonist == 2)
 				trackProtagonist = 1;
@@ -654,9 +652,9 @@ bool DrasculaEngine::runCurrentChapter() {
 		if (_leftMouseButton == 1 && _menuBar) {
 			selectVerbFromBar();
 		} else if (_leftMouseButton == 1 && takeObject == 0) {
-			delay(100);
 			if (verify1())
 				return true;
+			delay(100);
 		} else if (_leftMouseButton == 1 && takeObject == 1) {
 			if (verify2())
 				return true;


Commit: c80fe53efce05f52be9d9d0a67032fbc134565b8
    https://github.com/scummvm/scummvm/commit/c80fe53efce05f52be9d9d0a67032fbc134565b8
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-17T23:52:10+01:00

Commit Message:
NEWS: Add multiple bug fix in drascula for 1.8.1

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index e6afb1c..18644f6 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,10 @@ For a more comprehensive changelog of the latest experimental code, see:
      Spanish version.
    - Fixed animations speed (they were running two times slower than in the
      original engine).
+   - Fixed noise at start and/or end of speech. This was most noticeable
+     with the Spanish speech.
+   - Fixed delay when interacting with the verb menu and the inventory.
+   - Fixed possibility to pick up the axe in the castle multiple times.
 
  Gob:
    - Fixed lock up for some games during sound initialization.