[Scummvm-git-logs] scummvm master -> 8bb3679bd34f9b3b089149daa0a8bd7cd653bf36

[mduggan]

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:
8bb3679bd3 ULTIMA: Fix building when ultima6 is the only enabled ultima subengine


Commit: 8bb3679bd34f9b3b089149daa0a8bd7cd653bf36
    https://github.com/scummvm/scummvm/commit/8bb3679bd34f9b3b089149daa0a8bd7cd653bf36
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-12-18T17:23:55+11:00

Commit Message:
ULTIMA: Fix building when ultima6 is the only enabled ultima subengine

Make sure gameId is defined in UltimaMetaEngine::initKeymaps
when only ultima6 is enabled.

Changed paths:
    engines/ultima/metaengine.cpp


diff --git a/engines/ultima/metaengine.cpp b/engines/ultima/metaengine.cpp
index 18d41d05002..7215dc5eed1 100644
--- a/engines/ultima/metaengine.cpp
+++ b/engines/ultima/metaengine.cpp
@@ -247,7 +247,7 @@ SaveStateDescriptor UltimaMetaEngine::querySaveMetaInfos(const char *target, int
 }
 
 Common::KeymapArray UltimaMetaEngine::initKeymaps(const char *target) const {
-#if defined(ENABLE_ULTIMA4) || defined(ENABLE_ULTIMA8)
+#if defined(ENABLE_ULTIMA4) || defined(ENABLE_ULTIMA6) || defined(ENABLE_ULTIMA8)
 	const Common::String gameId = getGameId(target);
 #endif