diff --git a/bin/data/openttd.grf b/bin/data/openttd.grf index 31d3224367..dd27160339 100644 Binary files a/bin/data/openttd.grf and b/bin/data/openttd.grf differ diff --git a/bin/data/orig_dos.obg b/bin/data/orig_dos.obg index ff04ce474d..7a6e59ef2b 100644 --- a/bin/data/orig_dos.obg +++ b/bin/data/orig_dos.obg @@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8 TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6 -OPENTTD.GRF = e67a3aaf13b81bab5d72d7440244e20c +OPENTTD.GRF = 066f0ce5500e0e8f5332aee42e2451a2 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/bin/data/orig_dos_de.obg b/bin/data/orig_dos_de.obg index 2737cace62..dac856d751 100644 --- a/bin/data/orig_dos_de.obg +++ b/bin/data/orig_dos_de.obg @@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8 TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGT.GRF = fcde1d7e8a74197d72a62695884b909e -OPENTTD.GRF = e67a3aaf13b81bab5d72d7440244e20c +OPENTTD.GRF = 066f0ce5500e0e8f5332aee42e2451a2 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/bin/data/orig_win.obg b/bin/data/orig_win.obg index 9433b78e88..2ddea07ed4 100644 --- a/bin/data/orig_win.obg +++ b/bin/data/orig_win.obg @@ -55,7 +55,7 @@ TRGIR.GRF = 0c2484ff6be49fc63a83be6ab5c38f32 TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1 TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8 -OPENTTD.GRF = e67a3aaf13b81bab5d72d7440244e20c +OPENTTD.GRF = 066f0ce5500e0e8f5332aee42e2451a2 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/media/extra_grf/fix_graphics.nfo b/media/extra_grf/fix_graphics.nfo index ca56d37e9f..6b76f4eca7 100644 --- a/media/extra_grf/fix_graphics.nfo +++ b/media/extra_grf/fix_graphics.nfo @@ -8,13 +8,13 @@ // -1 * 0 0C "Fixing (alignment) bugs in the orignal graphics. By Addi." -1 * 6 07 83 01 \7= 03 69 -// Different grahpics for same wood truck +// Different graphics for same wood truck -1 * 14 0A 04 01 87 0C 01 89 0C 01 07 0E 01 09 0E -1 sprites/fix_graphics.png 82 8 09 16 22 -6 -7 -1 sprites/fix_graphics.png 114 8 09 16 22 -14 -7 -1 sprites/fix_graphics.png 146 8 09 16 22 -6 -7 -1 sprites/fix_graphics.png 178 8 09 16 22 -14 -7 -// Different grahpics for lots of trucks +// Different graphics for lots of trucks -1 * 5 0A 01 28 C4 0D -1 sprites/fix_graphics.png 226 8 01 18 8 -3 -10 -1 sprites/fix_graphics.png 242 8 09 16 20 -14 -7 @@ -56,19 +56,19 @@ -1 sprites/fix_graphics.png 610 40 09 16 20 -14 -7 -1 sprites/fix_graphics.png 642 40 01 12 28 -14 -6 -1 sprites/fix_graphics.png 690 40 09 16 20 -6 -7 -// Different grahpics for same truck +// Different graphics for same truck -1 * 14 0A 04 01 9D 0C 01 9F 0C 01 A1 0C 01 A3 0C -1 sprites/fix_graphics.png 738 40 09 16 22 -14 -7 -1 sprites/fix_graphics.png 770 40 09 16 22 -6 -7 -1 sprites/fix_graphics.png 2 72 09 16 22 -14 -7 -1 sprites/fix_graphics.png 34 72 09 16 22 -6 -7 -// Different grahpics for same paper truck +// Different graphics for same paper truck -1 * 14 0A 04 01 5D 0D 01 5F 0D 01 61 0D 01 63 0D -1 sprites/fix_graphics.png 82 72 09 16 22 -14 -7 -1 sprites/fix_graphics.png 114 72 09 17 22 -5 -7 -1 sprites/fix_graphics.png 146 72 09 17 22 -14 -8 -1 sprites/fix_graphics.png 178 72 09 16 22 -6 -7 -// Different grahpics for same paper truck (truck #2) +// Different graphics for same paper truck (truck #2) -1 * 14 0A 04 01 1D 0E 01 1F 0E 01 21 0E 01 23 0E -1 sprites/fix_graphics.png 226 72 09 16 22 -14 -7 -1 sprites/fix_graphics.png 258 72 09 16 22 -6 -7 @@ -135,13 +135,13 @@ // Non-toyland specific -1 * 6 07 83 01 \7= 03 0A -// Grahpics for the tubular bridge pillars had incorrect offsets +// graphics for the tubular bridge pillars had incorrect offsets -1 * 5 0A 01 04 05 0A -1 sprites/fix_graphics.png 98 296 09 9 4 2 -1 -1 sprites/fix_graphics.png 114 296 09 9 4 2 -1 -1 sprites/fix_graphics.png 130 296 09 9 4 -4 0 -1 sprites/fix_graphics.png 146 296 09 9 4 -4 0 -// Grahpics for the cantilever bridge pillars had incorrect offsets +// graphics for the cantilever bridge pillars had incorrect offsets -1 * 5 0A 01 04 DD 09 -1 sprites/fix_graphics.png 178 296 09 11 10 2 -3 -1 sprites/fix_graphics.png 194 296 09 12 10 2 -2 @@ -150,15 +150,51 @@ // Toyland specific -1 * 6 07 83 01 \7! 03 0A -// Grahpics for the toyland tubular bridge pillars had incorrect offsets +// Graphics for the toyland tubular bridge pillars had incorrect offsets -1 * 5 0A 01 04 05 0A -1 sprites/fix_graphics.png 248 296 09 9 4 2 -1 -1 sprites/fix_graphics.png 264 296 09 9 4 2 -1 -1 sprites/fix_graphics.png 280 296 09 9 4 -4 0 -1 sprites/fix_graphics.png 296 296 09 9 4 -4 0 -// Grahpics for the toyland cantilever bridge pillars had incorrect offsets +// Graphics for the toyland cantilever bridge pillars had incorrect offsets -1 * 5 0A 01 04 DD 09 -1 sprites/fix_graphics.png 328 296 09 11 10 2 -3 -1 sprites/fix_graphics.png 344 296 09 12 10 2 -2 -1 sprites/fix_graphics.png 360 296 09 11 10 -10 -1 -1 sprites/fix_graphics.png 376 296 09 11 10 -10 -1 + +// Wrong, non-translated colours in tubular bridge in 'normal' climates +// Toyland has separate sprites which are not colour translated, thus +// this does not apply there; +// Pillars are changed for all climates further up + -1 * 6 07 83 01 \7= 03 \b22 + +// Main tubular bridge sprites + -1 * 5 0A 01 \b6 \w2559 + -1 sprites/fix_graphics.png 2 330 09 40 32 -30 -26 + -1 sprites/fix_graphics.png 52 330 09 50 44 -42 -26 + -1 sprites/fix_graphics.png 116 330 09 45 46 -42 -21 + -1 sprites/fix_graphics.png 180 330 09 45 46 -2 -20 + -1 sprites/fix_graphics.png 244 330 09 50 44 0 -25 + -1 sprites/fix_graphics.png 308 330 09 41 32 0 -25 +// start rail bridge + -1 * 5 0A 01 01 \w2569 + -1 sprites/fix_graphics.png 350 330 09 29 52 -25 -4 +// start rail + road bridge + -1 * 5 0A 01 02 \w2574 + -1 sprites/fix_graphics.png 420 330 09 29 50 -25 -4 + -1 sprites/fix_graphics.png 489 330 09 29 52 -25 -4 +// start road + monorail bridge + -1 * 5 0A 01 02 \w2580 + -1 sprites/fix_graphics.png 559 330 09 29 50 -25 -4 + -1 sprites/fix_graphics.png 629 330 09 29 52 -25 -4 +// start monrail + maglev bridge + -1 * 5 0A 01 02 \w2586 + -1 sprites/fix_graphics.png 699 330 09 29 50 -25 -4 + -1 sprites/fix_graphics.png 489 283 09 29 52 -25 -4 +// start maglev bridge + -1 * 5 0A 01 01 \w2592 + -1 sprites/fix_graphics.png 559 283 09 29 50 -25 -4 +// GUI sprite + -1 * 5 0A 01 01 \w2600 + -1 sprites/fix_graphics.png 433 298 09 15 40 0 5 diff --git a/media/extra_grf/fix_graphics.png b/media/extra_grf/fix_graphics.png index 52eb3b7980..ec95b6e346 100644 Binary files a/media/extra_grf/fix_graphics.png and b/media/extra_grf/fix_graphics.png differ diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index edbd9652c9..a25b8e9035 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -816,9 +816,8 @@ struct AIDebugWindow : public QueryStringBaseWindow { /* Check if the currently selected company is still active. */ if (ai_debug_company == INVALID_COMPANY || !Company::IsValidAiID(ai_debug_company)) { if (ai_debug_company != INVALID_COMPANY) { - /* Raise and disable the widget for the previous selection. */ + /* Raise the widget for the previous selection. */ this->RaiseWidget(ai_debug_company + AID_WIDGET_COMPANY_BUTTON_START); - this->DisableWidget(ai_debug_company + AID_WIDGET_COMPANY_BUTTON_START); ai_debug_company = INVALID_COMPANY; } @@ -848,9 +847,6 @@ struct AIDebugWindow : public QueryStringBaseWindow { if (this->show_break_box) this->DrawEditBox(AID_WIDGET_BREAK_STR_EDIT_BOX); - /* If there are no active companies, don't display anything else. */ - if (ai_debug_company == INVALID_COMPANY) return; - /* Paint the company icons */ for (CompanyID i = COMPANY_FIRST; i < MAX_COMPANIES; i++) { NWidgetCore *button = this->GetWidget(i + AID_WIDGET_COMPANY_BUTTON_START); @@ -881,6 +877,9 @@ struct AIDebugWindow : public QueryStringBaseWindow { DrawCompanyIcon(i, button->pos_x + button->current_x / 2 - 7 + offset, this->GetWidget(AID_WIDGET_COMPANY_BUTTON_START + i)->pos_y + 2 + offset); } + /* If there are no active companies, don't display anything else. */ + if (ai_debug_company == INVALID_COMPANY) return; + Backup cur_company(_current_company, ai_debug_company, FILE_LINE); AILog::LogData *log = (AILog::LogData *)AIObject::GetLogPointer(); cur_company.Restore(); diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index 2caa42d9dd..4b8a2a4fb5 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -21,6 +21,7 @@ #include "newgrf_engine.h" #include "newgrf_text.h" #include "group.h" +#include "string_func.h" #include "strings_func.h" #include "window_func.h" #include "date_func.h" diff --git a/src/cargotype.cpp b/src/cargotype.cpp index 66b3840cf9..82836b3247 100644 --- a/src/cargotype.cpp +++ b/src/cargotype.cpp @@ -13,6 +13,7 @@ #include "cargotype.h" #include "core/bitmath_func.hpp" #include "newgrf_cargo.h" +#include "string_func.h" #include "strings_func.h" #include "core/sort_func.hpp" diff --git a/src/group_gui.cpp b/src/group_gui.cpp index 6cbd89920c..060cd5c3b2 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -15,6 +15,7 @@ #include "vehicle_gui.h" #include "vehicle_base.h" #include "group.h" +#include "string_func.h" #include "strings_func.h" #include "window_func.h" #include "vehicle_func.h" diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 66eff8fdb5..8380b47822 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -25,6 +25,7 @@ #include "../company_gui.h" #include "../core/random_func.hpp" #include "../date_func.h" +#include "../gfx_func.h" #include "../gui.h" #include "../rev.h" #include "network.h" @@ -152,6 +153,12 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::CloseConnection(NetworkRecvSta this->SendPackets(true); + /* Wait a number of ticks so our leave message can reach the server. + * This is especially needed for Windows servers as they seem to get + * the "socket is closed" message before receiving our leave message, + * which would trigger the server to close the connection as well. */ + CSleep(3 * MILLISECONDS_PER_TICK); + delete this->GetInfo(); delete this; diff --git a/src/string_func.h b/src/string_func.h index 27cff81f7d..1fb58b46a3 100644 --- a/src/string_func.h +++ b/src/string_func.h @@ -210,4 +210,6 @@ char *strndup(const char *s, size_t len); char *strcasestr(const char *haystack, const char *needle); #endif /* strcasestr is available */ +int strnatcmp(const char *s1, const char *s2); + #endif /* STRING_FUNC_H */ diff --git a/src/strings_func.h b/src/strings_func.h index 8595a84f72..a85be95666 100644 --- a/src/strings_func.h +++ b/src/strings_func.h @@ -111,6 +111,4 @@ struct StringIDCompare void CheckForMissingGlyphsInLoadedLanguagePack(); -int strnatcmp(const char *s1, const char *s2); - #endif /* STRINGS_FUNC_H */ diff --git a/src/table/bridge_land.h b/src/table/bridge_land.h index 9bc0738d59..ca0b9411cc 100644 --- a/src/table/bridge_land.h +++ b/src/table/bridge_land.h @@ -549,36 +549,36 @@ static const PalSpriteID _bridge_sprite_table_11_2[] = { }; static const PalSpriteID _bridge_sprite_table_12_0[] = { - { 0xA0B, PALETTE_TO_STRUCT_GREY }, { 0xA01, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, - { 0xA0C, PALETTE_TO_STRUCT_GREY }, { 0xA02, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, - { 0xA11, PALETTE_TO_STRUCT_GREY }, { 0xA01, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, - { 0xA12, PALETTE_TO_STRUCT_GREY }, { 0xA02, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, - { 0xA17, PALETTE_TO_STRUCT_GREY }, { 0xA01, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, - { 0xA18, PALETTE_TO_STRUCT_GREY }, { 0xA02, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, - { 0xA1D, PALETTE_TO_STRUCT_GREY }, { 0xA01, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, - { 0xA1E, PALETTE_TO_STRUCT_GREY }, { 0xA02, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, + { 0xA0B, PALETTE_TO_STRUCT_CONCRETE }, { 0xA01, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, + { 0xA0C, PALETTE_TO_STRUCT_CONCRETE }, { 0xA02, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, + { 0xA11, PALETTE_TO_STRUCT_CONCRETE }, { 0xA01, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, + { 0xA12, PALETTE_TO_STRUCT_CONCRETE }, { 0xA02, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, + { 0xA17, PALETTE_TO_STRUCT_CONCRETE }, { 0xA01, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, + { 0xA18, PALETTE_TO_STRUCT_CONCRETE }, { 0xA02, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, + { 0xA1D, PALETTE_TO_STRUCT_CONCRETE }, { 0xA01, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, + { 0xA1E, PALETTE_TO_STRUCT_CONCRETE }, { 0xA02, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, { 0x0, PAL_NONE }, }; static const PalSpriteID _bridge_sprite_table_12_1[] = { - { 0xA09, PALETTE_TO_STRUCT_GREY }, { 0x9FF, PALETTE_TO_STRUCT_GREY }, { 0xA05, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA0E, PALETTE_TO_STRUCT_GREY }, { 0xA04, PALETTE_TO_STRUCT_GREY }, { 0xA08, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA0F, PALETTE_TO_STRUCT_GREY }, { 0x9FF, PALETTE_TO_STRUCT_GREY }, { 0xA05, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA14, PALETTE_TO_STRUCT_GREY }, { 0xA04, PALETTE_TO_STRUCT_GREY }, { 0xA08, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA15, PALETTE_TO_STRUCT_GREY }, { 0x9FF, PALETTE_TO_STRUCT_GREY }, { 0xA05, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA1A, PALETTE_TO_STRUCT_GREY }, { 0xA04, PALETTE_TO_STRUCT_GREY }, { 0xA08, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA1B, PALETTE_TO_STRUCT_GREY }, { 0x9FF, PALETTE_TO_STRUCT_GREY }, { 0xA05, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA20, PALETTE_TO_STRUCT_GREY }, { 0xA04, PALETTE_TO_STRUCT_GREY }, { 0xA08, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, + { 0xA09, PALETTE_TO_STRUCT_CONCRETE }, { 0x9FF, PALETTE_TO_STRUCT_CONCRETE }, { 0xA05, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA0E, PALETTE_TO_STRUCT_CONCRETE }, { 0xA04, PALETTE_TO_STRUCT_CONCRETE }, { 0xA08, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA0F, PALETTE_TO_STRUCT_CONCRETE }, { 0x9FF, PALETTE_TO_STRUCT_CONCRETE }, { 0xA05, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA14, PALETTE_TO_STRUCT_CONCRETE }, { 0xA04, PALETTE_TO_STRUCT_CONCRETE }, { 0xA08, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA15, PALETTE_TO_STRUCT_CONCRETE }, { 0x9FF, PALETTE_TO_STRUCT_CONCRETE }, { 0xA05, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA1A, PALETTE_TO_STRUCT_CONCRETE }, { 0xA04, PALETTE_TO_STRUCT_CONCRETE }, { 0xA08, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA1B, PALETTE_TO_STRUCT_CONCRETE }, { 0x9FF, PALETTE_TO_STRUCT_CONCRETE }, { 0xA05, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA20, PALETTE_TO_STRUCT_CONCRETE }, { 0xA04, PALETTE_TO_STRUCT_CONCRETE }, { 0xA08, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, }; static const PalSpriteID _bridge_sprite_table_12_2[] = { - { 0xA0A, PALETTE_TO_STRUCT_GREY }, { 0xA00, PALETTE_TO_STRUCT_GREY }, { 0xA06, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA0D, PALETTE_TO_STRUCT_GREY }, { 0xA03, PALETTE_TO_STRUCT_GREY }, { 0xA07, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA10, PALETTE_TO_STRUCT_GREY }, { 0xA00, PALETTE_TO_STRUCT_GREY }, { 0xA06, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA13, PALETTE_TO_STRUCT_GREY }, { 0xA03, PALETTE_TO_STRUCT_GREY }, { 0xA07, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA16, PALETTE_TO_STRUCT_GREY }, { 0xA00, PALETTE_TO_STRUCT_GREY }, { 0xA06, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA19, PALETTE_TO_STRUCT_GREY }, { 0xA03, PALETTE_TO_STRUCT_GREY }, { 0xA07, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA1C, PALETTE_TO_STRUCT_GREY }, { 0xA00, PALETTE_TO_STRUCT_GREY }, { 0xA06, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, - { 0xA1F, PALETTE_TO_STRUCT_GREY }, { 0xA03, PALETTE_TO_STRUCT_GREY }, { 0xA07, PALETTE_TO_STRUCT_GREY }, { 0x0, PAL_NONE }, + { 0xA0A, PALETTE_TO_STRUCT_CONCRETE }, { 0xA00, PALETTE_TO_STRUCT_CONCRETE }, { 0xA06, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA0D, PALETTE_TO_STRUCT_CONCRETE }, { 0xA03, PALETTE_TO_STRUCT_CONCRETE }, { 0xA07, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA10, PALETTE_TO_STRUCT_CONCRETE }, { 0xA00, PALETTE_TO_STRUCT_CONCRETE }, { 0xA06, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA13, PALETTE_TO_STRUCT_CONCRETE }, { 0xA03, PALETTE_TO_STRUCT_CONCRETE }, { 0xA07, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA16, PALETTE_TO_STRUCT_CONCRETE }, { 0xA00, PALETTE_TO_STRUCT_CONCRETE }, { 0xA06, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA19, PALETTE_TO_STRUCT_CONCRETE }, { 0xA03, PALETTE_TO_STRUCT_CONCRETE }, { 0xA07, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA1C, PALETTE_TO_STRUCT_CONCRETE }, { 0xA00, PALETTE_TO_STRUCT_CONCRETE }, { 0xA06, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, + { 0xA1F, PALETTE_TO_STRUCT_CONCRETE }, { 0xA03, PALETTE_TO_STRUCT_CONCRETE }, { 0xA07, PALETTE_TO_STRUCT_CONCRETE }, { 0x0, PAL_NONE }, }; static const PalSpriteID * const _bridge_sprite_table_archgirder[] = { @@ -790,7 +790,7 @@ const BridgeSpec _orig_bridge[] = { MBR(2005, 2, 0xFFFF, 380, 512, 0xA28, PALETTE_TO_STRUCT_YELLOW, STR_BRIDGE_NAME_TUBULAR_STEEL, STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL, STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL), - MBR(2010, 2, 0xFFFF, 510, 608, 0xA28, PALETTE_TO_STRUCT_GREY, + MBR(2010, 2, 0xFFFF, 510, 608, 0xA28, PALETTE_TO_STRUCT_CONCRETE, STR_BRIDGE_TUBULAR_SILICON, STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL, STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL) }; diff --git a/src/town_gui.cpp b/src/town_gui.cpp index 76b89e2cc4..e32a1fd63e 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -18,6 +18,7 @@ #include "company_base.h" #include "company_gui.h" #include "network/network.h" +#include "string_func.h" #include "strings_func.h" #include "sound_func.h" #include "economy_func.h" diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index 67dca1cd4f..15865a3594 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -11,6 +11,7 @@ #include "../stdafx.h" #include "../window_gui.h" +#include "../string_func.h" #include "../strings_func.h" #include "../window_func.h" #include "dropdown_type.h"