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

sync with scummvm

Browse source
This commit is contained in:
Pawel Kolodziejski 2011-05-08 15:38:26 +02:00
parent ce9e1899e4
commit 0f5de71f70
110 changed files with 1342 additions and 544 deletions
Download patch file Download diff file Expand all files Collapse all files

6
base/main.cpp
View file

@ -31,6 +31,9 @@
* of almost all the classes, methods and variables, and how they interact.
*/
// FIXME: Avoid using printf
#define FORBIDDEN_SYMBOL_EXCEPTION_printf
#include "engines/engine.h"
#include "engines/metaengine.h"
#include "base/commandLine.h"
@ -340,7 +343,8 @@ extern "C" int residual_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) {
warning("%s", res.getDesc().c_str());
if (res.getCode() != Common::kNoError)
warning("%s", res.getDesc().c_str());
return res.getCode();
}