[Scummvm-cvs-logs] scummvm master -> e2856ed85b08b4ab96e5a05cef793052e3232838

Strangerke Strangerke at scummvm.org
Fri Aug 16 23:31:10 CEST 2013


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:
e2856ed85b MORTEVIELLE: Avoid using sav0.mor in run()


Commit: e2856ed85b08b4ab96e5a05cef793052e3232838
    https://github.com/scummvm/scummvm/commit/e2856ed85b08b4ab96e5a05cef793052e3232838
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-16T14:29:52-07:00

Commit Message:
MORTEVIELLE: Avoid using sav0.mor in run()

Changed paths:
    engines/mortevielle/mortevielle.cpp



diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index e958d0b..7748ce9 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -350,7 +350,10 @@ Common::Error MortevielleEngine::run() {
 
 	// Either load the initial game state savegame, or the specified savegame number
 	adzon();
-	_savegameManager.loadSavegame(generateSaveFilename(loadSlot));
+	if (loadSlot != 0)
+		_savegameManager.loadSavegame(generateSaveFilename(loadSlot));
+	else
+		resetVariables();
 
 	// Run the main game loop
 	mainGame();






More information about the Scummvm-git-logs mailing list