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

[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:
ba601d9520 NUVIE: Fix event handling in cut-scenes


Commit: ba601d9520ecaef27c6050d33fc96d419947354c
    https://github.com/scummvm/scummvm/commit/ba601d9520ecaef27c6050d33fc96d419947354c
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-03-13T20:19:13-07:00

Commit Message:
NUVIE: Fix event handling in cut-scenes

Input polling function: Stay in the event loop instead of returning on
events we do not want to handle. Always push a return value on the lua
stack unless the event queue is actually empty.

Changed paths:
    engines/ultima/nuvie/script/script_cutscene.cpp


diff --git a/engines/ultima/nuvie/script/script_cutscene.cpp b/engines/ultima/nuvie/script/script_cutscene.cpp
index 8f4b0cf2d9f..becdf4b374b 100644
--- a/engines/ultima/nuvie/script/script_cutscene.cpp
+++ b/engines/ultima/nuvie/script/script_cutscene.cpp
@@ -1005,7 +1005,7 @@ static int nscript_input_poll(lua_State *L) {
 			event.kbd.keycode = keybinder->get_key_from_joy_events(&event);
 			if (event.kbd.keycode == Common::KEYCODE_INVALID)
 				// button isn't mapped or was in deadzone
-				return 0; // pretend nothing happened
+				continue; // pretend nothing happened
 
 			event.type = Common::EVENT_KEYDOWN;
 		}
@@ -1039,7 +1039,7 @@ static int nscript_input_poll(lua_State *L) {
 					key.keycode = Common::KEYCODE_RETURN;
 					break;
 				default:
-					if (keybinder->handle_always_available_keys(a)) return 0;
+					if (keybinder->handle_always_available_keys(a)) continue;
 					break;
 				}
 			}