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

dreammaster paulfgilbert at gmail.com
Thu Dec 20 05:34:47 CET 2018


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:
d9000d64a9 GLK: FROTZ: Screen rendering after loading savegame from launcher


Commit: d9000d64a972aed9e88a48bd67ede8b55fdad076
    https://github.com/scummvm/scummvm/commit/d9000d64a972aed9e88a48bd67ede8b55fdad076
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-12-19T20:34:39-08:00

Commit Message:
GLK: FROTZ: Screen rendering after loading savegame from launcher

Changed paths:
    engines/glk/frotz/frotz.cpp


diff --git a/engines/glk/frotz/frotz.cpp b/engines/glk/frotz/frotz.cpp
index aaae44e..c2341d4 100644
--- a/engines/glk/frotz/frotz.cpp
+++ b/engines/glk/frotz/frotz.cpp
@@ -51,12 +51,12 @@ void Frotz::runGame(Common::SeekableReadStream *gameFile) {
 	// If save was selected from the launcher, handle loading it
 	int saveSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
 	if (saveSlot != -1) {
-		bool success = loadGameState(saveSlot).getCode() == Common::kNoError;
+		int loadResult = loadGameState(saveSlot).getCode() == Common::kNoError ? 2 : -1;
 
 		if (h_version <= V3)
-			branch(success);
+			branch(loadResult);
 		else
-			store(success);
+			store(loadResult);
 	}
 
 	// Game loop





More information about the Scummvm-git-logs mailing list