Mercurial > hg > openttd

changeset 10195:9f2f34f48a26 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r14408) -Fix (r9205): generation seed set using -G was always overwritten by -g
author glx <glx@openttd.org>
date Sat, 27 Sep 2008 22:19:34 +0000
parents bf9ac6242b4b
children d44af18ae6c7
files src/openttd.cpp
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -481,8 +481,10 @@
 			}
 
 			_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;