Mercurial > hg > openttd
changeset 18983:340d65f484a4 draft
(svn r23839) -Feature: Allow command line options -e and -g to be combined to load saves/scenarios directly into SE.
author | frosch <frosch@openttd.org> |
---|---|
date | Sun, 22 Jan 2012 18:37:01 +0000 |
parents | b9d13c344e3c |
children | 12975b364769 |
files | src/openttd.cpp |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -598,11 +598,11 @@ if (mgo.opt != NULL) SetDebugString(mgo.opt); break; } - case 'e': _switch_mode = SM_EDITOR; break; + case 'e': _switch_mode = (_switch_mode == SM_LOAD_GAME || _switch_mode == SM_LOAD_SCENARIO ? SM_LOAD_SCENARIO : SM_EDITOR); break; case 'g': if (mgo.opt != NULL) { strecpy(_file_to_saveload.name, mgo.opt, lastof(_file_to_saveload.name)); - _switch_mode = SM_LOAD_GAME; + _switch_mode = (_switch_mode == SM_EDITOR || _switch_mode == SM_LOAD_SCENARIO ? SM_LOAD_SCENARIO : SM_LOAD_GAME); _file_to_saveload.mode = SL_LOAD; /* if the file doesn't exist or it is not a valid savegame, let the saveload code show an error */