Enabled and hopefully fixed GMM saving/loading for sword1

svn-id: r39095

1 files changed, 8 insertions, 8 deletions

diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index b086f2eb0b..246bf95b8e 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -108,7 +108,9 @@ bool SwordMetaEngine::hasFeature(MetaEngineFeature f) const {
 
 bool Sword1::SwordEngine::hasFeature(EngineFeature f) const {
 	return
-		(f == kSupportsRTL);
+		(f == kSupportsRTL) ||
+		(f == kSupportsSavingDuringRuntime) ||
+		(f == kSupportsLoadingDuringRuntime);
 }
 
 GameList SwordMetaEngine::getSupportedGames() const {
@@ -313,30 +315,28 @@ SaveStateDescriptor SwordMetaEngine::querySaveMetaInfos(const char *target, int
 
 namespace Sword1 {
 
-// FIXME: Loading a game through the GMM crashes the game
-#if 0
 Common::Error SwordEngine::loadGameState(int slot) {
 	_systemVars.forceRestart = false;
 	_systemVars.controlPanelMode = CP_NORMAL;
 	_control->restoreGameFromFile(slot);
 	reinitialize();
 	_control->doRestore();
+	reinitRes();	
 	return Common::kNoError;	// TODO: return success/failure
 }
 
+bool SwordEngine::canLoadGameStateCurrently() {
+	return mouseIsActive();
+}
+
 Common::Error SwordEngine::saveGameState(int slot, const char *desc) {
 	_control->setSaveDescription(slot, desc);
 	_control->saveGameToFile(slot);
 	return Common::kNoError;	// TODO: return success/failure
 }
 
-bool SwordEngine::canLoadGameStateCurrently() {
-	return mouseIsActive();
-}
-
 bool SwordEngine::canSaveGameStateCurrently() {
 	return mouseIsActive();
 }
-#endif
 
 } // End of namespace Sword1