diff options
| author | Tony Puccinelli | 2010-08-13 05:58:11 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-08-13 05:58:11 +0000 |
| commit | 2cd99b449f9a42f8d9cc45ae4902e326f8925bd8 (patch) | |
| tree | 068f35430082a246f068c4414ac906df4eb4e964 /base | |
| parent | 62d8126df0ec90a9b1f3b660fce769631c57208e (diff) | |
| download | scummvm-rg350-2cd99b449f9a42f8d9cc45ae4902e326f8925bd8.tar.gz scummvm-rg350-2cd99b449f9a42f8d9cc45ae4902e326f8925bd8.tar.bz2 scummvm-rg350-2cd99b449f9a42f8d9cc45ae4902e326f8925bd8.zip | |
refactored NEW_PLUGIN_DESIGN_FIRST_REFINEMENT define into ONE_PLUGIN_AT_A_TIME
svn-id: r52058
Diffstat (limited to 'base')
| -rw-r--r-- | base/main.cpp | 4 | ||||
| -rw-r--r-- | base/plugins.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/base/main.cpp b/base/main.cpp index 028f25dff2..17acf58266 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -106,7 +106,7 @@ static const EnginePlugin *detectPlugin() { printf("User picked target '%s' (gameid '%s')...\n", ConfMan.getActiveDomainName().c_str(), gameid.c_str()); printf("%s", " Looking for a plugin supporting this gameid... "); -#if defined(NEW_PLUGIN_DESIGN_FIRST_REFINEMENT) && defined(DYNAMIC_MODULES) +#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES) GameDescriptor game = EngineMan.findGameOnePlugAtATime(gameid, &plugin); #else GameDescriptor game = EngineMan.findGame(gameid, &plugin); @@ -344,7 +344,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { settings.erase("debugflags"); } -#if defined(NEW_PLUGIN_DESIGN_FIRST_REFINEMENT) && defined(DYNAMIC_MODULES) //note: I'm going to refactor this name later :P +#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES) // Only load non-engine plugins and first engine plugin initially in this case. PluginManager::instance().loadFirstPlugin(); //This should be the only call to loadFirstPlugin external to the PluginManager class. #else diff --git a/base/plugins.cpp b/base/plugins.cpp index aac18c4173..dfb1d85141 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -464,7 +464,7 @@ GameList EngineManager::detectGames(const Common::FSList &fslist) const { GameList candidates; EnginePlugin::List plugins; EnginePlugin::List::const_iterator iter; -#if defined(NEW_PLUGIN_DESIGN_FIRST_REFINEMENT) && defined(DYNAMIC_MODULES) +#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES) do { #endif plugins = getPlugins(); @@ -473,7 +473,7 @@ GameList EngineManager::detectGames(const Common::FSList &fslist) const { for (iter = plugins.begin(); iter != plugins.end(); ++iter) { candidates.push_back((**iter)->detectGames(fslist)); } -#if defined(NEW_PLUGIN_DESIGN_FIRST_REFINEMENT) && defined(DYNAMIC_MODULES) +#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES) } while (PluginManager::instance().loadNextPlugin()); #endif return candidates; |