From 478da38d2b1c6174417e683616d3e3ea4559f467 Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Sun, 14 Nov 2010 16:16:28 +0000
Subject: [PATCH] (svn r21192) -Fix (r15505)[FS#4226]: Use non-interactive
 randomness for townnames on map generation, so they are controlled by the
 generation-seed as well.

---
 src/townname.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/townname.cpp b/src/townname.cpp
index f734f549b8..5377a7ae51 100644
--- a/src/townname.cpp
+++ b/src/townname.cpp
@@ -16,6 +16,7 @@
 #include "core/alloc_func.hpp"
 #include "strings_func.h"
 #include "core/random_func.hpp"
+#include "genworld.h"
 
 #include "table/townname.h"
 
@@ -118,7 +119,7 @@ bool GenerateTownName(uint32 *townnameparts)
 	TownNameParams par(_settings_game.game_creation.town_name);
 
 	for (int i = 1000; i != 0; i--) {
-		uint32 r = InteractiveRandom();
+		uint32 r = _generating_world ? Random() : InteractiveRandom();
 		if (!VerifyTownName(r, &par)) continue;
 
 		*townnameparts = r;