[Scummvm-git-logs] scummvm master -> d57703ed745f0db2a47ed4741f893cc0f15a77d6

[athrxx]

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:
cac259ba26 AGOS: (ELVIRA2) - fix mouse wheel handling
d57703ed74 KYRA: (HOF) - fix interactive demo


Commit: cac259ba26092e8820b241eb8379c97f1776a3b3
    https://github.com/scummvm/scummvm/commit/cac259ba26092e8820b241eb8379c97f1776a3b3
Author: athrxx (athrxx at scummvm.org)
Date: 2021-04-17T04:23:27+02:00

Commit Message:
AGOS: (ELVIRA2) - fix mouse wheel handling

- Fix messed up inventory (bug no. 11998) caused by the asynchronous (outsize of the normal engine) handling of the mouse wheel. This often lead to wrong inventory item icons.

- Also prevent crash due to nullptr deref. This can happen when using the mouse wheel while the inventory items are not visible (e. g. during the copy protection, when the symbol and words for the code wheel are displayed in the inventory window).

Changed paths:
    engines/agos/input.cpp


diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index 4a10f151f9..cc0acac2d0 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/config-manager.h"
+#include "common/events.h"
 #include "common/file.h"
 
 #include "agos/intern.h"
@@ -493,8 +494,8 @@ void AGOSEngine_Elvira2::handleMouseWheelUp() {
 				_saveLoadRowCurPos -= 3;
 
 			listSaveGames();
-	} else {
-		AGOSEngine::handleMouseWheelUp();
+	} else if ((ha = findBox(0x7FFB)) && ha->window && ha->window->iconPtr) {
+		_lastHitArea3 = _lastHitArea = ha;
 	}
 }
 
@@ -507,8 +508,8 @@ void AGOSEngine_Elvira2::handleMouseWheelDown() {
 				_saveLoadRowCurPos = 1;
 
 			listSaveGames();
-	} else {
-		AGOSEngine::handleMouseWheelDown();
+	} else if ((ha = findBox(0x7FFC)) && ha->window && ha->window->iconPtr) {
+		_lastHitArea3 = _lastHitArea = ha;
 	}
 }
 


Commit: d57703ed745f0db2a47ed4741f893cc0f15a77d6
    https://github.com/scummvm/scummvm/commit/d57703ed745f0db2a47ed4741f893cc0f15a77d6
Author: athrxx (athrxx at scummvm.org)
Date: 2021-04-17T04:23:27+02:00

Commit Message:
KYRA: (HOF) - fix interactive demo

(broken main menu)

Changed paths:
    engines/kyra/sequence/sequences_hof.cpp


diff --git a/engines/kyra/sequence/sequences_hof.cpp b/engines/kyra/sequence/sequences_hof.cpp
index 2bbb240949..aa5aa91a51 100644
--- a/engines/kyra/sequence/sequences_hof.cpp
+++ b/engines/kyra/sequence/sequences_hof.cpp
@@ -745,7 +745,7 @@ void SeqPlayer_HOF::playScenes() {
 	_vm->sound()->haltTrack();
 	_vm->sound()->voiceStop();
 
-	if ((!checkAbortPlayback() || _vm->shouldQuit()) && _vm->gameFlags().isDemo)
+	if ((!checkAbortPlayback() || _vm->shouldQuit()) && !_vm->gameFlags().isTalkie && _vm->gameFlags().isDemo)
 		_curScene = -1;
 }