diff options
| author | Cameron Cawley | 2019-09-22 21:59:28 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-09-22 23:17:36 +0200 |
| commit | de879dd5380c16b03fb2c74d6580bd485f3487f5 (patch) | |
| tree | d9c36ccdd7f935b3ffb00dc2b20d11b780a850c9 /engines | |
| parent | 08b711406a585cd4098c23422db9b342a339eaa0 (diff) | |
| download | scummvm-rg350-de879dd5380c16b03fb2c74d6580bd485f3487f5.tar.gz scummvm-rg350-de879dd5380c16b03fb2c74d6580bd485f3487f5.tar.bz2 scummvm-rg350-de879dd5380c16b03fb2c74d6580bd485f3487f5.zip | |
QUEEN: Disable load/save until game is properly initialised
Co-authored-by: jdgleaver <jdgleaver@users.noreply.github.com>
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/queen/queen.cpp | 7 | ||||
| -rw-r--r-- | engines/queen/queen.h | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 16d88ee6f3..74ea20cb0f 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 3c38ccd312..411fdf98e3 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; |