From 200f405706daf97f9e0e15806ce04a021fe7649a Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 23 Aug 2008 20:16:54 +0000 Subject: (svn r14146) -Codechange: allow palette override in both ways and remove some unneeded '(x == 0) ? 0 : 1' constructs. --- src/openttd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/openttd.cpp') diff --git a/src/openttd.cpp b/src/openttd.cpp index afd5ceb6c..b28ef672e 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -189,7 +189,7 @@ static void ShowHelp() " -f = Fork into the background (dedicated only)\n" #endif #endif /* ENABLE_NETWORK */ - " -i = Force to use the DOS palette\n" + " -i = Force to use the DOS (0) or Windows (1) palette\n" " (use this if you see a lot of pink)\n" " -c config_file = Use 'config_file' instead of 'openttd.cfg'\n" " -x = Do not automatically save to config file on exit\n", @@ -406,7 +406,7 @@ int ttd_main(int argc, char *argv[]) * a letter means: it accepts that param (e.g.: -h) * a ':' behind it means: it need a param (e.g.: -m) * a '::' behind it means: it can optional have a param (e.g.: -d) */ - optformat = "m:s:v:b:hD::n::eit:d::r:g::G:c:xl:" + optformat = "m:s:v:b:hD::n::ei::t:d::r:g::G:c:xl:" #if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32) "f" #endif @@ -455,7 +455,7 @@ int ttd_main(int argc, char *argv[]) if (mgo.opt != NULL) SetDebugString(mgo.opt); } break; case 'e': _switch_mode = SM_EDITOR; break; - case 'i': _use_dos_palette = true; break; + case 'i': _use_palette = (mgo.opt == NULL || atoi(mgo.opt) == 0) ? PAL_DOS : PAL_WINDOWS; break; case 'g': if (mgo.opt != NULL) { ttd_strlcpy(_file_to_saveload.name, mgo.opt, sizeof(_file_to_saveload.name)); -- cgit v1.2.3-54-g00ecf