[Scummvm-git-logs] scummvm master -> b35e75fdebe8c7a2a3ee3f684fd33fa60e879286

ccawley2011 ccawley2011 at gmail.com
Mon Apr 5 14:43:09 UTC 2021


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:
b35e75fdeb NANCY: Fix compilation


Commit: b35e75fdebe8c7a2a3ee3f684fd33fa60e879286
    https://github.com/scummvm/scummvm/commit/b35e75fdebe8c7a2a3ee3f684fd33fa60e879286
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-04-05T15:42:57+01:00

Commit Message:
NANCY: Fix compilation

Changed paths:
    engines/nancy/nancy.cpp
    engines/nancy/state/scene.cpp


diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index c150b24776..3368519651 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -231,7 +231,7 @@ Common::Error NancyEngine::run() {
 	// Check if we need to load a save state from the launcher
 	if (ConfMan.hasKey("save_slot")) {
 		int saveSlot = ConfMan.getInt("save_slot");
-		if (saveSlot >= 0 && saveSlot <= getMetaEngine().getMaximumSaveSlot()) {
+		if (saveSlot >= 0 && saveSlot <= getMetaEngine()->getMaximumSaveSlot()) {
 			// Set to Scene but do not do the loading yet
 			setState(NancyState::kScene);
 		}
diff --git a/engines/nancy/state/scene.cpp b/engines/nancy/state/scene.cpp
index 695f88d235..b7e10879dc 100644
--- a/engines/nancy/state/scene.cpp
+++ b/engines/nancy/state/scene.cpp
@@ -406,7 +406,7 @@ void Scene::init() {
 	if (ConfMan.hasKey("save_slot")) {
 		// Load savefile directly from the launcher
 		int saveSlot = ConfMan.getInt("save_slot");
-		if (saveSlot >= 0 && saveSlot <= g_nancy->getMetaEngine().getMaximumSaveSlot()) {
+		if (saveSlot >= 0 && saveSlot <= g_nancy->getMetaEngine()->getMaximumSaveSlot()) {
 			// Set to Scene but do not do the loading yet
 			g_nancy->loadGameState(saveSlot);
 		}




More information about the Scummvm-git-logs mailing list