[Scummvm-cvs-logs] scummvm master -> 1422004a806600af68d9e48314cfec55ef09e212

[Strangerke]

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:
1422004a80 MORTEVIELLE: Fix crash when loading from launcher


Commit: 1422004a806600af68d9e48314cfec55ef09e212
    https://github.com/scummvm/scummvm/commit/1422004a806600af68d9e48314cfec55ef09e212
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-20T14:10:05-07:00

Commit Message:
MORTEVIELLE: Fix crash when loading from launcher

Changed paths:
    engines/mortevielle/mortevielle.cpp



diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 7748ce9..f13f8cb 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -347,13 +347,16 @@ Common::Error MortevielleEngine::run() {
 	if (loadSlot == 0)
 		// Show the game introduction
 		showIntroduction();
+	else {
+		_caff = 51;
+		_text.taffich();
+	}
 
 	// Either load the initial game state savegame, or the specified savegame number
 	adzon();
+	resetVariables();
 	if (loadSlot != 0)
 		_savegameManager.loadSavegame(generateSaveFilename(loadSlot));
-	else
-		resetVariables();
 
 	// Run the main game loop
 	mainGame();