mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r234) -Fix: added missing romanian.txt to VC6, VS.NET and Jamfile project file
-Feature: Added romanian town names and currency (Magic_Pixel)
This commit is contained in:
parent
383dc579e4
commit
c6f48d3de6
|
@ -16,7 +16,7 @@ CFILES = ai.c aircraft_cmd.c aircraft_gui.c airport_gui.c
|
||||||
airport.c grfspecial.c terraform_gui.c ;
|
airport.c grfspecial.c terraform_gui.c ;
|
||||||
|
|
||||||
|
|
||||||
LANGFILES = english.txt swedish.txt french.txt german.txt italian.txt slovak.txt hungarian.txt norwegian.txt danish.txt czech.txt galician.txt polish.txt;
|
LANGFILES = english.txt swedish.txt french.txt german.txt italian.txt slovak.txt hungarian.txt norwegian.txt danish.txt czech.txt galician.txt polish.txt romanian.txt;
|
||||||
|
|
||||||
####################
|
####################
|
||||||
# On UNIX we use gcc
|
# On UNIX we use gcc
|
||||||
|
|
|
@ -856,6 +856,7 @@ STR_TOWNNAME_CZECH :Czech
|
||||||
STR_TOWNNAME_SLOVAKISH :Slovakish
|
STR_TOWNNAME_SLOVAKISH :Slovakish
|
||||||
STR_TOWNNAME_HUNGARIAN :Hungarian
|
STR_TOWNNAME_HUNGARIAN :Hungarian
|
||||||
STR_TOWNNAME_AUSTRIAN :Austrian
|
STR_TOWNNAME_AUSTRIAN :Austrian
|
||||||
|
STR_TOWNNAME_ROMANIAN :Romanian
|
||||||
############ end of townname region
|
############ end of townname region
|
||||||
|
|
||||||
STR_CURR_POUNDS :Pounds ({POUNDSIGN})
|
STR_CURR_POUNDS :Pounds ({POUNDSIGN})
|
||||||
|
@ -879,6 +880,7 @@ STR_CURR_RUR :Russian Rubel (rur)
|
||||||
STR_CURR_CZK :Czech Koruna (CZK)
|
STR_CURR_CZK :Czech Koruna (CZK)
|
||||||
STR_CURR_ISK :Icelandic Krona (ISK)
|
STR_CURR_ISK :Icelandic Krona (ISK)
|
||||||
STR_CURR_NOK :Norwegian Krone (NOK)
|
STR_CURR_NOK :Norwegian Krone (NOK)
|
||||||
|
STR_CURR_ROL :Romanian Leu (Lei)
|
||||||
STR_CURR_EUR :Euro (€)
|
STR_CURR_EUR :Euro (€)
|
||||||
|
|
||||||
STR_OPTIONS_LANG :{BLACK}Language
|
STR_OPTIONS_LANG :{BLACK}Language
|
||||||
|
|
11
langs.dsp
11
langs.dsp
|
@ -183,6 +183,17 @@ InputPath=.\lang\polish.txt
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\lang\romanian.txt
|
||||||
|
# Begin Custom Build
|
||||||
|
InputPath=.\lang\romanian.txt
|
||||||
|
|
||||||
|
"lang\romanian.lng" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||||
|
strgen\debug\strgen.exe lang\romanian.txt
|
||||||
|
|
||||||
|
# End Custom Build
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\lang\slovak.txt
|
SOURCE=.\lang\slovak.txt
|
||||||
# Begin Custom Build
|
# Begin Custom Build
|
||||||
InputPath=.\lang\slovak.txt
|
InputPath=.\lang\slovak.txt
|
||||||
|
|
12
langs.vcproj
12
langs.vcproj
|
@ -191,6 +191,18 @@
|
||||||
Outputs="lang\polish.lng"/>
|
Outputs="lang\polish.lng"/>
|
||||||
</FileConfiguration>
|
</FileConfiguration>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\lang\romanian.txt">
|
||||||
|
<FileConfiguration
|
||||||
|
Name="Debug|Win32">
|
||||||
|
<Tool
|
||||||
|
Name="VCCustomBuildTool"
|
||||||
|
Description="Generating romanian language file"
|
||||||
|
CommandLine="strgen\debug\strgen.exe "$(InputPath)"
|
||||||
|
"
|
||||||
|
Outputs="lang\romanian.lng"/>
|
||||||
|
</FileConfiguration>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\lang\slovak.txt">
|
RelativePath=".\lang\slovak.txt">
|
||||||
<FileConfiguration
|
<FileConfiguration
|
||||||
|
|
107
namegen.c
107
namegen.c
|
@ -1783,8 +1783,110 @@ static byte MakeCzechTownName(byte *buf, uint32 seed)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define NUM_ROMANIAN_1 94
|
||||||
|
static const char romanian_1[]=
|
||||||
|
MK("Adjud")
|
||||||
|
MK("Alba Iulia")
|
||||||
|
MK("Alexandria")
|
||||||
|
MK("Babadag")
|
||||||
|
MK("Bacãu")
|
||||||
|
MK("Baia Mare")
|
||||||
|
MK("Bãile Herculane")
|
||||||
|
MK("Bãilesti")
|
||||||
|
MK("Bârlad")
|
||||||
|
MK("Bicaz")
|
||||||
|
MK("Bistrita")
|
||||||
|
MK("Blaj")
|
||||||
|
MK("Borsec")
|
||||||
|
MK("Botosani")
|
||||||
|
MK("Brãila")
|
||||||
|
MK("Brasov")
|
||||||
|
MK("Bucuresti")
|
||||||
|
MK("Buftea")
|
||||||
|
MK("Buzãu")
|
||||||
|
MK("Cãlãrasi")
|
||||||
|
MK("Caransebes")
|
||||||
|
MK("Cernavodã")
|
||||||
|
MK("Cluj-Napoca")
|
||||||
|
MK("Constanta")
|
||||||
|
MK("Covasna")
|
||||||
|
MK("Craiova")
|
||||||
|
MK("Dej")
|
||||||
|
MK("Deva")
|
||||||
|
MK("Dorohoi")
|
||||||
|
MK("Dr.-Tr. Severin")
|
||||||
|
MK("Drãgãsani")
|
||||||
|
MK("Fãgãras")
|
||||||
|
MK("Fãlticeni")
|
||||||
|
MK("Fetesti")
|
||||||
|
MK("Focsani")
|
||||||
|
MK("Galati")
|
||||||
|
MK("Gheorgheni")
|
||||||
|
MK("Giurgiu")
|
||||||
|
MK("Hârsova")
|
||||||
|
MK("Hunedoara")
|
||||||
|
MK("Husi")
|
||||||
|
MK("Iasi")
|
||||||
|
MK("Isaccea")
|
||||||
|
MK("Lugoj")
|
||||||
|
MK("Mãcin")
|
||||||
|
MK("Mangalia")
|
||||||
|
MK("Medgidia")
|
||||||
|
MK("Medias")
|
||||||
|
MK("Miercurea Ciuc")
|
||||||
|
MK("Mizil")
|
||||||
|
MK("Motru")
|
||||||
|
MK("Nãsãud")
|
||||||
|
MK("Nãvodari")
|
||||||
|
MK("Odobesti")
|
||||||
|
MK("Oltenita")
|
||||||
|
MK("Onesti")
|
||||||
|
MK("Oradea")
|
||||||
|
MK("Orsova")
|
||||||
|
MK("Petrosani")
|
||||||
|
MK("Piatra Neamt")
|
||||||
|
MK("Pitesti")
|
||||||
|
MK("Ploiesti")
|
||||||
|
MK("Predeal")
|
||||||
|
MK("Râmnicu Vâlcea")
|
||||||
|
MK("Reghin")
|
||||||
|
MK("Resita")
|
||||||
|
MK("Roman")
|
||||||
|
MK("Rosiorii de Vede")
|
||||||
|
MK("Satu Mare")
|
||||||
|
MK("Sebes")
|
||||||
|
MK("Sfântu Gheorghe")
|
||||||
|
MK("Sibiu")
|
||||||
|
MK("Sighisoara")
|
||||||
|
MK("Sinaia")
|
||||||
|
MK("Slatina")
|
||||||
|
MK("Slobozia")
|
||||||
|
MK("Sovata")
|
||||||
|
MK("Suceava")
|
||||||
|
MK("Sulina")
|
||||||
|
MK("Tãndãrei")
|
||||||
|
MK("Târgoviste")
|
||||||
|
MK("Târgu Jiu")
|
||||||
|
MK("Târgu Mures")
|
||||||
|
MK("Tecuci")
|
||||||
|
MK("Timisoara")
|
||||||
|
MK("Tulcea")
|
||||||
|
MK("Turda")
|
||||||
|
MK("Turnu Mãgurele")
|
||||||
|
MK("Urziceni")
|
||||||
|
MK("Vaslui")
|
||||||
|
MK("Vatra Dornei")
|
||||||
|
MK("Victoria")
|
||||||
|
MK("Videle")
|
||||||
|
MK("Zalãu")
|
||||||
|
;
|
||||||
|
|
||||||
|
static byte MakeRomanianTownName(byte *buf, uint32 seed)
|
||||||
|
{
|
||||||
|
AppendPart(&buf, GETNUM(0, NUM_ROMANIAN_1), romanian_1);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
#define NUM_SLOVAKISH_1 87
|
#define NUM_SLOVAKISH_1 87
|
||||||
static const char slovakish_1[] =
|
static const char slovakish_1[] =
|
||||||
MK("Bratislava")
|
MK("Bratislava")
|
||||||
|
@ -2075,7 +2177,8 @@ TownNameGenerator * const _town_name_generators[] = {
|
||||||
MakeCzechTownName,
|
MakeCzechTownName,
|
||||||
MakeSlovakishTownName,
|
MakeSlovakishTownName,
|
||||||
MakeHungarianTownName,
|
MakeHungarianTownName,
|
||||||
MakeAustrianTownName
|
MakeAustrianTownName,
|
||||||
|
MakeRomanianTownName
|
||||||
};
|
};
|
||||||
|
|
||||||
#define FIXNUM(x, y, z) (((((x) << 16) / (y)) + 1) << z)
|
#define FIXNUM(x, y, z) (((((x) << 16) / (y)) + 1) << z)
|
||||||
|
|
|
@ -780,9 +780,9 @@ static const SettingDesc debug_settings[] = {
|
||||||
static const SettingDesc gameopt_settings[] = {
|
static const SettingDesc gameopt_settings[] = {
|
||||||
{"diff_level", SDT_UINT8, (void*)9, (void*)offsetof(GameOptions, diff_level), NULL},
|
{"diff_level", SDT_UINT8, (void*)9, (void*)offsetof(GameOptions, diff_level), NULL},
|
||||||
{"diff_custom", SDT_INTLIST | SDT_UINT32 | (sizeof(GameDifficulty)/4) << 16, NULL, (void*)offsetof(GameOptions, diff), NULL},
|
{"diff_custom", SDT_INTLIST | SDT_UINT32 | (sizeof(GameDifficulty)/4) << 16, NULL, (void*)offsetof(GameOptions, diff), NULL},
|
||||||
{"currency", SDT_UINT8 | SDT_ONEOFMANY, (void*)21, (void*)offsetof(GameOptions, currency), "GBP|USD|FF|DM|YEN|PT|FT|ZL|ATS|BEF|DKK|FIM|GRD|CHF|NLG|ITL|SEK|RUR|CZK|ISK|NOK|EUR" },
|
{"currency", SDT_UINT8 | SDT_ONEOFMANY, (void*)22, (void*)offsetof(GameOptions, currency), "GBP|USD|FF|DM|YEN|PT|FT|ZL|ATS|BEF|DKK|FIM|GRD|CHF|NLG|ITL|SEK|RUR|CZK|ISK|NOK|ROL|EUR" },
|
||||||
{"distances", SDT_UINT8 | SDT_ONEOFMANY, (void*)1, (void*)offsetof(GameOptions, kilometers), "imperial|metric" },
|
{"distances", SDT_UINT8 | SDT_ONEOFMANY, (void*)1, (void*)offsetof(GameOptions, kilometers), "imperial|metric" },
|
||||||
{"town_names", SDT_UINT8 | SDT_ONEOFMANY, (void*)0, (void*)offsetof(GameOptions, town_name), "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|czech|slovakish|hungarian" },
|
{"town_names", SDT_UINT8 | SDT_ONEOFMANY, (void*)0, (void*)offsetof(GameOptions, town_name), "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|czech|slovakish|hungarian|romanian" },
|
||||||
{"landscape", SDT_UINT8 | SDT_ONEOFMANY, (void*)0, (void*)offsetof(GameOptions, landscape), "normal|hilly|desert|candy" },
|
{"landscape", SDT_UINT8 | SDT_ONEOFMANY, (void*)0, (void*)offsetof(GameOptions, landscape), "normal|hilly|desert|candy" },
|
||||||
{"autosave", SDT_UINT8 | SDT_ONEOFMANY, (void*)1, (void*)offsetof(GameOptions, autosave), "off|monthly|quarterly|half year|yearly" },
|
{"autosave", SDT_UINT8 | SDT_ONEOFMANY, (void*)1, (void*)offsetof(GameOptions, autosave), "off|monthly|quarterly|half year|yearly" },
|
||||||
{"road_side", SDT_UINT8 | SDT_ONEOFMANY, (void*)1, (void*)offsetof(GameOptions, road_side), "left|right" },
|
{"road_side", SDT_UINT8 | SDT_ONEOFMANY, (void*)1, (void*)offsetof(GameOptions, road_side), "left|right" },
|
||||||
|
|
|
@ -72,6 +72,7 @@ static const CurrencySpec _currency_specs[] = {
|
||||||
{ 50, ',', 0, "", " Kc" },
|
{ 50, ',', 0, "", " Kc" },
|
||||||
{ 130, '.', 0, "", " kr" },
|
{ 130, '.', 0, "", " kr" },
|
||||||
{ 11, '.', 0, "", " kr" },
|
{ 11, '.', 0, "", " kr" },
|
||||||
|
{ 6, '.', 0, "", " Lei" },
|
||||||
{ 2, ',', CF_ISEURO, "€", "" },
|
{ 2, ',', CF_ISEURO, "€", "" },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -97,6 +98,7 @@ const uint16 _currency_string_list[] = {
|
||||||
STR_CURR_CZK,
|
STR_CURR_CZK,
|
||||||
STR_CURR_ISK,
|
STR_CURR_ISK,
|
||||||
STR_CURR_NOK,
|
STR_CURR_NOK,
|
||||||
|
STR_CURR_ROL,
|
||||||
STR_CURR_EUR,
|
STR_CURR_EUR,
|
||||||
INVALID_STRING_ID
|
INVALID_STRING_ID
|
||||||
};
|
};
|
||||||
|
@ -663,13 +665,15 @@ static byte *GenPlayerName_4(byte *buff)
|
||||||
|
|
||||||
buff[0] = _initial_name_letters[ (sizeof(_initial_name_letters) * (byte)x) >> 8];
|
buff[0] = _initial_name_letters[ (sizeof(_initial_name_letters) * (byte)x) >> 8];
|
||||||
buff[1] = '.';
|
buff[1] = '.';
|
||||||
buff += 2;
|
buff[2] = ' '; // Insert a space after initial and period "I. Firstname" instead of "I.Firstname"
|
||||||
|
buff += 3;
|
||||||
|
|
||||||
i = ((sizeof(_initial_name_letters) + 35) * (byte)(x >> 8)) >> 8;
|
i = ((sizeof(_initial_name_letters) + 35) * (byte)(x >> 8)) >> 8;
|
||||||
if (i < sizeof(_initial_name_letters)) {
|
if (i < sizeof(_initial_name_letters)) {
|
||||||
buff[0] = _initial_name_letters[i];
|
buff[0] = _initial_name_letters[i];
|
||||||
buff[1] = '.';
|
buff[1] = '.';
|
||||||
buff += 2;
|
buff[2] = ' '; // Insert a space after initial and period "I. J. Firstname" instead of "I.J.Firstname"
|
||||||
|
buff += 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
base = 0;
|
base = 0;
|
||||||
|
|
5
ttd.h
5
ttd.h
|
@ -482,8 +482,9 @@ enum SpecialStrings {
|
||||||
SPECSTR_TOWNNAME_CZECH,
|
SPECSTR_TOWNNAME_CZECH,
|
||||||
SPECSTR_TOWNNAME_SLOVAKISH,
|
SPECSTR_TOWNNAME_SLOVAKISH,
|
||||||
SPECSTR_TOWNNAME_HUNGARIAN,
|
SPECSTR_TOWNNAME_HUNGARIAN,
|
||||||
SPECSTR_TOWNNAME_AUSTRIAN,
|
SPECSTR_TOWNNAME_AUSTRIAN,
|
||||||
SPECSTR_TOWNNAME_LAST = SPECSTR_TOWNNAME_AUSTRIAN,
|
SPECSTR_TOWNNAME_ROMANIAN,
|
||||||
|
SPECSTR_TOWNNAME_LAST = SPECSTR_TOWNNAME_ROMANIAN,
|
||||||
|
|
||||||
// special strings for player names on the form "TownName transport".
|
// special strings for player names on the form "TownName transport".
|
||||||
SPECSTR_PLAYERNAME_START = 0x70EA,
|
SPECSTR_PLAYERNAME_START = 0x70EA,
|
||||||
|
|
Loading…
Reference in New Issue