[Scummvm-git-logs] scummvm branch-2-6 -> b5f25a4dce2d69102575eb7d8ba2590beeab78d2

[dreammaster]

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:
b5f25a4dce CHEWY: Fix cursor disappearing using fn keys whilst menu open


Commit: b5f25a4dce2d69102575eb7d8ba2590beeab78d2
    https://github.com/scummvm/scummvm/commit/b5f25a4dce2d69102575eb7d8ba2590beeab78d2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-06-24T20:38:18-07:00

Commit Message:
CHEWY: Fix cursor disappearing using fn keys whilst menu open

Changed paths:
    engines/chewy/dialogs/inventory.cpp
    engines/chewy/main.cpp


diff --git a/engines/chewy/dialogs/inventory.cpp b/engines/chewy/dialogs/inventory.cpp
index 4c41f6c441d..a754776bd48 100644
--- a/engines/chewy/dialogs/inventory.cpp
+++ b/engines/chewy/dialogs/inventory.cpp
@@ -280,6 +280,7 @@ void Inventory::menu() {
 				if (!menuFirstFl) {
 					_G(cur)->show_cur();
 					while (_G(in)->getSwitchCode() == Common::KEYCODE_ESCAPE) {
+						SHOULD_QUIT_RETURN;
 						setupScreen(NO_SETUP);
 						inv_rand_x = -1;
 						inv_rand_y = -1;
diff --git a/engines/chewy/main.cpp b/engines/chewy/main.cpp
index eec36498e90..aea1db4202a 100644
--- a/engines/chewy/main.cpp
+++ b/engines/chewy/main.cpp
@@ -210,6 +210,7 @@ bool mainLoop(int16 mode) {
 		case Common::KEYCODE_F1:
 			_G(gameState).inv_cur = false;
 			_G(menu_item) = CUR_WALK;
+			_G(cur)->show_cur();
 			cursorChoice(_G(menu_item));
 			if (_G(menu_display) == MENU_DISPLAY)
 				_G(menu_display) = MENU_HIDE;
@@ -218,6 +219,7 @@ bool mainLoop(int16 mode) {
 		case Common::KEYCODE_F2:
 			_G(gameState).inv_cur = false;
 			_G(menu_item) = CUR_USE;
+			_G(cur)->show_cur();
 			cursorChoice(_G(menu_item));
 			if (_G(menu_display) == MENU_DISPLAY)
 				_G(menu_display) = MENU_HIDE;
@@ -226,6 +228,7 @@ bool mainLoop(int16 mode) {
 		case Common::KEYCODE_F3:
 			_G(gameState).inv_cur = false;
 			_G(menu_item) = CUR_LOOK;
+			_G(cur)->show_cur();
 			cursorChoice(_G(menu_item));
 			if (_G(menu_display) == MENU_DISPLAY)
 				_G(menu_display) = MENU_HIDE;
@@ -234,6 +237,7 @@ bool mainLoop(int16 mode) {
 		case Common::KEYCODE_F4:
 			_G(gameState).inv_cur = false;
 			_G(menu_item) = CUR_TALK;
+			_G(cur)->show_cur();
 			cursorChoice(_G(menu_item));
 			if (_G(menu_display) == MENU_DISPLAY)
 				_G(menu_display) = MENU_HIDE;