aboutsummaryrefslogtreecommitdiff
path: root/base/main.cpp
diff options
context:
space:
mode:
authorMax Horn2011-04-18 18:19:53 +0200
committerMax Horn2011-04-18 18:22:04 +0200
commit3a574199b0b3e848d786d71a50a1107536507479 (patch)
tree3a9b0bd121b780d71ea5c5f310ead62efe5209bf /base/main.cpp
parent1037ed247042485df1ad312d9ddfbd17251ed907 (diff)
downloadscummvm-rg350-3a574199b0b3e848d786d71a50a1107536507479.tar.gz
scummvm-rg350-3a574199b0b3e848d786d71a50a1107536507479.tar.bz2
scummvm-rg350-3a574199b0b3e848d786d71a50a1107536507479.zip
COMMON: Cleanup names/handling of some error codes
Diffstat (limited to 'base/main.cpp')
-rw-r--r--base/main.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/base/main.cpp b/base/main.cpp
index 4dfed0f08c..13359031f6 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -111,13 +111,12 @@ static const EnginePlugin *detectPlugin() {
if (plugin == 0) {
printf("failed\n");
warning("%s is an invalid gameid. Use the --list-games option to list supported gameid", gameid.c_str());
- return 0;
} else {
printf("%s\n", plugin->getName());
- }
- // FIXME: Do we really need this one?
- printf(" Starting '%s'\n", game.description().c_str());
+ // FIXME: Do we really need this one?
+ printf(" Starting '%s'\n", game.description().c_str());
+ }
return plugin;
}
@@ -352,8 +351,10 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
// TODO: deal with settings that require plugins to be loaded
res = Base::processSettings(command, settings);
- if (res.getCode() != Common::kArgumentNotProcessed)
+ if (res.getCode() != Common::kArgumentNotProcessed) {
+ warning("%s", res.getDesc().c_str());
return res.getCode();
+ }
// Init the backend. Must take place after all config data (including
// the command line params) was read.