[Scummvm-git-logs] scummvm master -> 91f9742d0006877f16b54a8d78f3f0e7dee5a5af

[dreammaster]

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:
91f9742d00 CRUISE: Simplify endgame saving fix


Commit: 91f9742d0006877f16b54a8d78f3f0e7dee5a5af
    https://github.com/scummvm/scummvm/commit/91f9742d0006877f16b54a8d78f3f0e7dee5a5af
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-08-28T20:07:00-07:00

Commit Message:
CRUISE: Simplify endgame saving fix

Changed paths:
    engines/cruise/background.cpp
    engines/cruise/cruise.cpp
    engines/cruise/cruise.h


diff --git a/engines/cruise/background.cpp b/engines/cruise/background.cpp
index 5943f153b7..b51ef15515 100644
--- a/engines/cruise/background.cpp
+++ b/engines/cruise/background.cpp
@@ -90,9 +90,8 @@ int loadBackground(const char *name, int idx) {
 
 	debug(1, "Loading BG: %s", name);
 
-	// WORKAROUND: Don't allow save/loading during endgame
+	// WORKAROUND: Don't allow saving during endgame
 	if (!strcmp(name, "DGF1.PI1")) {
-		_vm->_isEndGame = true;
 		userEnabled = false;
 	}
 
diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp
index 7e40921a51..39ce2df251 100644
--- a/engines/cruise/cruise.cpp
+++ b/engines/cruise/cruise.cpp
@@ -55,7 +55,6 @@ CruiseEngine::CruiseEngine(OSystem * syst, const CRUISEGameDescription *gameDesc
 	_speedFlag = false;
 	_polyStructs = nullptr;
 	_polyStruct = nullptr;
-	_isEndGame = false;
 
 	// Setup mixer
 	syncSoundSettings();
@@ -211,7 +210,7 @@ Common::Error CruiseEngine::saveGameState(int slot, const Common::String &desc,
 }
 
 bool CruiseEngine::canSaveGameStateCurrently() {
-	return (playerMenuEnabled != 0) && (userEnabled != 0) && !_isEndGame;
+	return (playerMenuEnabled != 0) && (userEnabled != 0);
 }
 
 const char *CruiseEngine::getSavegameFile(int saveGameIdx) {
diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h
index 09ce98ca7f..16a4324072 100644
--- a/engines/cruise/cruise.h
+++ b/engines/cruise/cruise.h
@@ -103,7 +103,6 @@ public:
 	void initAllData();
 
 	Common::RandomSource _rnd;
-	bool _isEndGame;
 
 	struct MemInfo {
 		int32  lineNum;