From 3d6e22ec37f6fc7ca98eff857da0db8a78c2bf0c Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 13 Nov 2019 12:26:46 +0100
Subject: GRIFFON: Fix loading from GMM

---
 engines/griffon/dialogs.cpp  | 3 ---
 engines/griffon/saveload.cpp | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/griffon')

diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp
index c000d58590..89c487cb13 100644
--- a/engines/griffon/dialogs.cpp
+++ b/engines/griffon/dialogs.cpp
@@ -638,9 +638,6 @@ void GriffonEngine::saveLoadNew() {
 
 							renderSaveStates();
 						} else if ((curCol == 2) && loadState(curRow - 1)) {
-							_saveSlot = curRow - 1;
-
-							_gameMode = kGameModeLoadGame;
 
 							return;
 						}
diff --git a/engines/griffon/saveload.cpp b/engines/griffon/saveload.cpp
index ff0ffbf588..3052005bb0 100644
--- a/engines/griffon/saveload.cpp
+++ b/engines/griffon/saveload.cpp
@@ -123,6 +123,9 @@ int GriffonEngine::loadState(int slotnum) {
 
 		INPUT("%f", &_player.spellStrength);
 
+		_saveSlot = slotnum;
+		_gameMode = kGameModeLoadGame;
+
 		return 1; // success
 	}
 
-- 
cgit v1.2.3