[Scummvm-git-logs] scummvm master -> 9318bd228e9e88bbefb47db3a991f8fbbc821979

[AndywinXp]

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

Summary:
9318bd228e LASTEXPRESS: Add F4 (skip to next chapter) handling


Commit: 9318bd228e9e88bbefb47db3a991f8fbbc821979
    https://github.com/scummvm/scummvm/commit/9318bd228e9e88bbefb47db3a991f8fbbc821979
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-25T20:41:12+02:00

Commit Message:
LASTEXPRESS: Add F4 (skip to next chapter) handling

Not in the retail exe, but there's a function called doF4, so...

Changed paths:
    engines/lastexpress/game/navigation.cpp
    engines/lastexpress/lastexpress.cpp


diff --git a/engines/lastexpress/game/navigation.cpp b/engines/lastexpress/game/navigation.cpp
index 700dde9fc6a..b0532eb90ee 100644
--- a/engines/lastexpress/game/navigation.cpp
+++ b/engines/lastexpress/game/navigation.cpp
@@ -743,6 +743,7 @@ void LogicManager::checkInventory(int32 flags) {
 						_highlightedItem = 0;
 					}
 				}
+
 				return;
 			}
 
@@ -799,7 +800,7 @@ void LogicManager::checkInventory(int32 flags) {
 			}
 
 			if (!_closeUp || (_nodeReturn2 && findLargeItem() == _activeItem)) {
-				_isMagnifierInUse = 1;
+				_isMagnifierInUse = true;
 			}
 
 			if ((flags & kMouseFlagLeftDown) == 0)
diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp
index 237253c52ed..44fd811b734 100644
--- a/engines/lastexpress/lastexpress.cpp
+++ b/engines/lastexpress/lastexpress.cpp
@@ -476,16 +476,17 @@ bool LastExpressEngine::handleEvents() {
 		switch (ev.type) {
 
 		case Common::EVENT_KEYDOWN:
-			//// DEBUG: Quit game on escape
-			// if (ev.kbd.keycode == Common::KEYCODE_ESCAPE)
-			//	quitGame();
+			switch (ev.kbd.keycode) {
+			case Common::KEYCODE_F4:
+				if (_navigationEngineIsRunning && gDebugLevel >= 3)
+					getLogicManager()->doF4();
+
+				break;
+			default:
+				break;
+			}
 
 			break;
-
-		//case Common::EVENT_MAINMENU:
-			// Closing the GMM
-
-
 		case Common::EVENT_LBUTTONDOWN:
 			_systemEventLeftMouseDown = true;
 			curFlags |= kMouseFlagLeftButton;