gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8791) -Revert: r8790 Committed too much in last commit

Browse Source
This commit is contained in:
miham 2007-02-17 22:01:07 +00:00
parent 6e5dd7942f
commit c810aef43b
3 changed files with 127 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/table/build_industry.h
View File

@ -1393,63 +1393,63 @@ static const IndustrySpec _industry_specs[] = {
static const byte _industry_create_table_0[] = {
2, 4,
3, 3,
3, 2,
5, 0,
3, 1,
2, 11,
3, 18,
6, 9,
3, 8,
3, 6,
4, 4,
5, 3,
5, 2,
8, 0,
5, 1,
4, 11,
5, 18,
9, 9,
5, 8,
5, 6,
0
};
static const byte _industry_create_table_1[] = {
2, 4,
3, 3,
3, 14,
5, 0,
3, 1,
3, 11,
3, 13,
6, 9,
2, 15,
3, 7,
3, 16,
4, 4,
5, 3,
5, 14,
8, 0,
5, 1,
5, 11,
5, 13,
9, 9,
4, 15,
5, 7,
6, 16,
0
};
static const byte _industry_create_table_2[] = {
2, 4,
3, 11,
3, 16,
2, 13,
2, 17,
2, 10,
2, 19,
2, 20,
2, 21,
4, 22,
2, 13,
2, 23,
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, 24,
0
};
static const byte _industry_create_table_3[] = {
3, 26,
3, 27,
2, 28,
3, 29,
2, 30,
3, 31,
3, 32,
2, 33,
3, 34,
3, 35,
2, 36,
5, 26,
5, 27,
4, 28,
5, 29,
4, 30,
5, 31,
5, 32,
4, 33,
5, 34,
5, 35,
4, 36,
0
};

139
src/table/namegen.h
View File

@ -2369,68 +2369,68 @@ static const char *name_norwegian_real[] = {
};
static const char *name_hungarian_1[] = {
"Alsó-",
"Felső-",
"Kis-",
"Nagy-",
"Kis-",
"Felső-",
"Alsó-",
"Új-"
};
static const char *name_hungarian_2[] = {
"Agg",
"Almás",
"Aranyos",
"Bakony",
"Balaton",
"Békés",
"Bihar",
"Bodrog",
"Buda",
"Császár",
"Cserép",
"Cserhát",
"Dráva",
"Duna",
"Egyházas",
"Erdő",
"Fehér",
"Fertő",
"Gagy",
"Győr",
"Hajdú",
"Hegy",
"Hejő",
"Herceg",
"Hernád",
"Heves",
"Homok",
"Jász",
"Kapos",
"Király",
"Kun",
"Magyar",
"Mező",
"Nemes",
"Nógrád",
"Nyír",
"Pest",
"Puszta",
"Püspök",
"Rába",
"Sajó",
"Sár",
"Somogy",
"Szamos",
"Szent",
"Székely",
"Szilvás",
"Tápió",
"Tisza",
"Zala",
"Balaton",
"Fertő",
"Bakony",
"Cserhát",
"Bihar",
"Hajdú",
"Jász",
"Kun",
"Magyar",
"Nógrád",
"Nyír",
"Somogy",
"Székely",
"Buda",
"Győr",
"Pest",
"Fehér",
"Cserép",
"Erdő",
"Hegy",
"Homok",
"Mező",
"Puszta",
"Sár",
"Császár",
"Herceg",
"Király",
"Nemes",
"Püspök",
"Szent",
"Almás",
"Szilvás",
"Agg",
"Aranyos",
"Békés",
"Egyházas",
"Gagy",
"Heves",
"Kapos",
"Tápió",
"Torna",
"Vas",
"Vámos",
"Vásáros",
"Zala"
"Vásáros"
};
static const char *name_hungarian_3[] = {
@ -2461,19 +2461,42 @@ static const char *name_hungarian_4[] = {
};
static const char *name_hungarian_real[] = {
"Ajka", "Almásfüzitő", "Aszód",
"Badacsony", "Baja", "Budapest",
"Debrecen", "Eger", "Esztergom",
"Fonyód", "Gödöllő", "Győr",
"Gyula", "Karcag", "Kecskemét",
"Keszthely", "Kisköre", "Kocsord",
"Komárom", "Kőszeg", "Makó",
"Mohács", "Miskolc", "Ózd",
"Paks", "Pápa", "Pécs",
"Polgár", "Sarkad", "Siófok",
"Százhalombatta", "Szeged", "Szentes",
"Székesfehérvár", "Szolnok", "Tihany",
"Tokaj", "Vác", "Záhony", "Zirc"
"Ajka",
"Aszód",
"Badacsony",
"Baja",
"Budapest",
"Debrecen",
"Eger",
"Fonyód",
"Gödöllő",
"Győr",
"Gyula",
"Karcag",
"Kecskemét",
"Keszthely",
"Kisköre",
"Kocsord",
"Komárom",
"Kőszeg",
"Makó",
"Mohács",
"Miskolc",
"Ózd",
"Paks",
"Pápa",
"Pécs",
"Polgár",
"Sarkad",
"Siófok",
"Szeged",
"Szentes",
"Szolnok",
"Tihany",
"Tokaj",
"Vác",
"Záhony",
"Zirc"
};
static const char *name_swiss_real[] = {

4
src/town_cmd.cpp
View File

@ -1088,12 +1088,12 @@ Town *CreateRandomTown(uint attempts, uint size_mode)
return NULL;
}
static const byte _num_initial_towns[3] = {4, 17, 29};
static const byte _num_initial_towns[3] = {11, 23, 46};
bool GenerateTowns(void)
{
uint num = 0;
uint n = ScaleByMapSize(_num_initial_towns[_opt.diff.number_towns] + (Random() & 3));
uint n = ScaleByMapSize(_num_initial_towns[_opt.diff.number_towns] + (Random() & 7));
SetGeneratingWorldProgress(GWP_TOWN, n);