[Scummvm-git-logs] scummvm master -> 952092ae69e313d6b96fa206ee659dd99f945757

[Strangerke]

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

Summary:
952092ae69 EFH: Group two checks in handleStatusMenu


Commit: 952092ae69e313d6b96fa206ee659dd99f945757
    https://github.com/scummvm/scummvm/commit/952092ae69e313d6b96fa206ee659dd99f945757
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2023-04-30T18:40:01+01:00

Commit Message:
EFH: Group two checks in handleStatusMenu

Changed paths:
    engines/efh/menu.cpp


diff --git a/engines/efh/menu.cpp b/engines/efh/menu.cpp
index 05f12943269..0774c06808a 100644
--- a/engines/efh/menu.cpp
+++ b/engines/efh/menu.cpp
@@ -536,10 +536,6 @@ int16 EfhEngine::handleStatusMenu(int16 gameMode, int16 charId) {
 			Common::KeyCode var19 = handleAndMapInput(false);
 			if (_menuDepth == 0) {
 				switch (var19) {
-				case Common::KEYCODE_ESCAPE:
-					windowId = kEfhMenuLeave;
-					var19 = Common::KEYCODE_RETURN;
-					break;
 				case Common::KEYCODE_a:
 					windowId = kEfhMenuActive;
 					var19 = Common::KEYCODE_RETURN;
@@ -560,6 +556,7 @@ int16 EfhEngine::handleStatusMenu(int16 gameMode, int16 charId) {
 					windowId = kEfhMenuInfo;
 					var19 = Common::KEYCODE_RETURN;
 					break;
+				case Common::KEYCODE_ESCAPE:
 				case Common::KEYCODE_l:
 					windowId = kEfhMenuLeave;
 					var19 = Common::KEYCODE_RETURN;
@@ -576,9 +573,8 @@ int16 EfhEngine::handleStatusMenu(int16 gameMode, int16 charId) {
 					windowId = kEfhMenuUse;
 					var19 = Common::KEYCODE_RETURN;
 					break;
-				// case 0xFB: Joystick button 2
 				default:
-					//	warning("handleStatusMenu - unhandled keys (or joystick event?) 0xBA, 0xBB, 0xBC");
+					debugC(9, kDebugEngine, "handleStatusMenu - unhandled keys");
 					break;
 				}
 			} else if (_menuDepth == 1) {