summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiham <miham@openttd.org>2007-02-17 21:56:22 +0000
committermiham <miham@openttd.org>2007-02-17 21:56:22 +0000
commitb77e6235ea6a4054c0f4893ff59584a1cd66060a (patch)
treed6a1d6c07272ffafb6cf3013cf361a50a532c3ce
parentb980c80ba4749400d8264fdf9187d7bc0256e05d (diff)
downloadopenttd-b77e6235ea6a4054c0f4893ff59584a1cd66060a.tar.xz
(svn r8790) [Namegen] -Revert: r8789 (Tron kinda convinced me it is a bad thing, sorry for it)
-rw-r--r--src/table/build_industry.h88
-rw-r--r--src/table/namegen.h4
-rw-r--r--src/town_cmd.cpp4
3 files changed, 48 insertions, 48 deletions
diff --git a/src/table/build_industry.h b/src/table/build_industry.h
index c05cbe32d..8fbedd567 100644
--- a/src/table/build_industry.h
+++ b/src/table/build_industry.h
@@ -1393,63 +1393,63 @@ static const IndustrySpec _industry_specs[] = {
static const byte _industry_create_table_0[] = {
- 4, 4,
- 5, 3,
- 5, 2,
- 8, 0,
- 5, 1,
- 4, 11,
- 5, 18,
- 9, 9,
- 5, 8,
- 5, 6,
+ 2, 4,
+ 3, 3,
+ 3, 2,
+ 5, 0,
+ 3, 1,
+ 2, 11,
+ 3, 18,
+ 6, 9,
+ 3, 8,
+ 3, 6,
0
};
static const byte _industry_create_table_1[] = {
- 4, 4,
- 5, 3,
- 5, 14,
- 8, 0,
- 5, 1,
- 5, 11,
- 5, 13,
- 9, 9,
- 4, 15,
- 5, 7,
- 6, 16,
+ 2, 4,
+ 3, 3,
+ 3, 14,
+ 5, 0,
+ 3, 1,
+ 3, 11,
+ 3, 13,
+ 6, 9,
+ 2, 15,
+ 3, 7,
+ 3, 16,
0
};
static const byte _industry_create_table_2[] = {
- 4, 4,
- 5, 11,
- 5, 16,
- 4, 13,
- 4, 17,
- 4, 10,
- 4, 19,
- 4, 20,
- 4, 21,
- 8, 22,
- 4, 13,
- 4, 23,
+ 2, 4,
+ 3, 11,
+ 3, 16,
+ 2, 13,
+ 2, 17,
+ 2, 10,
+ 2, 19,
+ 2, 20,
+ 2, 21,
+ 4, 22,
+ 2, 13,
+ 2, 23,
2, 24,
0
};
static const byte _industry_create_table_3[] = {
- 5, 26,
- 5, 27,
- 4, 28,
- 5, 29,
- 4, 30,
- 5, 31,
- 5, 32,
- 4, 33,
- 5, 34,
- 5, 35,
- 4, 36,
+ 3, 26,
+ 3, 27,
+ 2, 28,
+ 3, 29,
+ 2, 30,
+ 3, 31,
+ 3, 32,
+ 2, 33,
+ 3, 34,
+ 3, 35,
+ 2, 36,
0
};
diff --git a/src/table/namegen.h b/src/table/namegen.h
index 1b5013ec0..3ae808574 100644
--- a/src/table/namegen.h
+++ b/src/table/namegen.h
@@ -2429,8 +2429,8 @@ static const char *name_hungarian_2[] = {
"Torna",
"Vas",
"Vámos",
- "Vásáros"
- "Zala",
+ "Vásáros",
+ "Zala"
};
static const char *name_hungarian_3[] = {
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index b79b5e211..e8dabf999 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -1088,12 +1088,12 @@ Town *CreateRandomTown(uint attempts, uint size_mode)
return NULL;
}
-static const byte _num_initial_towns[3] = {11, 23, 46};
+static const byte _num_initial_towns[3] = {4, 17, 29};
bool GenerateTowns(void)
{
uint num = 0;
- uint n = ScaleByMapSize(_num_initial_towns[_opt.diff.number_towns] + (Random() & 7));
+ uint n = ScaleByMapSize(_num_initial_towns[_opt.diff.number_towns] + (Random() & 3));
SetGeneratingWorldProgress(GWP_TOWN, n);