diff options
| author | Yotam Barnoy | 2010-11-03 22:01:01 +0000 |
|---|---|---|
| committer | Yotam Barnoy | 2010-11-03 22:01:01 +0000 |
| commit | 13b904d282ea607db94069b927d6cb1b19aa0d0b (patch) | |
| tree | cbc8efcc281f735beb9f45117e82a30872995ac7 /gui | |
| parent | 0ac1eb82c65e7f20f51f6337df5aa64e02a1af29 (diff) | |
| parent | 27182f266f48a6d55dd5d830ed19e2c4285ac1ba (diff) | |
| download | scummvm-rg350-13b904d282ea607db94069b927d6cb1b19aa0d0b.tar.gz scummvm-rg350-13b904d282ea607db94069b927d6cb1b19aa0d0b.tar.bz2 scummvm-rg350-13b904d282ea607db94069b927d6cb1b19aa0d0b.zip | |
Merge from gsoc2010-plugins
This merge was extremely difficult to carry out. It wasn't entirely SVN's fault -- there were several merges to the branch that were done by hand. Please check for any issues and regressions. Also note that the DS makefile was not copied over since the "one at a time" plugin mode currently has too much fragmentation ie. it doesn't work.
svn-id: r54051
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/launcher.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gui/launcher.cpp b/gui/launcher.cpp index 63d3ba6954..2592eecd97 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -922,7 +922,12 @@ void LauncherDialog::loadGame(int item) { gameId = _domains[item]; const EnginePlugin *plugin = 0; + +#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES) + EngineMan.findGameOnePlugAtATime(gameId, &plugin); +#else EngineMan.findGame(gameId, &plugin); +#endif String target = _domains[item]; target.toLowercase(); |