aboutsummaryrefslogtreecommitdiff
path: root/engines/simon
diff options
context:
space:
mode:
authorMax Horn2006-04-29 00:27:20 +0000
committerMax Horn2006-04-29 00:27:20 +0000
commitbf7359881115a5b041028b032ee28430bc5e36d3 (patch)
tree78c955620bb16d4b4e39f3b887eed35dd552c57b /engines/simon
parentb00262a2fe1b8bf1d51794a9da3e735e97dfb5ee (diff)
downloadscummvm-rg350-bf7359881115a5b041028b032ee28430bc5e36d3.tar.gz
scummvm-rg350-bf7359881115a5b041028b032ee28430bc5e36d3.tar.bz2
scummvm-rg350-bf7359881115a5b041028b032ee28430bc5e36d3.zip
* Changed the createEngine() factory function of our plugins to return an error code (the engine is now passed indirectly via a double pointer)
* Removed Engine_Empty (obsolete now that engines can return actual error codes) svn-id: r22199
Diffstat (limited to 'engines/simon')
-rw-r--r--engines/simon/game.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/simon/game.cpp b/engines/simon/game.cpp
index 34a135ef90..1685fd35b2 100644
--- a/engines/simon/game.cpp
+++ b/engines/simon/game.cpp
@@ -111,7 +111,7 @@ DetectedGameList Engine_SIMON_detectGames(const FSList &fslist) {
return Simon::GAME_detectGames(fslist);
}
-Engine *Engine_SIMON_create(OSystem *syst) {
+PluginError Engine_SIMON_create(OSystem *syst, Engine **engine) {
const char *gameid = ConfMan.get("gameid").c_str();
for (const ObsoleteGameID *o = obsoleteGameIDsTable; o->from; ++o) {
@@ -129,7 +129,9 @@ Engine *Engine_SIMON_create(OSystem *syst) {
}
}
- return new Simon::SimonEngine(syst);
+ assert(engine);
+ *engine = new Simon::SimonEngine(syst);
+ return kNoError;
}
REGISTER_PLUGIN(SIMON, "Simon the Sorcerer");