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

[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:
869999f3c6 Hopkins: Add some comments
f0233216c8 HOPKINS: Fix glitch before entering bank, in Windows demo


Commit: 869999f3c6193505a1c3ac0090c436213a63e850
    https://github.com/scummvm/scummvm/commit/869999f3c6193505a1c3ac0090c436213a63e850
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-06-15T05:59:05-07:00

Commit Message:
Hopkins: Add some comments

Changed paths:
    engines/hopkins/hopkins.cpp



diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 173c4d5..5fdcb82 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -201,12 +201,15 @@ bool HopkinsEngine::runWin95Demo() {
 
 		switch (_globals->_exitId) {
 		case 1:
+			// Handles room: Apartment
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 435;
 			_objectsMan->sceneControl2("IM01", "IM01", "ANIM01", "IM01", 2, true);
 			break;
 
 		case 3:
+			// - Displays bank attack when leaving the apartment
+			// - Handles room: bottom of the apartment
 			if (!_globals->_saveData->_data[svBankAttackAnimPlayedFl]) {
 				_soundMan->playSound(3);
 				if (getPlatform() == Common::kPlatformOS2 || getPlatform() == Common::kPlatformBeOS)
@@ -244,12 +247,14 @@ bool HopkinsEngine::runWin95Demo() {
 			break;
 
 		case 4:
+			// Handle room: City map
 			_globals->_disableInventFl = true;
 			_objectsMan->handleCityMap();
 			_globals->_disableInventFl = false;
 			break;
 
 		case 5:
+			// Handle room: Outside the bank
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 455;
 


Commit: f0233216c8cc0c87af903a177108586fa3aea907
    https://github.com/scummvm/scummvm/commit/f0233216c8cc0c87af903a177108586fa3aea907
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-06-15T06:00:09-07:00

Commit Message:
HOPKINS: Fix glitch before entering bank, in Windows demo

Thanks Greencis for reporting it

Changed paths:
    engines/hopkins/script.cpp



diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index c392732..78339ce 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -536,6 +536,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 			break;
 
 		case 12:
+			// Bank - negotiations between Hopkins and one of the killers
 			_vm->_fontMan->hideText(9);
 			_vm->_events->refreshScreenAndEvents();
 			_vm->_events->refreshScreenAndEvents();
@@ -543,6 +544,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 			break;
 
 		case 13:
+			// Bank - after negotiations, Hopkins enters the bank
 			_vm->_events->_mouseButton = _vm->_events->_curMouseButton;
 			_vm->_globals->_disableInventFl = true;
 			_vm->_graphicsMan->fadeOutLong();
@@ -553,9 +555,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 			_vm->_graphicsMan->endDisplayBob();
 			_vm->_objectsMan->clearScreen();
 
-			if ((_vm->getPlatform() == Common::kPlatformWindows) && _vm->getIsDemo()) {
-				_vm->_graphicsMan->fadeOutLong();
-			} else {
+			if ((_vm->getPlatform() != Common::kPlatformWindows) || !_vm->getIsDemo()) {
 				_vm->_soundMan->playSoundFile("SOUND17.WAV");
 				_vm->_graphicsMan->_fadingFl = true;
 				_vm->_animMan->playSequence2("HELICO.SEQ", 10, 4, 10);