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

sev- sev at scummvm.org
Sun Sep 22 23:17:40 CEST 2019


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:
de879dd538 QUEEN: Disable load/save until game is properly initialised


Commit: de879dd5380c16b03fb2c74d6580bd485f3487f5
    https://github.com/scummvm/scummvm/commit/de879dd5380c16b03fb2c74d6580bd485f3487f5
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-09-22T23:17:36+02:00

Commit Message:
QUEEN: Disable load/save until game is properly initialised

Co-authored-by: jdgleaver <jdgleaver at users.noreply.github.com>

Changed paths:
    engines/queen/queen.cpp
    engines/queen/queen.h


diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index 16d88ee..74ea20c 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -50,7 +50,7 @@
 namespace Queen {
 
 QueenEngine::QueenEngine(OSystem *syst)
-	: Engine(syst), _debugger(0), randomizer("queen") {
+	: Engine(syst), _gameStarted(false), _debugger(0), randomizer("queen") {
 }
 
 QueenEngine::~QueenEngine() {
@@ -173,7 +173,7 @@ void QueenEngine::update(bool checkPlayerInput) {
 }
 
 bool QueenEngine::canLoadOrSave() const {
-	return !_input->cutawayRunning() && !(_resource->isDemo() || _resource->isInterview());
+	return !_input->cutawayRunning() && !(_resource->isDemo() || _resource->isInterview()) && _gameStarted;
 }
 
 bool QueenEngine::canLoadGameStateCurrently() {
@@ -368,6 +368,9 @@ Common::Error QueenEngine::run() {
 			_logic->currentRoom(_logic->newRoom());
 			_logic->changeRoom();
 			_display->fullscreen(false);
+			// From this point onwards it is safe to use the load/save
+			// menu, so consider game to be 'started'
+			_gameStarted = true;
 			if (_logic->currentRoom() == _logic->newRoom()) {
 				_logic->newRoom(0);
 			}
diff --git a/engines/queen/queen.h b/engines/queen/queen.h
index 3c38ccd..411fdf9 100644
--- a/engines/queen/queen.h
+++ b/engines/queen/queen.h
@@ -129,6 +129,7 @@ protected:
 	bool _subtitles;
 	uint32 _lastSaveTime;
 	uint32 _lastUpdateTime;
+	bool _gameStarted;
 
 	BamScene *_bam;
 	BankManager *_bankMan;





More information about the Scummvm-git-logs mailing list