mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15223) -Codechange: move GetOldTownName to oldloader_sl.cpp as it is specific to loading of TTO/TTD savegames

release/0.7
smatz 2009-01-23 13:36:12 +00:00
parent decd0c51e4
commit 042d7800d0
4 changed files with 140 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/namegen.cpp
View File

@ -758,35 +758,3 @@ TownNameGenerator * const _town_name_generators[] =
MakeItalianTownName, MakeItalianTownName,
MakeCatalanTownName, MakeCatalanTownName,
}; };
/* DO WE NEED THIS ANY MORE? */
#define FIXNUM(x, y, z) (((((x) << 16) / (y)) + 1) << z)
uint32 GetOldTownName(uint32 townnameparts, byte old_town_name_type)
{
switch (old_town_name_type) {
case 0: case 3: // English, American
/* Already OK */
return townnameparts;
case 1: // French
/* For some reason 86 needs to be subtracted from townnameparts
* 0000 0000 0000 0000 0000 0000 1111 1111 */
return FIXNUM(townnameparts - 86, lengthof(name_french_real), 0);
case 2: // German
DEBUG(misc, 0, "German Townnames are buggy (%d)", townnameparts);
return townnameparts;
case 4: // Latin-American
/* 0000 0000 0000 0000 0000 0000 1111 1111 */
return FIXNUM(townnameparts, lengthof(name_spanish_real), 0);
case 5: // Silly
/* NUM_SILLY_1 - lower 16 bits
* NUM_SILLY_2 - upper 16 bits without leading 1 (first 8 bytes)
* 1000 0000 2222 2222 0000 0000 1111 1111 */
return FIXNUM(townnameparts, lengthof(name_silly_1), 0) | FIXNUM(GB(townnameparts, 16, 8), lengthof(name_silly_2), 16);
}
return 0;
}

2
src/saveload/oldloader.h
View File

@ -37,7 +37,7 @@ enum OldChunkType {
/* 4 bits allocated (16 max) */ /* 4 bits allocated (16 max) */
OC_TTD = 1 << 4, ///< chunk is valid ONLY for TTD savegames OC_TTD = 1 << 4, ///< chunk is valid ONLY for TTD savegames
OC_TTO = 1 << 5, ///< -//- TTO (default in neither of these) OC_TTO = 1 << 5, ///< -//- TTO (default is neither of these)
/* 4 bits allocated */ /* 4 bits allocated */
OC_VAR_I8 = 1 << 8, OC_VAR_I8 = 1 << 8,

46
src/saveload/oldloader_sl.cpp
View File

@ -29,6 +29,7 @@
#include "table/strings.h" #include "table/strings.h"
#include "../table/engines.h" #include "../table/engines.h"
#include "../table/namegen.h"
static bool _read_ttdpatch_flags; static bool _read_ttdpatch_flags;
@ -98,7 +99,38 @@ static void FixTTDMapArray()
FixOldMapArray(); FixOldMapArray();
} }
extern uint32 GetOldTownName(uint32 townnameparts, byte old_town_name_type); #define FIXNUM(x, y, z) (((((x) << 16) / (y)) + 1) << z)
static uint32 RemapOldTownName(uint32 townnameparts, byte old_town_name_type)
{
switch (old_town_name_type) {
case 0: case 3: // English, American
/* Already OK */
return townnameparts;
case 1: // French
/* For some reason 86 needs to be subtracted from townnameparts
* 0000 0000 0000 0000 0000 0000 1111 1111 */
return FIXNUM(townnameparts - 86, lengthof(name_french_real), 0);
case 2: // German
DEBUG(misc, 0, "German Townnames are buggy (%d)", townnameparts);
return townnameparts;
case 4: // Latin-American
/* 0000 0000 0000 0000 0000 0000 1111 1111 */
return FIXNUM(townnameparts, lengthof(name_spanish_real), 0);
case 5: // Silly
/* NUM_SILLY_1 - lower 16 bits
* NUM_SILLY_2 - upper 16 bits without leading 1 (first 8 bytes)
* 1000 0000 2222 2222 0000 0000 1111 1111 */
return FIXNUM(townnameparts, lengthof(name_silly_1), 0) | FIXNUM(GB(townnameparts, 16, 8), lengthof(name_silly_2), 16);
}
return 0;
}
#undef FIXNUM
void FixOldTowns() void FixOldTowns()
{ {
@ -108,7 +140,7 @@ void FixOldTowns()
FOR_ALL_TOWNS(town) { FOR_ALL_TOWNS(town) {
if (IsInsideMM(town->townnametype, 0x20C1, 0x20C3)) { if (IsInsideMM(town->townnametype, 0x20C1, 0x20C3)) {
town->townnametype = SPECSTR_TOWNNAME_ENGLISH + _settings_game.game_creation.town_name; town->townnametype = SPECSTR_TOWNNAME_ENGLISH + _settings_game.game_creation.town_name;
town->townnameparts = GetOldTownName(town->townnameparts, _settings_game.game_creation.town_name); town->townnameparts = RemapOldTownName(town->townnameparts, _settings_game.game_creation.town_name);
} }
} }
} }
@ -678,7 +710,7 @@ static bool LoadOldCargoPaymentRate(LoadgameState *ls, int num)
return true; return true;
} }
VehicleID _current_station_id; static StationID _current_station_id;
static uint16 _waiting_acceptance; static uint16 _waiting_acceptance;
static uint8 _cargo_source; static uint8 _cargo_source;
static uint8 _cargo_days; static uint8 _cargo_days;
@ -861,7 +893,7 @@ static bool LoadOldIndustry(LoadgameState *ls, int num)
return true; return true;
} }
CompanyID _current_company_id; static CompanyID _current_company_id;
static int32 _old_yearly; static int32 _old_yearly;
static const OldChunks _company_yearly_chunk[] = { static const OldChunks _company_yearly_chunk[] = {
@ -1030,7 +1062,7 @@ static bool LoadOldCompany(LoadgameState *ls, int num)
static uint32 _old_order_ptr; static uint32 _old_order_ptr;
static uint16 _old_next_ptr; static uint16 _old_next_ptr;
VehicleID _current_vehicle_id; static VehicleID _current_vehicle_id;
static const OldChunks vehicle_train_chunk[] = { static const OldChunks vehicle_train_chunk[] = {
OCL_SVAR( OC_UINT8, VehicleRail, track ), OCL_SVAR( OC_UINT8, VehicleRail, track ),
@ -1259,8 +1291,8 @@ bool LoadOldVehicle(LoadgameState *ls, int num)
switch (v->type) { switch (v->type) {
case VEH_TRAIN: { case VEH_TRAIN: {
static const byte spriteset_rail[] = { static const byte spriteset_rail[] = {
0, 2, 4, 4, 8, 10, 12, 14, 16, 18, 20, 22, 40, 42, 44, 46, 0, 2, 4, 4, 8, 10, 12, 14, 16, 18, 20, 22, 40, 42, 44, 46,
48, 52, 54, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 120, 122, 48, 52, 54, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 120, 122,
124, 126, 128, 130, 132, 134, 136, 138, 140 124, 126, 128, 130, 132, 134, 136, 138, 140
}; };
if (v->spritenum / 2 >= lengthof(spriteset_rail)) return false; if (v->spritenum / 2 >= lengthof(spriteset_rail)) return false;

200
src/table/namegen.h
View File

@ -4,14 +4,14 @@
#include "../core/enum_type.hpp" #include "../core/enum_type.hpp"
static const char *name_original_english_1[] = { static const char *const name_original_english_1[] = {
"Great ", "Great ",
"Little ", "Little ",
"New ", "New ",
"Fort ", "Fort ",
}; };
static const char *name_original_english_2[] = { static const char *const name_original_english_2[] = {
"Wr", "Wr",
"B", "B",
"C", "C",
@ -40,7 +40,7 @@ static const char *name_original_english_2[] = {
"W" "W"
}; };
static const char *name_original_english_3[] = { static const char *const name_original_english_3[] = {
"ar", "ar",
"a", "a",
"e", "e",
@ -51,7 +51,7 @@ static const char *name_original_english_3[] = {
"en" "en"
}; };
static const char *name_original_english_4[] = { static const char *const name_original_english_4[] = {
"n", "n",
"ning", "ning",
"ding", "ding",
@ -61,7 +61,7 @@ static const char *name_original_english_4[] = {
"fing" "fing"
}; };
static const char *name_original_english_5[] = { static const char *const name_original_english_5[] = {
"ville", "ville",
"ham", "ham",
"field", "field",
@ -87,7 +87,7 @@ static const char *name_original_english_5[] = {
"burg", "burg",
}; };
static const char *name_original_english_6[] = { static const char *const name_original_english_6[] = {
"-on-sea", "-on-sea",
" Bay", " Bay",
" Market", " Market",
@ -99,7 +99,7 @@ static const char *name_original_english_6[] = {
" Springs" " Springs"
}; };
static const char *name_additional_english_prefix[] = { static const char *const name_additional_english_prefix[] = {
"Great ", "Great ",
"Little ", "Little ",
"New ", "New ",
@ -108,7 +108,7 @@ static const char *name_additional_english_prefix[] = {
"Old " "Old "
}; };
static const char *name_additional_english_1a[] = { static const char *const name_additional_english_1a[] = {
"Pen", "Pen",
"Lough", "Lough",
"Stam", "Stam",
@ -154,7 +154,7 @@ static const char *name_additional_english_1a[] = {
"Stan" "Stan"
}; };
static const char *name_additional_english_1b1[] = { static const char *const name_additional_english_1b1[] = {
"Wr", "Wr",
"B", "B",
"C", "C",
@ -183,7 +183,7 @@ static const char *name_additional_english_1b1[] = {
"W" "W"
}; };
static const char *name_additional_english_1b2[] = { static const char *const name_additional_english_1b2[] = {
"ar", "ar",
"a", "a",
"e", "e",
@ -198,7 +198,7 @@ static const char *name_additional_english_1b2[] = {
"en" "en"
}; };
static const char *name_additional_english_1b3a[] = { static const char *const name_additional_english_1b3a[] = {
"n", "n",
"d", "d",
"", "",
@ -207,13 +207,13 @@ static const char *name_additional_english_1b3a[] = {
"" ""
}; };
static const char *name_additional_english_1b3b[] = { static const char *const name_additional_english_1b3b[] = {
"ning", "ning",
"ding", "ding",
"fing" "fing"
}; };
static const char *name_additional_english_2[] = { static const char *const name_additional_english_2[] = {
"ville", "ville",
"ham", "ham",
"field", "field",
@ -271,7 +271,7 @@ static const char *name_additional_english_2[] = {
"thwaite" "thwaite"
}; };
static const char *name_additional_english_3[] = { static const char *const name_additional_english_3[] = {
"-on-sea", "-on-sea",
" Bay", " Bay",
" Market", " Market",
@ -292,7 +292,7 @@ static const char *name_additional_english_3[] = {
" Springs" " Springs"
}; };
static const char *name_austrian_a1[] = { static const char *const name_austrian_a1[] = {
"Bad ", "Bad ",
"Deutsch ", "Deutsch ",
"Gross ", "Gross ",
@ -301,7 +301,7 @@ static const char *name_austrian_a1[] = {
"Maria " "Maria "
}; };
static const char *name_austrian_a2[] = { static const char *const name_austrian_a2[] = {
"Aus", "Aus",
"Alten", "Alten",
"Braun", "Braun",
@ -346,7 +346,7 @@ static const char *name_austrian_a2[] = {
"Weissen" "Weissen"
}; };
static const char *name_austrian_a3[] = { static const char *const name_austrian_a3[] = {
"see", "see",
"bach", "bach",
"dorf", "dorf",
@ -365,7 +365,7 @@ static const char *name_austrian_a3[] = {
"haag" "haag"
}; };
static const char *name_austrian_a4[] = { static const char *const name_austrian_a4[] = {
"Bruck", "Bruck",
"Brunn", "Brunn",
"Gams", "Gams",
@ -380,12 +380,12 @@ static const char *name_austrian_a4[] = {
"Wald" "Wald"
}; };
static const char *name_austrian_a5[] = { static const char *const name_austrian_a5[] = {
"St. ", "St. ",
"Sankt " "Sankt "
}; };
static const char *name_austrian_a6[] = { static const char *const name_austrian_a6[] = {
"Aegyd", "Aegyd",
"Andrä", "Andrä",
"Georgen", "Georgen",
@ -408,12 +408,12 @@ static const char *name_austrian_a6[] = {
"Wolfgang" "Wolfgang"
}; };
static const char *name_austrian_f1[] = { static const char *const name_austrian_f1[] = {
" an der ", " an der ",
" ob der " " ob der "
}; };
static const char *name_austrian_f2[] = { static const char *const name_austrian_f2[] = {
"Donau", "Donau",
"Steyr", "Steyr",
"Lafnitz", "Lafnitz",
@ -429,11 +429,11 @@ static const char *name_austrian_f2[] = {
"Ill" "Ill"
}; };
static const char *name_austrian_b1[] = { static const char *const name_austrian_b1[] = {
" am " " am "
}; };
static const char *name_austrian_b2[] = { static const char *const name_austrian_b2[] = {
"Brenner", "Brenner",
"Dachstein", "Dachstein",
"Gebirge", "Gebirge",
@ -446,7 +446,7 @@ static const char *name_austrian_b2[] = {
"Ziller" "Ziller"
}; };
static const char *name_german_real[] = { static const char *const name_german_real[] = {
"Berlin", "Berlin",
"Bonn", "Bonn",
"Bremen", "Bremen",
@ -470,13 +470,13 @@ static const char *name_german_real[] = {
"Wiesbaden" "Wiesbaden"
}; };
static const char *name_german_pre[] = { static const char *const name_german_pre[] = {
"Bad ", "Bad ",
"Klein ", "Klein ",
"Neu " "Neu "
}; };
static const char *name_german_1[] = { static const char *const name_german_1[] = {
"Alb", "Alb",
"Als", "Als",
"Ander", "Ander",
@ -572,7 +572,7 @@ static const char *name_german_1[] = {
"Würz" "Würz"
}; };
static const char *name_german_2[] = { static const char *const name_german_2[] = {
"bach", "bach",
"berg", "berg",
"brück", "brück",
@ -591,15 +591,15 @@ static const char *name_german_2[] = {
"wald" "wald"
}; };
static const char *name_german_3_an_der[] = { static const char *const name_german_3_an_der[] = {
" an der " " an der "
}; };
static const char *name_german_3_am[] = { static const char *const name_german_3_am[] = {
" am " " am "
}; };
static const char *name_german_4_an_der[] = { static const char *const name_german_4_an_der[] = {
"Oder", "Oder",
"Spree", "Spree",
"Donau", "Donau",
@ -607,11 +607,11 @@ static const char *name_german_4_an_der[] = {
"Elbe" "Elbe"
}; };
static const char *name_german_4_am[] = { static const char *const name_german_4_am[] = {
"Main" "Main"
}; };
static const char *name_spanish_real[] = { static const char *const name_spanish_real[] = {
"Caracas", "Caracas",
"Maracay", "Maracay",
"Maracaibo", "Maracaibo",
@ -700,7 +700,7 @@ static const char *name_spanish_real[] = {
"Santa Rosa" "Santa Rosa"
}; };
static const char *name_french_real[] = { static const char *const name_french_real[] = {
"Agincourt", "Agincourt",
"Lille", "Lille",
"Dinan", "Dinan",
@ -773,7 +773,7 @@ static const char *name_french_real[] = {
"Alençon" "Alençon"
}; };
static const char *name_silly_1[] = { static const char *const name_silly_1[] = {
"Binky", "Binky",
"Blubber", "Blubber",
"Bumble", "Bumble",
@ -864,7 +864,7 @@ static const char *name_silly_1[] = {
"Griddle" "Griddle"
}; };
static const char *name_silly_2[] = { static const char *const name_silly_2[] = {
"ton", "ton",
"bury", "bury",
"bottom", "bottom",
@ -882,14 +882,14 @@ static const char *name_silly_2[] = {
"bridge" "bridge"
}; };
static const char *name_swedish_1[] = { static const char *const name_swedish_1[] = {
"Gamla ", "Gamla ",
"Lilla ", "Lilla ",
"Nya ", "Nya ",
"Stora " "Stora "
}; };
static const char *name_swedish_2[] = { static const char *const name_swedish_2[] = {
"Boll", "Boll",
"Bor", "Bor",
"Ed", "Ed",
@ -930,7 +930,7 @@ static const char *name_swedish_2[] = {
"Öster" "Öster"
}; };
static const char *name_swedish_2a[] = { static const char *const name_swedish_2a[] = {
"B", "B",
"Br", "Br",
"D", "D",
@ -975,7 +975,7 @@ static const char *name_swedish_2a[] = {
"Vr" "Vr"
}; };
static const char *name_swedish_2b[] = { static const char *const name_swedish_2b[] = {
"a", "a",
"e", "e",
"i", "i",
@ -987,7 +987,7 @@ static const char *name_swedish_2b[] = {
"ö" "ö"
}; };
static const char *name_swedish_2c[] = { static const char *const name_swedish_2c[] = {
"ck", "ck",
"d", "d",
"dd", "dd",
@ -1016,7 +1016,7 @@ static const char *name_swedish_2c[] = {
"v" "v"
}; };
static const char *name_swedish_3[] = { static const char *const name_swedish_3[] = {
"arp", "arp",
"berg", "berg",
"boda", "boda",
@ -1051,7 +1051,7 @@ static const char *name_swedish_3[] = {
"ås" "ås"
}; };
static const char *name_dutch_1[] = { static const char *const name_dutch_1[] = {
"Nieuw ", "Nieuw ",
"Oud ", "Oud ",
"Groot ", "Groot ",
@ -1062,7 +1062,7 @@ static const char *name_dutch_1[] = {
"Klein " "Klein "
}; };
static const char *name_dutch_2[] = { static const char *const name_dutch_2[] = {
"Hoog", "Hoog",
"Laag", "Laag",
"Zuider", "Zuider",
@ -1118,7 +1118,7 @@ static const char *name_dutch_2[] = {
"Hil" "Hil"
}; };
static const char *name_dutch_3[] = { static const char *const name_dutch_3[] = {
"Drog", "Drog",
"Nat", "Nat",
"Valk", "Valk",
@ -1141,7 +1141,7 @@ static const char *name_dutch_3[] = {
"Koning" "Koning"
}; };
static const char *name_dutch_4[] = { static const char *const name_dutch_4[] = {
"e", "e",
"er", "er",
"el", "el",
@ -1150,7 +1150,7 @@ static const char *name_dutch_4[] = {
"s" "s"
}; };
static const char *name_dutch_5[] = { static const char *const name_dutch_5[] = {
"stad", "stad",
"vorst", "vorst",
"dorp", "dorp",
@ -1209,7 +1209,7 @@ static const char *name_dutch_5[] = {
"end" "end"
}; };
static const char *name_finnish_real[] = { static const char *const name_finnish_real[] = {
"Aijala", "Aijala",
"Kisko", "Kisko",
"Espoo", "Espoo",
@ -1243,7 +1243,7 @@ static const char *name_finnish_real[] = {
"Lieksa" "Lieksa"
}; };
static const char *name_finnish_1[] = { static const char *const name_finnish_1[] = {
"Hiekka", "Hiekka",
"Haapa", "Haapa",
"Mylly", "Mylly",
@ -1273,7 +1273,7 @@ static const char *name_finnish_1[] = {
"Niini" "Niini"
}; };
static const char *name_finnish_2[] = { static const char *const name_finnish_2[] = {
"Lappeen", "Lappeen",
"Lohjan", "Lohjan",
"Savon", "Savon",
@ -1287,7 +1287,7 @@ static const char *name_finnish_2[] = {
"Kangas" "Kangas"
}; };
static const char *name_finnish_3[] = { static const char *const name_finnish_3[] = {
"harju", "harju",
"linna", "linna",
"järvi", "järvi",
@ -1309,7 +1309,7 @@ static const char *name_finnish_3[] = {
"salo" "salo"
}; };
static const char *name_polish_1_m[] = { static const char *const name_polish_1_m[] = {
"Wielki ", "Wielki ",
"Mały ", "Mały ",
"Zły ", "Zły ",
@ -1323,7 +1323,7 @@ static const char *name_polish_1_m[] = {
"Dębowy " "Dębowy "
}; };
static const char *name_polish_1_f[] = { static const char *const name_polish_1_f[] = {
"Wielka ", "Wielka ",
"Mała ", "Mała ",
"Zła ", "Zła ",
@ -1337,7 +1337,7 @@ static const char *name_polish_1_f[] = {
"Dębowa " "Dębowa "
}; };
static const char *name_polish_1_n[] = { static const char *const name_polish_1_n[] = {
"Wielkie ", "Wielkie ",
"Małe ", "Małe ",
"Złe ", "Złe ",
@ -1351,7 +1351,7 @@ static const char *name_polish_1_n[] = {
"Dębowe " "Dębowe "
}; };
static const char *name_polish_2_o[] = { static const char *const name_polish_2_o[] = {
"Frombork", "Frombork",
"Gniezno", "Gniezno",
"Olsztyn", "Olsztyn",
@ -1388,7 +1388,7 @@ static const char *name_polish_2_o[] = {
"Wolsztyn" "Wolsztyn"
}; };
static const char *name_polish_2_m[] = { static const char *const name_polish_2_m[] = {
"Jarocin", "Jarocin",
"Gogolin", "Gogolin",
"Tomaszów", "Tomaszów",
@ -1439,7 +1439,7 @@ static const char *name_polish_2_m[] = {
"Garwolin" "Garwolin"
}; };
static const char *name_polish_2_f[] = { static const char *const name_polish_2_f[] = {
"Szprotawa", "Szprotawa",
"Pogorzelica", "Pogorzelica",
"Motława", "Motława",
@ -1470,7 +1470,7 @@ static const char *name_polish_2_f[] = {
"Pilawa" "Pilawa"
}; };
static const char *name_polish_2_n[] = { static const char *const name_polish_2_n[] = {
"Lipsko", "Lipsko",
"Pilzno", "Pilzno",
"Przodkowo", "Przodkowo",
@ -1503,7 +1503,7 @@ static const char *name_polish_2_n[] = {
"Opoczno" "Opoczno"
}; };
static const char *name_polish_3_m[] = { static const char *const name_polish_3_m[] = {
" Wybudowanie", " Wybudowanie",
" Świętokrzyski", " Świętokrzyski",
" Górski", " Górski",
@ -1535,7 +1535,7 @@ static const char *name_polish_3_m[] = {
" Lesny" " Lesny"
}; };
static const char *name_polish_3_f[] = { static const char *const name_polish_3_f[] = {
" Wybudowanie", " Wybudowanie",
" Świętokrzyska", " Świętokrzyska",
" Górska", " Górska",
@ -1567,7 +1567,7 @@ static const char *name_polish_3_f[] = {
" Leśna" " Leśna"
}; };
static const char *name_polish_3_n[] = { static const char *const name_polish_3_n[] = {
" Wybudowanie", " Wybudowanie",
" Świetokrzyskie", " Świetokrzyskie",
" Górskie", " Górskie",
@ -1599,7 +1599,7 @@ static const char *name_polish_3_n[] = {
" Leśne" " Leśne"
}; };
static const char *name_czech_real[] = { static const char *const name_czech_real[] = {
"Aš", "Aš",
"Benešov", "Benešov",
"Beroun", "Beroun",
@ -1713,7 +1713,7 @@ enum CzechPattern {
/* [CzechGender][CzechPattern] - replaces the last character of the adjective /* [CzechGender][CzechPattern] - replaces the last character of the adjective
* by this. */ * by this. */
// XXX: [CZG_SMASC][CZP_PRIVL] needs special handling: -ovX -> -uv. // XXX: [CZG_SMASC][CZP_PRIVL] needs special handling: -ovX -> -uv.
static const char *name_czech_patmod[][3] = { static const char *const name_czech_patmod[][3] = {
/* CZG_SMASC */ { "í", "ý", "X" }, /* CZG_SMASC */ { "í", "ý", "X" },
/* CZG_SFEM */ { "í", "á", "a" }, /* CZG_SFEM */ { "í", "á", "a" },
/* CZG_SNEUT */ { "í", "é", "o" }, /* CZG_SNEUT */ { "í", "é", "o" },
@ -1876,7 +1876,7 @@ static const CzechNameSubst name_czech_subst_stem[] = {
}; };
// Optional postfix inserted between stem and ending. // Optional postfix inserted between stem and ending.
static const char *name_czech_subst_postfix[] = { static const char *const name_czech_subst_postfix[] = {
"av", "an", "at", "av", "an", "at",
"ov", "on", "ot", "ov", "on", "ot",
"ev", "en", "et", "ev", "en", "et",
@ -1906,7 +1906,7 @@ static const CzechNameSubst name_czech_subst_ending[] = {
{ CZG_SNEUT, CZA_LONG, CZC_ANY, "iště" }, { CZG_SNEUT, CZA_LONG, CZC_ANY, "iště" },
}; };
static const char *name_czech_suffix[] = { static const char *const name_czech_suffix[] = {
"nad Cidlinou", "nad Cidlinou",
"nad Dyjí", "nad Dyjí",
"nad Jihlavou", "nad Jihlavou",
@ -1930,7 +1930,7 @@ static const char *name_czech_suffix[] = {
static const char *name_romanian_real[] = { static const char *const name_romanian_real[] = {
"Adjud", "Adjud",
"Alba Iulia", "Alba Iulia",
"Alexandria", "Alexandria",
@ -2027,7 +2027,7 @@ static const char *name_romanian_real[] = {
"Zalãu" "Zalãu"
}; };
static const char *name_slovak_real[] = { static const char *const name_slovak_real[] = {
"Bratislava", "Bratislava",
"Banovce nad Bebravou", "Banovce nad Bebravou",
"Banska Bystrica", "Banska Bystrica",
@ -2117,7 +2117,7 @@ static const char *name_slovak_real[] = {
"Zvolen" "Zvolen"
}; };
static const char *name_norwegian_1[] = { static const char *const name_norwegian_1[] = {
"Arna", "Arna",
"Aust", "Aust",
"Bjørk", "Bjørk",
@ -2204,7 +2204,7 @@ static const char *name_norwegian_1[] = {
"Våg" "Våg"
}; };
static const char *name_norwegian_2[] = { static const char *const name_norwegian_2[] = {
"aker", "aker",
"anger", "anger",
"bakken", "bakken",
@ -2274,7 +2274,7 @@ static const char *name_norwegian_2[] = {
"åsen" "åsen"
}; };
static const char *name_norwegian_real[] = { static const char *const name_norwegian_real[] = {
"Alta", "Alta",
"Arendal", "Arendal",
"Askim", "Askim",
@ -2371,7 +2371,7 @@ static const char *name_norwegian_real[] = {
"Åndalsnes" "Åndalsnes"
}; };
static const char *name_hungarian_1[] = { static const char *const name_hungarian_1[] = {
"Nagy-", "Nagy-",
"Kis-", "Kis-",
"Felső-", "Felső-",
@ -2379,7 +2379,7 @@ static const char *name_hungarian_1[] = {
"Új-" "Új-"
}; };
static const char *name_hungarian_2[] = { static const char *const name_hungarian_2[] = {
"Bodrog", "Bodrog",
"Dráva", "Dráva",
"Duna", "Duna",
@ -2436,7 +2436,7 @@ static const char *name_hungarian_2[] = {
"Vásáros" "Vásáros"
}; };
static const char *name_hungarian_3[] = { static const char *const name_hungarian_3[] = {
"apáti", "apáti",
"bába", "bába",
"bikk", "bikk",
@ -2455,7 +2455,7 @@ static const char *name_hungarian_3[] = {
"völgy" "völgy"
}; };
static const char *name_hungarian_4[] = { static const char *const name_hungarian_4[] = {
"alja", "alja",
"egyháza", "egyháza",
"háza", "háza",
@ -2463,7 +2463,7 @@ static const char *name_hungarian_4[] = {
"vár" "vár"
}; };
static const char *name_hungarian_real[] = { static const char *const name_hungarian_real[] = {
"Ajka", "Ajka",
"Aszód", "Aszód",
"Badacsony", "Badacsony",
@ -2502,7 +2502,7 @@ static const char *name_hungarian_real[] = {
"Zirc" "Zirc"
}; };
static const char *name_swiss_real[] = { static const char *const name_swiss_real[] = {
"Aarau", "Aarau",
"Aesch", "Aesch",
"Altdorf", "Altdorf",
@ -2628,7 +2628,7 @@ static const char *name_swiss_real[] = {
"Zug", "Zug",
}; };
static const char *name_danish_1[] = { static const char *const name_danish_1[] = {
"Gamle ", "Gamle ",
"Lille ", "Lille ",
"Nye ", "Nye ",
@ -2643,7 +2643,7 @@ static const char *name_danish_1[] = {
"Kongens ", "Kongens ",
}; };
static const char *name_danish_2[] = { static const char *const name_danish_2[] = {
"Ager", "Ager",
"Alle", "Alle",
"Aske", "Aske",
@ -2727,7 +2727,7 @@ static const char *name_danish_2[] = {
"Ål" "Ål"
}; };
static const char *name_danish_3[] = { static const char *const name_danish_3[] = {
"basse", "basse",
"borg", "borg",
"berg", "berg",
@ -2760,7 +2760,7 @@ static const char *name_danish_3[] = {
"skov" "skov"
}; };
static const char *name_turkish_prefix[] = { static const char *const name_turkish_prefix[] = {
"Akça", "Akça",
"Altın", "Altın",
"Bahçe", "Bahçe",
@ -2779,7 +2779,7 @@ static const char *name_turkish_prefix[] = {
"Yeni" "Yeni"
}; };
static const char *name_turkish_middle[] = { static const char *const name_turkish_middle[] = {
"agaç", "agaç",
"ayva", "ayva",
"çam", "çam",
@ -2789,7 +2789,7 @@ static const char *name_turkish_middle[] = {
"yalı" "yalı"
}; };
static const char *name_turkish_suffix[] = { static const char *const name_turkish_suffix[] = {
"dere", "dere",
"hisar", "hisar",
"kale", "kale",
@ -2806,7 +2806,7 @@ static const char *name_turkish_suffix[] = {
"yurt" "yurt"
}; };
static const char *name_turkish_real[] = { static const char *const name_turkish_real[] = {
"Adana", "Adana",
"Adıyaman", "Adıyaman",
"Afyon", "Afyon",
@ -2874,7 +2874,7 @@ static const char *name_turkish_real[] = {
"Düzce" "Düzce"
}; };
static const char *name_italian_real[] = { static const char *const name_italian_real[] = {
"Roma", "Roma",
"Milano", "Milano",
"Napoli", "Napoli",
@ -2955,7 +2955,7 @@ static const char *name_italian_real[] = {
"Grosseto", "Grosseto",
}; };
static const char *name_italian_pref[] = { static const char *const name_italian_pref[] = {
"Alpe ", "Alpe ",
"Borgo ", "Borgo ",
"Cascina ", "Cascina ",
@ -2970,7 +2970,7 @@ static const char *name_italian_pref[] = {
"Villar ", "Villar ",
}; };
static const char *name_italian_1m[] = { static const char *const name_italian_1m[] = {
"Bel", "Bel",
"Borgo", "Borgo",
"Bosco", "Bosco",
@ -2998,7 +2998,7 @@ static const char *name_italian_1m[] = {
"Vico", "Vico",
}; };
static const char *name_italian_1f[] = { static const char *const name_italian_1f[] = {
"Acqua", "Acqua",
"Bra", "Bra",
"Cala", "Cala",
@ -3024,7 +3024,7 @@ static const char *name_italian_1f[] = {
"Villa", "Villa",
}; };
static const char *name_italian_2[] = { static const char *const name_italian_2[] = {
"bell", "bell",
"bianc", "bianc",
"cald", "cald",
@ -3054,7 +3054,7 @@ static const char *name_italian_2[] = {
"viv", "viv",
}; };
static const char *name_italian_2i[] = { static const char *const name_italian_2i[] = {
"", "",
"breve", "breve",
"brevi", "brevi",
@ -3081,7 +3081,7 @@ static const char *name_italian_2i[] = {
}; };
static const char *name_italian_3[] = { static const char *const name_italian_3[] = {
" Marittimo", " Marittimo",
" Marittima", " Marittima",
" del Capo", " del Capo",
@ -3105,14 +3105,14 @@ static const char *name_italian_3[] = {
" Ticino", " Ticino",
}; };
static const char *name_italian_river1[] = { static const char *const name_italian_river1[] = {
" del", " del",
" sul", " sul",
" al", " al",
" nel", " nel",
}; };
static const char *name_italian_river2[] = { static const char *const name_italian_river2[] = {
"l'Adda", "l'Adda",
"l'Adige", "l'Adige",
"le Alpi", "le Alpi",
@ -3140,7 +3140,7 @@ static const char *name_italian_river2[] = {
" Tevere", " Tevere",
}; };
static const char *name_catalan_real[] = { static const char *const name_catalan_real[] = {
"Barcelona", "Barcelona",
"Hospitalet", "Hospitalet",
"Cerdanyola", "Cerdanyola",
@ -3210,7 +3210,7 @@ static const char *name_catalan_real[] = {
"Roses", "Roses",
}; };
static const char *name_catalan_pref[] = { static const char *const name_catalan_pref[] = {
"Pont de ", "Pont de ",
"Parets de ", "Parets de ",
"Canet de ", "Canet de ",
@ -3245,7 +3245,7 @@ static const char *name_catalan_pref[] = {
}; };
static const char *name_catalan_1m[] = { static const char *const name_catalan_1m[] = {
"Torrent", "Torrent",
"Cami", "Cami",
"Mont", "Mont",
@ -3254,7 +3254,7 @@ static const char *name_catalan_1m[] = {
"Riu", "Riu",
}; };
static const char *name_catalan_1f[] = { static const char *const name_catalan_1f[] = {
"Aigua", "Aigua",
"Selva ", "Selva ",
"Vall", "Vall",
@ -3265,7 +3265,7 @@ static const char *name_catalan_1f[] = {
"Terra", "Terra",
}; };
static const char *name_catalan_2m[] = { static const char *const name_catalan_2m[] = {
"alt", "alt",
"baix", "baix",
"fosc", "fosc",
@ -3276,7 +3276,7 @@ static const char *name_catalan_2m[] = {
"gris", "gris",
}; };
static const char *name_catalan_2f[] = { static const char *const name_catalan_2f[] = {
"baixa", "baixa",
"alta", "alta",
"fosca", "fosca",
@ -3287,7 +3287,7 @@ static const char *name_catalan_2f[] = {
"freda", "freda",
}; };
static const char *name_catalan_3[] = { static const char *const name_catalan_3[] = {
" despí", " despí",
" desvern", " desvern",
" del camí", " del camí",
@ -3300,7 +3300,7 @@ static const char *name_catalan_3[] = {
" de la plana", " de la plana",
}; };
static const char *name_catalan_river1[] = { static const char *const name_catalan_river1[] = {
" d'Anoia", " d'Anoia",
" de Ter", " de Ter",
" de Llobregat", " de Llobregat",