ALT
S: | 13.0-alt1 |
5.1: | 1.0.2-alt0.M51.1 |
4.1: | 0.6.0-alt1 |
4.0: | 0.5.1-alt1.RC2 |
3.0: | 0.3.6-alt1 |
:: /
: openttd
Sources Gear Bugs and FR Repocop
: openttd-13.0-alt.patch
--- a/src/lang/english.txt 2023-02-06 07:16:57.324127407 +0000
+++ b/src/lang/english.txt 2023-02-06 07:18:30.907283046 +0000
@@ -3181,6 +3181,7 @@
STR_MAPGEN_TOWN_NAME_HUNGARIAN :Hungarian
STR_MAPGEN_TOWN_NAME_AUSTRIAN :Austrian
STR_MAPGEN_TOWN_NAME_ROMANIAN :Romanian
+STR_MAPGEN_TOWN_NAME_RUSSIAN :Russian
STR_MAPGEN_TOWN_NAME_CZECH :Czech
STR_MAPGEN_TOWN_NAME_SWISS :Swiss
STR_MAPGEN_TOWN_NAME_DANISH :Danish
--- a/src/lang/russian.txt 2023-02-06 07:16:57.326127410 +0000
+++ b/src/lang/russian.txt 2023-02-06 07:20:16.328458373 +0000
@@ -3354,6 +3354,7 @@
STR_MAPGEN_TOWN_NAME_HUNGARIAN :Венгерские
STR_MAPGEN_TOWN_NAME_AUSTRIAN :Австрийские
STR_MAPGEN_TOWN_NAME_ROMANIAN :Румынские
+STR_MAPGEN_TOWN_NAME_RUSSIAN :Русские
STR_MAPGEN_TOWN_NAME_CZECH :Чешские
STR_MAPGEN_TOWN_NAME_SWISS :Швейцарские
STR_MAPGEN_TOWN_NAME_DANISH :Датские
diff --git a/src/strings_type.h b/src/strings_type.h
index 7ad0c71265..fe530a795a 100644
--- a/src/strings_type.h
+++ b/src/strings_type.h
@@ -77,7 +77,8 @@ enum SpecialStrings {
SPECSTR_TOWNNAME_TURKISH,
SPECSTR_TOWNNAME_ITALIAN,
SPECSTR_TOWNNAME_CATALAN,
- SPECSTR_TOWNNAME_LAST = SPECSTR_TOWNNAME_CATALAN,
+ SPECSTR_TOWNNAME_RUSSIAN,
+ SPECSTR_TOWNNAME_LAST = SPECSTR_TOWNNAME_RUSSIAN,
/* special strings for company names on the form "TownName transport". */
SPECSTR_COMPANY_NAME_START = 0x70EA,
--- a/src/table/settings/misc_settings.ini 2023-02-06 07:16:57.327127412 +0000
+++ b/src/table/settings/misc_settings.ini 2023-02-06 07:23:14.955755452 +0000
@@ -182,21 +182,21 @@
name = ""small_font""
type = SLE_STR
var = _fcsettings.small.font
-def = nullptr
+def = ""/usr/share/fonts/ttf/dejavu/DejaVuSerif.ttf""
[SDTG_SSTR]
ifdef = HAS_TRUETYPE_FONT
name = ""medium_font""
type = SLE_STR
var = _fcsettings.medium.font
-def = nullptr
+def = ""/usr/share/fonts/ttf/dejavu/DejaVuSerif.ttf""
[SDTG_SSTR]
ifdef = HAS_TRUETYPE_FONT
name = ""large_font""
type = SLE_STR
var = _fcsettings.large.font
-def = nullptr
+def = ""/usr/share/fonts/ttf/dejavu/DejaVuSerif.ttf""
[SDTG_SSTR]
ifdef = HAS_TRUETYPE_FONT
@@ -210,7 +210,7 @@
name = ""small_size""
type = SLE_UINT
var = _fcsettings.small.size
-def = 0
+def = 12
min = 0
max = 72
@@ -219,7 +219,7 @@
name = ""medium_size""
type = SLE_UINT
var = _fcsettings.medium.size
-def = 0
+def = 18
min = 0
max = 72
@@ -228,7 +228,7 @@
name = ""large_size""
type = SLE_UINT
var = _fcsettings.large.size
-def = 0
+def = 22
min = 0
max = 72
@@ -237,7 +237,7 @@
name = ""mono_size""
type = SLE_UINT
var = _fcsettings.mono.size
-def = 0
+def = 12
min = 0
max = 72
diff --git a/src/table/townname.h b/src/table/townname.h
index 086fc4f116..06f2a8b527 100644
--- a/src/table/townname.h
+++ b/src/table/townname.h
@@ -3313,3 +3313,184 @@ static const char * const _name_catalan_river1[] = {
" de Segre",
u8" de Francol\u00ed",
};
+
+static const char * const _name_russian_real[] = {
+ "Абакан",
+ "Альметьевск",
+ "Ангарск",
+ "Арзамас",
+ "Армавир",
+ "Артем",
+ "Архангельск",
+ "Астрахань",
+ "Ачинск",
+ "Балабаново",
+ "Балаково",
+ "Балашиха",
+ "Барнаул",
+ "Батайск",
+ "Белгород",
+ "Березники",
+ "Бийск",
+ "Благовещенск",
+ "Боровск",
+ "Братск",
+ "Брянск",
+ "Великие Луки",
+ "Великий Новгород",
+ "Владивосток",
+ "Владикавказ",
+ "Владимир",
+ "Волгоград",
+ "Волгодонск",
+ "Волжский",
+ "Вологда",
+ "Воронеж",
+ "Глазов",
+ "Грозный",
+ "Дербент",
+ "Дзержинск",
+ "Димитровград",
+ "Донецк",
+ "Екатеринбург",
+ "Елец",
+ "Ермолино",
+ "Железнодорожный",
+ "Жуковский",
+ "Златоуст",
+ "Иваново",
+ "Ижевск",
+ "Иркутск",
+ "Йошкар-Ола",
+ "Казань",
+ "Калининград",
+ "Калуга",
+ "Каменск-Уральский",
+ "Камышин",
+ "Канск",
+ "Кемерово",
+ "Керчь",
+ "Киров",
+ "Киселевск",
+ "Кисловодск",
+ "Ковров",
+ "Коломна",
+ "Комсомольск-на-Амуре",
+ "Копейск",
+ "Королёв",
+ "Кострома",
+ "Краснодар",
+ "Красноярск",
+ "Курган",
+ "Курск",
+ "Кызыл",
+ "Ленинск-Кузнецкий",
+ "Липецк",
+ "Люберцы",
+ "Магадан",
+ "Магнитогорск",
+ "Майкоп",
+ "Махачкала",
+ "Междуреченск",
+ "Миасс",
+ "Москва",
+ "Мурманск",
+ "Муром",
+ "Мытищи",
+ "Набережные Челны",
+ "Назрань",
+ "Нальчик",
+ "Находка",
+ "Невинномысск",
+ "Нефтекамск",
+ "Нефтеюганск",
+ "Нижневартовск",
+ "Нижнекамск",
+ "Нижний Новгород",
+ "Нижний Тагил",
+ "Новокузнецк",
+ "Новокуйбышевск",
+ "Новомосковск",
+ "Новороссийск",
+ "Новосибирск",
+ "Новотроицк",
+ "Новочебоксарск",
+ "Новочеркасск",
+ "Новошахтинск",
+ "Новый Уренгой",
+ "Ногинск",
+ "Норильск",
+ "Ноябрьск",
+ "Обнинск",
+ "Одинцово",
+ "Октябрьский",
+ "Омск",
+ "Оренбург",
+ "Орехово-Зуево",
+ "Орёл",
+ "Орск",
+ "Пенза",
+ "Переславль-Залесский",
+ "Первоуральск",
+ "Пермь",
+ "Петрозаводск",
+ "Петропавловск-Камчатский",
+ "Подольск",
+ "Прокопьевск",
+ "Псков",
+ "Пятигорск",
+ "Ростов-на-Дону",
+ "Рубцовск",
+ "Русиново",
+ "Рыбинск",
+ "Рязань",
+ "Салават",
+ "Самара",
+ "Санкт-Петербург",
+ "Саранск",
+ "Саратов",
+ "Северодвинск",
+ "Северск",
+ "Севастополь",
+ "Сергиев Посад",
+ "Серпухов",
+ "Смоленск",
+ "Симферополь",
+ "Сочи",
+ "Ставрополь",
+ "Старый Оскол",
+ "Стерлитамак",
+ "Сургут",
+ "Сызрань",
+ "Сыктывкар",
+ "Таганрог",
+ "Тамбов",
+ "Тверь",
+ "Тобольск",
+ "Тольятти",
+ "Томск",
+ "Тула",
+ "Тюмень",
+ "Улан-Удэ",
+ "Ульяновск",
+ "Уссурийск",
+ "Уфа",
+ "Ухта",
+ "Хабаровск",
+ "Хасавюрт",
+ "Химки",
+ "Чебоксары",
+ "Челябинск",
+ "Череповец",
+ "Черкесск",
+ "Чита",
+ "Шахты",
+ "Щелково",
+ "Электросталь",
+ "Элиста",
+ "Энгельс",
+ "Южно-Сахалинск",
+ "Якутск",
+ "Ярославль"
+};
+
diff --git a/src/townname.cpp b/src/townname.cpp
index 519391f14e..659dd35a3e 100644
--- a/src/townname.cpp
+++ b/src/townname.cpp
@@ -408,6 +408,18 @@ static char *MakeFrenchTownName(char *buf, const char *last, uint32 seed)
return strecpy(buf, _name_french_real[SeedChance(0, lengthof(_name_french_real), seed)], last);
}
+/**
+ * Generates Russian town name from given seed.
+ * @param buf output buffer
+ * @param seed town name seed
+ * @param last end of buffer
+ */
+
+static char *MakeRussianTownName(char *buf, const char *last, uint32 seed)
+{
+ return strecpy(buf, _name_russian_real[SeedChance(0, lengthof(_name_russian_real), seed)], last);
+}
+
/**
* Generates Silly town name from given seed.
@@ -1034,6 +1046,7 @@ static const TownNameGeneratorParams _town_name_generators[] = {
{ 0, MakeHungarianTownName},
{ 0, MakeAustrianTownName},
{ 0, MakeRomanianTownName},
+ { 0, MakeRussianTownName},
{ 28, MakeCzechTownName}, // _name_czech_adj + _name_czech_patmod + 1 + _name_czech_subst_stem + _name_czech_subst_postfix
{ 0, MakeSwissTownName},
{ 0, MakeDanishTownName},