diff options
| author | Max Horn | 2011-05-23 19:36:45 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-23 19:39:25 +0200 |
| commit | 20cad6e8b6fe9ae843245697e872256c4ca1e545 (patch) | |
| tree | e6ddd7b3f8ff6be39ea9ceab523050e73e3ba354 /base/main.cpp | |
| parent | 6f6051a9e1da4d4debc1bf851b101c7a40d8b531 (diff) | |
| download | scummvm-rg350-20cad6e8b6fe9ae843245697e872256c4ca1e545.tar.gz scummvm-rg350-20cad6e8b6fe9ae843245697e872256c4ca1e545.tar.bz2 scummvm-rg350-20cad6e8b6fe9ae843245697e872256c4ca1e545.zip | |
COMMON: Modify Base::processSettings, get rid of Common::kArgumentNotProcessed
Instead of defining a hacked up Common::Error code, split the return
value of processSettings into two parts: An error code, and a value
which indicates whether the specified command was completely handled
by processSettings or not.
Diffstat (limited to 'base/main.cpp')
| -rw-r--r-- | base/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/base/main.cpp b/base/main.cpp index 4ed70a5587..906f4c9242 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -349,8 +349,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { Common::Error res; // TODO: deal with settings that require plugins to be loaded - res = Base::processSettings(command, settings); - if (res.getCode() != Common::kArgumentNotProcessed) { + if (Base::processSettings(command, settings, res)) { if (res.getCode() != Common::kNoError) warning("%s", res.getDesc().c_str()); return res.getCode(); |