diff options
| -rw-r--r-- | engines/tsage/detection_tables.h | 3 | ||||
| -rw-r--r-- | engines/tsage/globals.cpp | 5 | ||||
| -rw-r--r-- | engines/tsage/sherlock/sherlock_logo.cpp | 3 | ||||
| -rw-r--r-- | engines/tsage/sherlock/sherlock_logo.h | 2 | ||||
| -rw-r--r-- | engines/tsage/tsage.cpp | 2 |
5 files changed, 13 insertions, 2 deletions
diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h index 1dfc3e6fd2..109ac353e6 100644 --- a/engines/tsage/detection_tables.h +++ b/engines/tsage/detection_tables.h @@ -185,7 +185,7 @@ static const tSageGameDescription gameDescriptions[] = { GType_Ringworld2, GF_CD | GF_ALT_REGIONS | GF_DEMO }, - +#ifdef TSAGE_SHERLOCK_ENABLED // The Lost Files of Sherlock Holmes - The Case of the Serrated Scalpel (Logo) { { @@ -200,6 +200,7 @@ static const tSageGameDescription gameDescriptions[] = { GType_Sherlock1, GF_FLOPPY }, +#endif { AD_TABLE_END_MARKER, 0, 0 } }; diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp index 1be3e2b6da..b880f35007 100644 --- a/engines/tsage/globals.cpp +++ b/engines/tsage/globals.cpp @@ -157,12 +157,15 @@ Globals::Globals() : _dialogCenter(160, 140), _gfxManagerInstance(_screenSurface _game = new Ringworld2::Ringworld2Game(); _sceneHandler = new Ringworld2::SceneHandlerExt(); break; - +#ifdef TSAGE_SHERLOCK_ENABLED case GType_Sherlock1: _inventory = nullptr; _sceneHandler = new Sherlock::SherlockSceneHandler(); _game = new Sherlock::SherlockLogo(); break; +#endif + default: + break; } } diff --git a/engines/tsage/sherlock/sherlock_logo.cpp b/engines/tsage/sherlock/sherlock_logo.cpp index 2922a9938b..e27ce76576 100644 --- a/engines/tsage/sherlock/sherlock_logo.cpp +++ b/engines/tsage/sherlock/sherlock_logo.cpp @@ -20,6 +20,7 @@ * */ +#ifdef TSAGE_SHERLOCK_ENABLED #include "tsage/sherlock/sherlock_logo.h" #include "tsage/scenes.h" #include "tsage/tsage.h" @@ -354,3 +355,5 @@ void SherlockLogoScene::finish() { } // End of namespace Sherlock } // End of namespace TsAGE + +#endif diff --git a/engines/tsage/sherlock/sherlock_logo.h b/engines/tsage/sherlock/sherlock_logo.h index 95fc0e272f..01b5b7f75f 100644 --- a/engines/tsage/sherlock/sherlock_logo.h +++ b/engines/tsage/sherlock/sherlock_logo.h @@ -20,6 +20,7 @@ * */ +#ifdef TSAGE_SHERLOCK_ENABLED #ifndef TSAGE_SHERLOCK_LOGO_H #define TSAGE_SHERLOCK_LOGO_H @@ -76,3 +77,4 @@ public: } // End of namespace TsAGE #endif +#endif diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp index 4412d0670f..b94b82f423 100644 --- a/engines/tsage/tsage.cpp +++ b/engines/tsage/tsage.cpp @@ -112,10 +112,12 @@ void TSageEngine::initialize() { // Reset all global variables R2_GLOBALS.reset(); } else if (g_vm->getGameID() == GType_Sherlock1) { +#ifdef TSAGE_SHERLOCK_ENABLED g_resourceManager->addLib("SF3.RLB"); g_globals = new Globals(); return; +#endif } g_globals->gfxManager().setDefaults(); |