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

Turned enum PluginError into Common::Error, which in the future is to be used in more places. Help with this is highly welcome

Browse source 
svn-id: r34906
This commit is contained in:
Max Horn 2008-11-05 17:24:56 +00:00
parent fe2935ad4b
commit f32be87633
28 changed files with 97 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/scumm/detection.cpp
View file

@ -682,7 +682,7 @@ public:
virtual GameDescriptor findGame(const char *gameid) const;
virtual GameList detectGames(const Common::FSList &fslist) const;
virtual PluginError createInstance(OSystem *syst, Engine **engine) const;
virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
virtual SaveStateList listSaves(const char *target) const;
virtual void removeSaveState(const char *target, int slot) const;
@ -765,7 +765,7 @@ GameList ScummMetaEngine::detectGames(const Common::FSList &fslist) const {
*
* This is heavily based on our MD5 detection scheme.
*/
PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
assert(syst);
assert(engine);
const char *gameid = ConfMan.get("gameid").c_str();
@ -792,7 +792,7 @@ PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
Common::FSList fslist;
Common::FSNode dir(ConfMan.get("path"));
if (!dir.getChildren(fslist, Common::FSNode::kListFilesOnly)) {
return kInvalidPathError;
return Common::kInvalidPathError;
}
// Invoke the detector, but fixed to the specified gameid.
@ -801,7 +801,7 @@ PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
// Unable to locate game data
if (results.empty()) {
return kNoGameDataFoundError;
return Common::kNoGameDataFoundError;
}
// No unique match found. If a platform override is present, try to
@ -943,7 +943,7 @@ PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
error("Engine_SCUMM_create(): Unknown version of game engine");
}
return kNoError;
return Common::kNoError;
}
const char *ScummMetaEngine::getName() const {