diff options
author | Eugene Sandulenko | 2016-12-11 16:14:58 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2016-12-11 18:36:08 +0100 |
commit | 8f4a662b1db79a8e9db70ae4e7f89325afdc409a (patch) | |
tree | 770ff083ffabb6764741d7bc30aa2d060ff2fec1 /engines/fullpipe | |
parent | a95be40dcd809f188750c81c710b087fe3cbc784 (diff) | |
download | scummvm-rg350-8f4a662b1db79a8e9db70ae4e7f89325afdc409a.tar.gz scummvm-rg350-8f4a662b1db79a8e9db70ae4e7f89325afdc409a.tar.bz2 scummvm-rg350-8f4a662b1db79a8e9db70ae4e7f89325afdc409a.zip |
FULLPIPE: Simplify demo check in the engine
Diffstat (limited to 'engines/fullpipe')
-rw-r--r-- | engines/fullpipe/detection.cpp | 4 | ||||
-rw-r--r-- | engines/fullpipe/fullpipe.cpp | 1 | ||||
-rw-r--r-- | engines/fullpipe/fullpipe.h | 1 | ||||
-rw-r--r-- | engines/fullpipe/scenes.cpp | 6 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene08.cpp | 4 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene09.cpp | 4 | ||||
-rw-r--r-- | engines/fullpipe/stateloader.cpp | 4 |
7 files changed, 11 insertions, 13 deletions
diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp index ceda26a656..8f4de11e79 100644 --- a/engines/fullpipe/detection.cpp +++ b/engines/fullpipe/detection.cpp @@ -35,6 +35,10 @@ uint32 FullpipeEngine::getFeatures() const { return _gameDescription->flags; } +bool FullpipeEngine::isDemo() { + return _gameDescription->flags & ADGF_DEMO; +} + Common::Language FullpipeEngine::getLanguage() const { return _gameDescription->language; } diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp index 162dff39c9..10c1744dd9 100644 --- a/engines/fullpipe/fullpipe.cpp +++ b/engines/fullpipe/fullpipe.cpp @@ -271,6 +271,7 @@ Common::Error FullpipeEngine::loadGameState(int slot) { else return Common::kUnknownError; } + Common::Error FullpipeEngine::saveGameState(int slot, const Common::String &description) { if (_gameLoader->writeSavegame(_currentScene, getSavegameFile(slot))) return Common::kNoError; diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h index f7ad9f78c1..b00da629fe 100644 --- a/engines/fullpipe/fullpipe.h +++ b/engines/fullpipe/fullpipe.h @@ -113,6 +113,7 @@ public: // Detection related functions const ADGameDescription *_gameDescription; uint32 getFeatures() const; + bool isDemo(); Common::Language getLanguage() const; Common::RandomSource *_rnd; diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index c88705b98e..bb141d98c4 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -35,8 +35,6 @@ #include "fullpipe/scenes.h" #include "fullpipe/interaction.h" -#include "engines/advancedDetector.h" - namespace Fullpipe { Vars::Vars() { @@ -619,7 +617,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) { sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_INTRO1"); scene->preloadMovements(sceneVar); - if (!(g_fp->getFeatures() & ADGF_DEMO && g_fp->getLanguage() == Common::RU_RUS)) + if (!(g_fp->isDemo() && g_fp->getLanguage() == Common::RU_RUS)) sceneIntro_initScene(scene); else sceneIntroDemo_initScene(scene); @@ -628,7 +626,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) { scene->initObjectCursors("SC_INTRO1"); setSceneMusicParameters(sceneVar); - if (!(g_fp->getFeatures() & ADGF_DEMO && g_fp->getLanguage() == Common::RU_RUS)) { + if (!(g_fp->isDemo() && g_fp->getLanguage() == Common::RU_RUS)) { addMessageHandler(sceneHandlerIntro, 2); _updateCursorCallback = sceneIntro_updateCursor; } else { diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/fullpipe/scenes/scene08.cpp index 0c8b68b17e..24b23c1506 100644 --- a/engines/fullpipe/scenes/scene08.cpp +++ b/engines/fullpipe/scenes/scene08.cpp @@ -20,8 +20,6 @@ * */ -#include "engines/advancedDetector.h" - #include "fullpipe/fullpipe.h" #include "fullpipe/objects.h" @@ -412,7 +410,7 @@ void sceneHandler08_checkEndArcade() { if (y < 80) { sceneHandler08_finishArcade(); - if (g_fp->getFeatures() & ADGF_DEMO && g_fp->getLanguage() == Common::DE_DEU) { + if (g_fp->isDemo() && g_fp->getLanguage() == Common::DE_DEU) { ModalDemo *demo = new ModalDemo; demo->launch(); diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp index 8699560d28..169d06c331 100644 --- a/engines/fullpipe/scenes/scene09.cpp +++ b/engines/fullpipe/scenes/scene09.cpp @@ -33,8 +33,6 @@ #include "fullpipe/interaction.h" #include "fullpipe/behavior.h" -#include "engines/advancedDetector.h" - namespace Fullpipe { struct Hanger { @@ -465,7 +463,7 @@ int sceneHandler09(ExCommand *cmd) { break; case 367: - if (g_fp->getFeatures() & ADGF_DEMO && g_fp->getLanguage() == Common::RU_RUS) { + if (g_fp->isDemo() && g_fp->getLanguage() == Common::RU_RUS) { g_fp->_needRestart = true; return 0; } diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp index 05305a463a..b53291b985 100644 --- a/engines/fullpipe/stateloader.cpp +++ b/engines/fullpipe/stateloader.cpp @@ -27,8 +27,6 @@ #include "common/list.h" #include "common/memstream.h" -#include "engines/advancedDetector.h" - #include "graphics/thumbnail.h" #include "fullpipe/objects.h" @@ -335,7 +333,7 @@ bool FullpipeEngine::loadGam(const char *fname, int scene) { _gameLoader->loadScene(SC_INTRO1); _gameLoader->gotoScene(SC_INTRO1, TrubaUp); } else { - if (g_fp->getFeatures() & ADGF_DEMO && g_fp->getLanguage() == Common::RU_RUS) { + if (g_fp->isDemo() && g_fp->getLanguage() == Common::RU_RUS) { _gameLoader->loadScene(SC_9); _gameLoader->gotoScene(SC_9, TrubaDown); } else { |