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 /engines | |
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 'engines')
-rw-r--r-- | engines/metaengine.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/engines/metaengine.h b/engines/metaengine.h index 7519feaaa4..964eee071c 100644 --- a/engines/metaengine.h +++ b/engines/metaengine.h @@ -231,6 +231,7 @@ private: friend class Common::Singleton<SingletonBaseType>; public: + GameDescriptor findGameOnePlugAtATime(const Common::String &gameName, const EnginePlugin **plugin = NULL) const; GameDescriptor findGame(const Common::String &gameName, const EnginePlugin **plugin = NULL) const; GameList detectGames(const Common::FSList &fslist) const; const EnginePlugin::List &getPlugins() const; |