[Scummvm-cvs-logs] scummvm master -> 19a96699a43c173752ebcd5e1a171d658efbce16

[Strangerke]

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:
823844f396 HOPKINS: Fix bug #3612115 - Courtesy of SylvainTV: Fix palette in thumbnails
19a96699a4 HOPKINS: Fix bug #3611824 - music cut during dialogs after loading from launcher


Commit: 823844f396e676277873899cf6840a48b811b5f3
    https://github.com/scummvm/scummvm/commit/823844f396e676277873899cf6840a48b811b5f3
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-05-07T15:24:33-07:00

Commit Message:
HOPKINS: Fix bug #3612115 - Courtesy of SylvainTV: Fix palette in thumbnails

Changed paths:
    engines/hopkins/saveload.cpp



diff --git a/engines/hopkins/saveload.cpp b/engines/hopkins/saveload.cpp
index af0b043..45b4885 100644
--- a/engines/hopkins/saveload.cpp
+++ b/engines/hopkins/saveload.cpp
@@ -307,6 +307,10 @@ void SaveLoadManager::convertThumb16To8(Graphics::Surface *thumb16, Graphics::Su
 			byte r, g, b;
 			pixelFormat16.colorToRGB(*lineSrcP++, r, g, b);
 
+			// Do like in the original and show thumbnail as a grayscale picture
+			int lum = (r * 21 + g * 72 + b * 7) / 100;
+			r = g = b = lum;
+
 			// Scan the palette for the closest match
 			int difference = 99999, foundIndex = 0;
 			for (int palIndex = 0; palIndex < PALETTE_SIZE; ++palIndex) {


Commit: 19a96699a43c173752ebcd5e1a171d658efbce16
    https://github.com/scummvm/scummvm/commit/19a96699a43c173752ebcd5e1a171d658efbce16
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-05-07T15:25:29-07:00

Commit Message:
HOPKINS: Fix bug #3611824 - music cut during dialogs after loading from launcher

Changed paths:
    engines/hopkins/hopkins.cpp
    engines/hopkins/sound.cpp



diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 960a5cf..87d4600 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -804,6 +804,7 @@ bool HopkinsEngine::runFull() {
 		if (shouldQuit())
 			return false;
 	}
+
 	if (getPlatform() != Common::kPlatformLinux && _startGameSlot == -1) {
 		_graphicsMan->fadeOutShort();
 		_graphicsMan->loadImage("H2");
@@ -819,8 +820,11 @@ bool HopkinsEngine::runFull() {
 
 	_globals->_exitId = 0;
 
-	if (_startGameSlot != -1)
+
+	if (_startGameSlot != -1) {
+		_soundMan->playSound(28);
 		_saveLoad->loadGame(_startGameSlot);
+	}
 
 	for (;;) {
 		if (_globals->_exitId == 300)
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 94f90f7..bf816c0 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -467,7 +467,6 @@ void SoundManager::checkVoiceActivity() {
 
 bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) {
 	int fileNumber;
-	int oldMusicVol;
 	bool breakFlag;
 	Common::String prefix;
 	Common::String filename;
@@ -573,7 +572,7 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) {
 			}
 		}
 	}
-	oldMusicVol = _musicVolume;
+	int oldMusicVol = _musicVolume;
 	if (!loadVoice(filename, catPos, catLen, _sWav[20])) {
 		// This case only concerns the English Win95 demo
 		// If it's not possible to load the voice, we force the active flag