diff --git a/media/baseset/openttd.grf b/media/baseset/openttd.grf index 4464c415f3..ed897ecd4e 100644 Binary files a/media/baseset/openttd.grf and b/media/baseset/openttd.grf differ diff --git a/media/baseset/openttd.grf.hash b/media/baseset/openttd.grf.hash index f940ca5d62..9c734c87a4 100644 --- a/media/baseset/openttd.grf.hash +++ b/media/baseset/openttd.grf.hash @@ -1 +1 @@ -b779126d7cd1567eb09a0a7871f70a71 +c56aad31380c077d619e124bd87c8270 diff --git a/media/baseset/openttd/CMakeLists.txt b/media/baseset/openttd/CMakeLists.txt index a7d768326e..5a37b35148 100644 --- a/media/baseset/openttd/CMakeLists.txt +++ b/media/baseset/openttd/CMakeLists.txt @@ -33,6 +33,7 @@ if(GRFCODEC_FOUND) ${CMAKE_CURRENT_SOURCE_DIR}/aqueduct.png ${CMAKE_CURRENT_SOURCE_DIR}/autorail.png ${CMAKE_CURRENT_SOURCE_DIR}/bridge_decks.png + ${CMAKE_CURRENT_SOURCE_DIR}/bridge_decks_toyland.png ${CMAKE_CURRENT_SOURCE_DIR}/canals.png ${CMAKE_CURRENT_SOURCE_DIR}/canal_locks.png ${CMAKE_CURRENT_SOURCE_DIR}/chars.png diff --git a/media/baseset/openttd/bridge_decks.nfo b/media/baseset/openttd/bridge_decks.nfo index beced3f59f..b7edf0f143 100644 --- a/media/baseset/openttd/bridge_decks.nfo +++ b/media/baseset/openttd/bridge_decks.nfo @@ -4,6 +4,7 @@ // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . // -1 * 0 0C "Bridge decks" + -1 * 0 07 83 01 \7= 03 19 -1 * 3 05 1B 18 -1 sprites/bridge_decks.png 8bpp 96 16 64 31 -31 0 normal @@ -34,3 +35,36 @@ -1 sprites/bridge_decks.png 8bpp 256 181 64 23 -31 0 normal -1 sprites/bridge_decks.png 8bpp 336 181 64 23 -31 0 normal -1 sprites/bridge_decks.png 8bpp 416 181 64 39 -31 -8 normal + +// Toyland bridge decks, skip if not toyland. + -1 * 0 07 83 01 \7! 03 19 + -1 * 3 05 1B 18 + + -1 sprites/bridge_decks_toyland.png 8bpp 96 16 64 31 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 16 16 64 31 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 176 16 64 39 -31 -8 normal + -1 sprites/bridge_decks_toyland.png 8bpp 256 16 64 23 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 336 16 64 23 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 416 16 64 39 -31 -8 normal + + -1 sprites/bridge_decks_toyland.png 8bpp 96 71 64 31 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 16 71 64 31 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 176 71 64 39 -31 -8 normal + -1 sprites/bridge_decks_toyland.png 8bpp 256 71 64 23 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 336 71 64 23 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 416 71 64 39 -31 -8 normal + + -1 sprites/bridge_decks_toyland.png 8bpp 96 126 64 31 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 16 126 64 31 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 176 126 64 39 -31 -8 normal + -1 sprites/bridge_decks_toyland.png 8bpp 256 126 64 23 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 336 126 64 23 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 416 126 64 39 -31 -8 normal + +// X and Y axis are swapped for road surface. + -1 sprites/bridge_decks_toyland.png 8bpp 16 181 64 31 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 96 181 64 31 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 176 181 64 39 -31 -8 normal + -1 sprites/bridge_decks_toyland.png 8bpp 256 181 64 23 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 336 181 64 23 -31 0 normal + -1 sprites/bridge_decks_toyland.png 8bpp 416 181 64 39 -31 -8 normal diff --git a/media/baseset/openttd/bridge_decks_toyland.png b/media/baseset/openttd/bridge_decks_toyland.png new file mode 100644 index 0000000000..0c1495d766 Binary files /dev/null and b/media/baseset/openttd/bridge_decks_toyland.png differ