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

[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:
8b1535cbdd ULTIMA4: Allow for loading saves in cities


Commit: 8b1535cbdd9d76e251178e7bb93a061bc407f4f3
    https://github.com/scummvm/scummvm/commit/8b1535cbdd9d76e251178e7bb93a061bc407f4f3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-09T10:16:59-07:00

Commit Message:
ULTIMA4: Allow for loading saves in cities

Changed paths:
    engines/ultima/ultima4/ultima4.cpp
    engines/ultima/ultima4/ultima4.h


diff --git a/engines/ultima/ultima4/ultima4.cpp b/engines/ultima/ultima4/ultima4.cpp
index f9f16f7695..aecfd8ba55 100644
--- a/engines/ultima/ultima4/ultima4.cpp
+++ b/engines/ultima/ultima4/ultima4.cpp
@@ -202,6 +202,10 @@ void Ultima4Engine::setToJourneyOnwards() {
 	assert(_saveSlotToLoad);
 }
 
+bool Ultima4Engine::canLoadGameStateCurrently(bool isAutosave) {
+	return g_game != nullptr && g_context != nullptr && eventHandler->getController() == g_game;
+}
+
 bool Ultima4Engine::canSaveGameStateCurrently(bool isAutosave) {
 	return g_game != nullptr && g_context != nullptr && eventHandler->getController() == g_game
 		&& (g_context->_location->_context & CTX_CAN_SAVE_GAME);
diff --git a/engines/ultima/ultima4/ultima4.h b/engines/ultima/ultima4/ultima4.h
index 29887be0a6..e4db2d7708 100644
--- a/engines/ultima/ultima4/ultima4.h
+++ b/engines/ultima/ultima4/ultima4.h
@@ -98,9 +98,7 @@ public:
 	/**
 	 * Returns true if a savegame can be loaded
 	 */
-	bool canLoadGameStateCurrently(bool isAutosave = false) override {
-		return canSaveGameStateCurrently(isAutosave);
-	}
+	bool canLoadGameStateCurrently(bool isAutosave = false) override;
 
 	/**
 	 * Returns true if the game can be saved