[Scummvm-git-logs] scummvm master -> 196a687e04c0b1262ca5fe71099a6b0081f3b514

[dreammaster]

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

Summary:
21e5cd1650 ULTIMA4: Fix tile animations
196a687e04 ULTIMA4: Fix keymapping for enhanced version


Commit: 21e5cd16508816843242c5a6d30b6e699a4687d6
    https://github.com/scummvm/scummvm/commit/21e5cd16508816843242c5a6d30b6e699a4687d6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-19T17:36:00-07:00

Commit Message:
ULTIMA4: Fix tile animations

Changed paths:
    engines/ultima/ultima4/controllers/game_controller.cpp


diff --git a/engines/ultima/ultima4/controllers/game_controller.cpp b/engines/ultima/ultima4/controllers/game_controller.cpp
index efaaf14107..13a9b95a86 100644
--- a/engines/ultima/ultima4/controllers/game_controller.cpp
+++ b/engines/ultima/ultima4/controllers/game_controller.cpp
@@ -680,6 +680,9 @@ void GameController::timerFired() {
 
 		g_screen->screenCycle();
 
+		// Do game udpates to the screen, like tile animations
+		gameUpdateScreen();
+
 		/*
 		 * force pass if no commands within last 20 seconds
 		 */


Commit: 196a687e04c0b1262ca5fe71099a6b0081f3b514
    https://github.com/scummvm/scummvm/commit/196a687e04c0b1262ca5fe71099a6b0081f3b514
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-19T17:39:42-07:00

Commit Message:
ULTIMA4: Fix keymapping for enhanced version

Changed paths:
    engines/ultima/detection.cpp


diff --git a/engines/ultima/detection.cpp b/engines/ultima/detection.cpp
index a886493ebe..712170abd5 100644
--- a/engines/ultima/detection.cpp
+++ b/engines/ultima/detection.cpp
@@ -119,7 +119,7 @@ SaveStateList UltimaMetaEngine::listSaves(const char *target) const {
 
 Common::KeymapArray UltimaMetaEngine::initKeymaps(const char *target) const {
 	Common::String gameId = getGameId(target);
-	if (gameId == "ultima4")
+	if (gameId == "ultima4" || gameId == "ultima4_enh")
 		return Ultima::Ultima4::MetaEngine::initKeymaps();
 	if (gameId == "ultima8")
 		return Ultima::Ultima8::MetaEngine::initKeymaps();