diff options
author | glx <glx@openttd.org> | 2008-09-27 22:19:34 +0000 |
---|---|---|
committer | glx <glx@openttd.org> | 2008-09-27 22:19:34 +0000 |
commit | dee7b2148a3a3e1f64cafbd0853f913d44bef2f5 (patch) | |
tree | 8129d168a9841653eabbfa3f489600473eee1fa8 /src | |
parent | e8038cbf5856ad19ce0933ed08b4705c46cf49f4 (diff) | |
download | openttd-dee7b2148a3a3e1f64cafbd0853f913d44bef2f5.tar.xz |
(svn r14408) -Fix (r9205): generation seed set using -G was always overwritten by -g
Diffstat (limited to 'src')
-rw-r--r-- | src/openttd.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index ab6c44553..edb65df79 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -481,8 +481,10 @@ int ttd_main(int argc, char *argv[]) } _switch_mode = SM_NEWGAME; - /* Give a random map */ - generation_seed = InteractiveRandom(); + /* Give a random map if no seed has been given */ + if (generation_seed == GENERATE_NEW_SEED) { + generation_seed = InteractiveRandom(); + } break; case 'G': generation_seed = atoi(mgo.opt); break; case 'c': _config_file = strdup(mgo.opt); break; |