aboutsummaryrefslogtreecommitdiff
path: root/engines/griffon
diff options
context:
space:
mode:
authorEugene Sandulenko2019-11-10 22:56:29 +0100
committerEugene Sandulenko2019-11-13 22:07:08 +0100
commit477e12c1e1ccf529fdee9d4339b618fcd8b24160 (patch)
tree5ed81d0422c4f44f0073ab53557fcc26d44b5755 /engines/griffon
parent6116ed3a250ec0e6facb97164c4f21de722e22f6 (diff)
downloadscummvm-rg350-477e12c1e1ccf529fdee9d4339b618fcd8b24160.tar.gz
scummvm-rg350-477e12c1e1ccf529fdee9d4339b618fcd8b24160.tar.bz2
scummvm-rg350-477e12c1e1ccf529fdee9d4339b618fcd8b24160.zip
GRIFFON: More work on game modes
Diffstat (limited to 'engines/griffon')
-rw-r--r--engines/griffon/engine.cpp4
-rw-r--r--engines/griffon/griffon.cpp3
-rw-r--r--engines/griffon/griffon.h3
3 files changed, 7 insertions, 3 deletions
diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp
index b23dae9e5d..19519bb3da 100644
--- a/engines/griffon/engine.cpp
+++ b/engines/griffon/engine.cpp
@@ -85,6 +85,8 @@ void GriffonEngine::mainLoop() {
_pmenu = false;
}
+ _gameMode = kGameModePlay;
+
do {
if (!_forcePause) {
updateAnims();
@@ -105,7 +107,7 @@ void GriffonEngine::mainLoop() {
_console->onFrame();
updateEngine();
- } while (!_shouldQuit && _gameMode != kGameModeEnd);
+ } while (!_shouldQuit && _gameMode != kGameModeEnd && _gameMode != kGameModeNewGame);
}
void GriffonEngine::updateEngine() {
diff --git a/engines/griffon/griffon.cpp b/engines/griffon/griffon.cpp
index 74517b47ae..85e1e367ae 100644
--- a/engines/griffon/griffon.cpp
+++ b/engines/griffon/griffon.cpp
@@ -138,7 +138,8 @@ Common::Error GriffonEngine::run() {
return Common::kNoError;
while (!_shouldQuit) {
- title(0);
+ if (_gameMode != kGameModeNewGame)
+ title(0);
if (_gameMode == kGameModeNewGame) {
newGame();
diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h
index 6206c91332..611ecc8de2 100644
--- a/engines/griffon/griffon.h
+++ b/engines/griffon/griffon.h
@@ -325,7 +325,8 @@ enum {
kGameModeEnd,
kGameModeSaveLoad,
kGameModeNewGame,
- kGameModeLoadGame
+ kGameModeLoadGame,
+ kGameModePlay
};
class GriffonEngine : public Engine {