[Scummvm-git-logs] scummvm master -> 0cc9a326d0254f4d6ebd3d4ad44b7d33250e309e

[bluegr]

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

Summary:
a5afc29999 EFH: Fix giving and dropping unequippable items
376e25e99c EFH: Fix quitting in status menu
0cc9a326d0 EFH: Fix being unable to replace 3rd party member


Commit: a5afc299995e61c41c149cfea9d3c37e62ea372b
    https://github.com/scummvm/scummvm/commit/a5afc299995e61c41c149cfea9d3c37e62ea372b
Author: ellm135 (ellm13531 at gmail.com)
Date: 2025-07-19T08:39:51+03:00

Commit Message:
EFH: Fix giving and dropping unequippable items

Changed paths:
    engines/efh/menu.cpp


diff --git a/engines/efh/menu.cpp b/engines/efh/menu.cpp
index cdc9a4517c2..d2ed3991773 100644
--- a/engines/efh/menu.cpp
+++ b/engines/efh/menu.cpp
@@ -695,12 +695,13 @@ int16 EfhEngine::handleStatusMenu(int16 gameMode, int16 charId) {
 			itemId = _npcBuf[charId]._inventory[objectId]._ref;
 			if (hasObjectEquipped(charId, objectId) && isItemCursed(itemId)) {
 				displayStringInSmallWindowWithBorder("The item is cursed!  IT IS EVIL!!!!!!!!", true, charId, windowId, menuId, curMenuLine);
-			} else if (hasObjectEquipped(charId, objectId)) {
-				displayStringInSmallWindowWithBorder("Item is Equipped!  Give anyway?", false, charId, windowId, menuId, curMenuLine);
-				if (!getValidationFromUser())
-					validationFl = false;
-				displayWindowAndStatusMenu(charId, windowId, menuId, curMenuLine);
-
+			} else {
+				if (hasObjectEquipped(charId, objectId)) {
+					displayStringInSmallWindowWithBorder("Item is Equipped!  Give anyway?", false, charId, windowId, menuId, curMenuLine);
+					if (!getValidationFromUser())
+						validationFl = false;
+					displayWindowAndStatusMenu(charId, windowId, menuId, curMenuLine);
+				}
 				if (validationFl) {
 					if (gameMode == 2) {
 						displayStringInSmallWindowWithBorder("Not a Combat Option !", true, charId, windowId, menuId, curMenuLine);
@@ -782,12 +783,13 @@ int16 EfhEngine::handleStatusMenu(int16 gameMode, int16 charId) {
 			itemId = _npcBuf[charId]._inventory[objectId]._ref;
 			if (hasObjectEquipped(charId, objectId) && isItemCursed(itemId)) {
 				displayStringInSmallWindowWithBorder("The item is cursed!  IT IS EVIL!!!!!!!!", true, charId, windowId, menuId, curMenuLine);
-			} else if (hasObjectEquipped(charId, objectId)) {
-				displayStringInSmallWindowWithBorder("Item Is Equipped!  Drop Anyway?", false, charId, windowId, menuId, curMenuLine);
-				if (!getValidationFromUser())
-					validationFl = false;
-				displayWindowAndStatusMenu(charId, windowId, menuId, curMenuLine);
-
+			} else {
+				if (hasObjectEquipped(charId, objectId)) {
+					displayStringInSmallWindowWithBorder("Item Is Equipped!  Drop Anyway?", false, charId, windowId, menuId, curMenuLine);
+					if (!getValidationFromUser())
+						validationFl = false;
+					displayWindowAndStatusMenu(charId, windowId, menuId, curMenuLine);
+				}
 				if (validationFl) {
 					removeObject(charId, objectId);
 					if (gameMode == 2) {


Commit: 376e25e99c20d37a31f204c977abb01e4c268254
    https://github.com/scummvm/scummvm/commit/376e25e99c20d37a31f204c977abb01e4c268254
Author: ellm135 (ellm13531 at gmail.com)
Date: 2025-07-19T08:39:51+03:00

Commit Message:
EFH: Fix quitting in status menu

Changed paths:
    engines/efh/menu.cpp


diff --git a/engines/efh/menu.cpp b/engines/efh/menu.cpp
index d2ed3991773..95adc30493c 100644
--- a/engines/efh/menu.cpp
+++ b/engines/efh/menu.cpp
@@ -833,6 +833,10 @@ int16 EfhEngine::handleStatusMenu(int16 gameMode, int16 charId) {
 			_statusMenuActive = false;
 			return 0x7FFF;
 		}
+
+		if (shouldQuit()) {
+			return 0;
+		}
 	}
 
 	return 0;


Commit: 0cc9a326d0254f4d6ebd3d4ad44b7d33250e309e
    https://github.com/scummvm/scummvm/commit/0cc9a326d0254f4d6ebd3d4ad44b7d33250e309e
Author: ellm135 (ellm13531 at gmail.com)
Date: 2025-07-19T08:39:51+03:00

Commit Message:
EFH: Fix being unable to replace 3rd party member

Changed paths:
    engines/efh/efh.cpp


diff --git a/engines/efh/efh.cpp b/engines/efh/efh.cpp
index fe25104214a..7d820e7a498 100644
--- a/engines/efh/efh.cpp
+++ b/engines/efh/efh.cpp
@@ -906,7 +906,7 @@ int16 EfhEngine::chooseCharacterToReplace() {
 	Common::KeyCode input;
 	for (;;) {
 		input = waitForKey();
-		if (input == Common::KEYCODE_ESCAPE || input == Common::KEYCODE_0 || (input > Common::KEYCODE_1 && input < maxVal))
+		if (input == Common::KEYCODE_ESCAPE || input == Common::KEYCODE_0 || (input > Common::KEYCODE_1 && input <= maxVal))
 			break;
 	}