libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-03 07:30:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA: NUVIE: Disable keymapper during cutscenes

Browse Source 
Keymapper support was added in 12a47d956e

Fix regression introduced in that commit:

Keys bound via the keymapper were no longer usable in cutscenes,
including the intro. This made it impossible to enter a character
name or skip a scene with the default keybinds.
This commit is contained in:
PushmePullyu 2023-12-18 05:31:09 +01:00 committed by Matthew Duggan
parent 4fc42f15be
commit 014f31edc1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/ultima/nuvie/script/script.cpp
View File

@ -49,6 +49,7 @@
#include "ultima/nuvie/core/magic.h"
#include "ultima/nuvie/files/tmx_map.h"
#include "ultima/nuvie/files/u6_lib_n.h"
#include "backends/keymapper/keymapper.h"
namespace Ultima {
namespace Nuvie {
@ -940,7 +941,13 @@ bool Script::play_cutscene(const char *script_file) {
ConsoleHide();
return run_lua_file(script_file_path.c_str());
// FIXME: For now we disable the keymapper during cutscenes so input works correctly
// (e.g. for character name entry or skipping the intro)
g_system->getEventManager()->getKeymapper()->setEnabled(false);
bool retVal = run_lua_file(script_file_path.c_str());
g_system->getEventManager()->getKeymapper()->setEnabled(true);
return retVal;
}
MovementStatus Script::call_player_before_move_action(sint16 *rel_x, sint16 *rel_y) {