diff options
| -rw-r--r-- | bin/data/openttdd.grf | bin | 414036 -> 414565 bytes | |||
| -rw-r--r-- | bin/data/openttdw.grf | bin | 414196 -> 414725 bytes | |||
| -rw-r--r-- | src/lang/english.txt | 7 | ||||
| -rw-r--r-- | src/network/core/config.h | 2 | ||||
| -rw-r--r-- | src/network/network_internal.h | 7 | ||||
| -rw-r--r-- | src/settings.cpp | 2 | ||||
| -rw-r--r-- | src/table/files.h | 5 | ||||
| -rw-r--r-- | src/table/sprites.h | 2 |
8 files changed, 20 insertions, 5 deletions
diff --git a/bin/data/openttdd.grf b/bin/data/openttdd.grf Binary files differindex 5f038f5cd..591ab4ce2 100644 --- a/bin/data/openttdd.grf +++ b/bin/data/openttdd.grf diff --git a/bin/data/openttdw.grf b/bin/data/openttdw.grf Binary files differindex c08f593bb..7bf6ee53f 100644 --- a/bin/data/openttdw.grf +++ b/bin/data/openttdw.grf diff --git a/src/lang/english.txt b/src/lang/english.txt index fa5efb42a..57a19d275 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1451,6 +1451,13 @@ STR_NETWORK_LANG_SPANISH :Spanish STR_NETWORK_LANG_SWEDISH :Swedish STR_NETWORK_LANG_TURKISH :Turkish STR_NETWORK_LANG_UKRAINIAN :Ukrainian +STR_NETWORK_LANG_AFRIKAANS :Afrikaans +STR_NETWORK_LANG_CROATIAN :Croatian +STR_NETWORK_LANG_CATALAN :Catalan +STR_NETWORK_LANG_ESTONIAN :Estonian +STR_NETWORK_LANG_GALICIAN :Galician +STR_NETWORK_LANG_GREEK :Greek +STR_NETWORK_LANG_LATVIAN :Latvian ############ End of leave-in-this-order STR_NETWORK_GAME_LOBBY :{WHITE}Multiplayer game lobby diff --git a/src/network/core/config.h b/src/network/core/config.h index f2f21c59d..e261ef2f0 100644 --- a/src/network/core/config.h +++ b/src/network/core/config.h @@ -47,7 +47,7 @@ enum { */ NETWORK_MAX_GRF_COUNT = 55, - NETWORK_NUM_LANGUAGES = 29, ///< Number of known languages (to the network protocol) + 1 for 'any'. + NETWORK_NUM_LANGUAGES = 36, ///< Number of known languages (to the network protocol) + 1 for 'any'. /** * The number of landscapes in OpenTTD. * This number must be equal to NUM_LANDSCAPE, but as this number is used diff --git a/src/network/network_internal.h b/src/network/network_internal.h index 821800ffc..aa823429c 100644 --- a/src/network/network_internal.h +++ b/src/network/network_internal.h @@ -106,6 +106,13 @@ enum NetworkLanguage { NETLANG_SWEDISH, NETLANG_TURKISH, NETLANG_UKRAINIAN, + NETLANG_AFRIKAANS, + NETLANG_CROATIAN, + NETLANG_CATALAN, + NETLANG_ESTONIAN, + NETLANG_GALICIAN, + NETLANG_GREEK, + NETLANG_LATVIAN, NETLANG_COUNT }; diff --git a/src/settings.cpp b/src/settings.cpp index e64b5cbcb..39bd51ae2 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1323,7 +1323,7 @@ static const SettingDescGlobVarList _network_settings[] = { SDTG_VAR("max_spectators", SLE_UINT8, S, 0, _network_game_info.spectators_max, 10, 0, MAX_CLIENTS, 0, STR_NULL, NULL), SDTG_VAR("restart_game_year", SLE_INT32, S,D0, _network_restart_game_year, 0, MIN_YEAR, MAX_YEAR, 1, STR_NULL, NULL), SDTG_VAR("min_players", SLE_UINT8, S, 0, _network_min_players, 0, 0, 10, 0, STR_NULL, NULL), - SDTG_OMANY("server_lang", SLE_UINT8, S, 0, _network_game_info.server_lang, 0, 28, "ANY|ENGLISH|GERMAN|FRENCH|BRAZILIAN|BULGARIAN|CHINESE|CZECH|DANISH|DUTCH|ESPERANTO|FINNISH|HUNGARIAN|ICELANDIC|ITALIAN|JAPANESE|KOREAN|LITHUANIAN|NORWEGIAN|POLISH|PORTUGUESE|ROMANIAN|RUSSIAN|SLOVAK|SLOVENIAN|SPANISH|SWEDISH|TURKISH|UKRAINIAN", STR_NULL, NULL), + SDTG_OMANY("server_lang", SLE_UINT8, S, 0, _network_game_info.server_lang, 0, 35, "ANY|ENGLISH|GERMAN|FRENCH|BRAZILIAN|BULGARIAN|CHINESE|CZECH|DANISH|DUTCH|ESPERANTO|FINNISH|HUNGARIAN|ICELANDIC|ITALIAN|JAPANESE|KOREAN|LITHUANIAN|NORWEGIAN|POLISH|PORTUGUESE|ROMANIAN|RUSSIAN|SLOVAK|SLOVENIAN|SPANISH|SWEDISH|TURKISH|UKRAINIAN|AFRIKAANS|CROATIAN|CATALAN|ESTONIAN|GALICIAN|GREEK|LATVIAN", STR_NULL, NULL), SDTG_BOOL("reload_cfg", S, 0, _network_reload_cfg, false, STR_NULL, NULL), SDTG_END() }; diff --git a/src/table/files.h b/src/table/files.h index 3ae962113..f17a12763 100644 --- a/src/table/files.h +++ b/src/table/files.h @@ -33,9 +33,10 @@ static FileList files_dos = { { "TRGT.GRF", {0xfc, 0xde, 0x1d, 0x7e, 0x8a, 0x74, 0x19, 0x7d, 0x72, 0xa6, 0x26, 0x95, 0x88, 0x4b, 0x90, 0x9e} } }, { "SAMPLE.CAT", {0x42, 0x2e, 0xa3, 0xdd, 0x07, 0x4d, 0x28, 0x59, 0xbb, 0x51, 0x63, 0x9a, 0x6e, 0x0e, 0x85, 0xda} }, - { "OPENTTDD.GRF", {0x9e, 0xb2, 0xf4, 0xd8, 0xf3, 0x63, 0xd4, 0x22, 0x5b, 0x70, 0xa6, 0xd4, 0xbe, 0x55, 0x1c, 0xd9} } + { "OPENTTDD.GRF", {0x61, 0x47, 0x47, 0x15, 0xa9, 0x06, 0x10, 0xb6, 0xed, 0x1f, 0xe1, 0x4d, 0x03, 0x6c, 0xa8, 0x02} } }; + static FileList files_win = { { { "TRG1R.GRF", {0xb0, 0x4c, 0xe5, 0x93, 0xd8, 0xc5, 0x01, 0x6e, 0x07, 0x47, 0x3a, 0x74, 0x3d, 0x7d, 0x33, 0x58} }, // 0 - 4792 inclusive @@ -46,5 +47,5 @@ static FileList files_win = { { "TRGTR.GRF", {0xde, 0x53, 0x65, 0x05, 0x17, 0xfe, 0x66, 0x1c, 0xea, 0xa3, 0x13, 0x8c, 0x6e, 0xdb, 0x0e, 0xb8} } }, { "SAMPLE.CAT", {0x92, 0x12, 0xe8, 0x1e, 0x72, 0xba, 0xdd, 0x4b, 0xbe, 0x1e, 0xae, 0xae, 0x66, 0x45, 0x8e, 0x10} }, - { "OPENTTDW.GRF", {0x1d, 0x9b, 0x03, 0x5e, 0x5d, 0x87, 0xef, 0x21, 0x0f, 0xe3, 0x6e, 0x6d, 0x12, 0xa1, 0x85, 0xfb} } + { "OPENTTDW.GRF", {0xc8, 0xc0, 0x01, 0x73, 0x60, 0xa7, 0x5e, 0xb1, 0xef, 0x9b, 0xe6, 0xba, 0xad, 0x3a, 0x7b, 0xd4} } }; diff --git a/src/table/sprites.h b/src/table/sprites.h index 97ffa049a..ed2ae526f 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -201,7 +201,7 @@ enum Sprites { /* Flags sprites (in same order as enum NetworkLanguage) */ SPR_FLAGS_BASE = SPR_ONEWAY_BASE + ONEWAY_SPRITE_COUNT, - FLAGS_SPRITE_COUNT = 29, + FLAGS_SPRITE_COUNT = 36, /* Not really a sprite, but an empty bounding box. Used to construct bounding boxes, that help sorting the sprites, but do not have a sprite associated. */ SPR_EMPTY_BOUNDING_BOX = SPR_FLAGS_BASE + FLAGS_SPRITE_COUNT, |