From dee7b2148a3a3e1f64cafbd0853f913d44bef2f5 Mon Sep 17 00:00:00 2001
From: glx <glx@openttd.org>
Date: Sat, 27 Sep 2008 22:19:34 +0000
Subject: (svn r14408) -Fix (r9205): generation seed set using -G was always
 overwritten by -g

---
 src/openttd.cpp | 6 ++++--
 1 file 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;
-- 
cgit v1.2.3-70-g09d2