thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Changed the createEngine() factory function of our plugins to return an error code (the engine is now passed indirectly via a double pointer)

Browse source 
* Removed Engine_Empty (obsolete now that engines can return actual error codes)

svn-id: r22199
This commit is contained in:
Max Horn 2006-04-29 00:27:20 +00:00
parent b00262a2fe
commit bf73598811
16 changed files with 92 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

10
base/plugins.cpp
View file

@ -28,7 +28,7 @@
#include "common/util.h"
/** Type of factory functions which make new Engine objects. */
typedef Engine *(*EngineFactory)(OSystem *syst);
typedef PluginError (*EngineFactory)(OSystem *syst, Engine **engine);
typedef const char *(*NameFunc)();
typedef GameDescriptor (*GameIDQueryFunc)(const char *gameid);
@ -116,9 +116,9 @@ public:
const char *getName() const { return _plugin->_name; }
Engine *createInstance(OSystem *syst) const {
PluginError createInstance(OSystem *syst, Engine **engine) const {
assert(_plugin->_ef);
return (*_plugin->_ef)(syst);
return (*_plugin->_ef)(syst, engine);
}
GameList getSupportedGames() const { return _plugin->_games; }
@ -157,9 +157,9 @@ public:
const char *getName() const { return _name.c_str(); }
Engine *createInstance(OSystem *syst) const {
PluginError createInstance(OSystem *syst, Engine **engine) const {
assert(_ef);
return (*_ef)(syst);
return (*_ef)(syst, engine);
}
GameList getSupportedGames() const { return _games; }