[Scummvm-git-logs] scummvm master -> 429d4ede13f9723c6576ad696fa3ca3ac09be29f

[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:
429d4ede13 ULTIMA4: Support F5/F7 save/restores


Commit: 429d4ede13f9723c6576ad696fa3ca3ac09be29f
    https://github.com/scummvm/scummvm/commit/429d4ede13f9723c6576ad696fa3ca3ac09be29f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-03T22:18:15-07:00

Commit Message:
ULTIMA4: Support F5/F7 save/restores

Changed paths:
    engines/ultima/ultima4/controllers/key_handler_controller.cpp
    engines/ultima/ultima4/events/event_handler.cpp


diff --git a/engines/ultima/ultima4/controllers/key_handler_controller.cpp b/engines/ultima/ultima4/controllers/key_handler_controller.cpp
index a78f3530a9..61a56a95c4 100644
--- a/engines/ultima/ultima4/controllers/key_handler_controller.cpp
+++ b/engines/ultima/ultima4/controllers/key_handler_controller.cpp
@@ -48,6 +48,12 @@ int KeyHandler::setKeyRepeat(int delay, int interval) {
 }
 
 bool KeyHandler::globalHandler(int key) {
+	if (key == Common::KEYCODE_F5) {
+		(void)g_ultima->saveGameDialog();
+	} else if (key == Common::KEYCODE_F7) {
+		(void)g_ultima->loadGameDialog();
+	}
+
 	return false;
 }
 
diff --git a/engines/ultima/ultima4/events/event_handler.cpp b/engines/ultima/ultima4/events/event_handler.cpp
index eb39397675..5f48b399af 100644
--- a/engines/ultima/ultima4/events/event_handler.cpp
+++ b/engines/ultima/ultima4/events/event_handler.cpp
@@ -302,9 +302,9 @@ void EventHandler::handleKeyDownEvent(const Common::Event &event, Controller *co
 	int key;
 	bool processed;
 
-	key = event.kbd.ascii;
-	if (!key)
-		return;
+	key = (event.kbd.ascii != 0 && event.kbd.ascii < 128) ?
+		event.kbd.ascii : event.kbd.keycode;
+
 	key += (event.kbd.flags & (Common::KBD_CTRL |
 		Common::KBD_ALT | Common::KBD_META)) << 16;