diff options
| -rw-r--r-- | bin/baseset/openttd.grf | bin | 825364 -> 825565 bytes | |||
| -rw-r--r-- | bin/baseset/orig_dos.obg | 2 | ||||
| -rw-r--r-- | bin/baseset/orig_dos_de.obg | 2 | ||||
| -rw-r--r-- | bin/baseset/orig_win.obg | 2 | ||||
| -rw-r--r-- | media/extra_grf/openttdgui.nfo | 3 | ||||
| -rw-r--r-- | media/extra_grf/openttdgui.png | bin | 26280 -> 26460 bytes | |||
| -rw-r--r-- | src/smallmap_gui.cpp | 2 | ||||
| -rw-r--r-- | src/table/sprites.h | 4 |
8 files changed, 9 insertions, 6 deletions
diff --git a/bin/baseset/openttd.grf b/bin/baseset/openttd.grf Binary files differindex 86b70789f..5ee311580 100644 --- a/bin/baseset/openttd.grf +++ b/bin/baseset/openttd.grf diff --git a/bin/baseset/orig_dos.obg b/bin/baseset/orig_dos.obg index 22bc6d703..202a2ad35 100644 --- a/bin/baseset/orig_dos.obg +++ b/bin/baseset/orig_dos.obg @@ -70,7 +70,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8 TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6 -OPENTTD.GRF = 63d40d4bc6cfb3546cab72d94614e6cd +OPENTTD.GRF = 75a93cea2ed455c2fd5dcbda39e53538 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/bin/baseset/orig_dos_de.obg b/bin/baseset/orig_dos_de.obg index 65c3aa37d..223f027df 100644 --- a/bin/baseset/orig_dos_de.obg +++ b/bin/baseset/orig_dos_de.obg @@ -70,7 +70,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8 TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGT.GRF = fcde1d7e8a74197d72a62695884b909e -OPENTTD.GRF = 63d40d4bc6cfb3546cab72d94614e6cd +OPENTTD.GRF = 75a93cea2ed455c2fd5dcbda39e53538 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/bin/baseset/orig_win.obg b/bin/baseset/orig_win.obg index 2e16a4df0..e671804e6 100644 --- a/bin/baseset/orig_win.obg +++ b/bin/baseset/orig_win.obg @@ -70,7 +70,7 @@ TRGIR.GRF = 0c2484ff6be49fc63a83be6ab5c38f32 TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1 TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8 -OPENTTD.GRF = 63d40d4bc6cfb3546cab72d94614e6cd +OPENTTD.GRF = 75a93cea2ed455c2fd5dcbda39e53538 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/media/extra_grf/openttdgui.nfo b/media/extra_grf/openttdgui.nfo index 1d96de855..1b17b8651 100644 --- a/media/extra_grf/openttdgui.nfo +++ b/media/extra_grf/openttdgui.nfo @@ -7,7 +7,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 <http://www.gnu.org/licenses/>. // -1 * 0 0C "OpenTTD GUI graphics" - -1 * 3 05 15 \b 174 // OPENTTD_SPRITE_COUNT + -1 * 3 05 15 \b 175 // OPENTTD_SPRITE_COUNT -1 sprites/openttdgui.png 8bpp 66 8 64 31 -31 7 normal -1 sprites/openttdgui.png 8bpp 146 8 64 31 -31 7 normal -1 sprites/openttdgui.png 8bpp 226 8 64 31 -31 7 normal @@ -182,3 +182,4 @@ -1 sprites/openttdgui.png 8bpp 414 440 20 20 0 0 normal -1 sprites/openttdgui.png 8bpp 440 440 20 20 0 0 normal -1 sprites/openttdgui.png 8bpp 466 440 20 20 0 0 normal + -1 sprites/openttdgui.png 8bpp 490 440 20 20 0 0 normal diff --git a/media/extra_grf/openttdgui.png b/media/extra_grf/openttdgui.png Binary files differindex 6f011b654..28ad2fbaf 100644 --- a/media/extra_grf/openttdgui.png +++ b/media/extra_grf/openttdgui.png diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 40109a907..8e53ade6f 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -1725,7 +1725,7 @@ static const NWidgetPart _nested_smallmap_bar[] = { NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_TOGGLETOWNNAME), SetDataTip(SPR_IMG_TOWN, STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF), SetFill(1, 1), NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_LINKSTATS), - SetDataTip(SPR_IMG_GRAPHS, STR_SMALLMAP_TOOLTIP_SHOW_LINK_STATS_ON_MAP), SetFill(1, 1), + SetDataTip(SPR_IMG_CARGOFLOW, STR_SMALLMAP_TOOLTIP_SHOW_LINK_STATS_ON_MAP), SetFill(1, 1), NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_ROUTES), SetDataTip(SPR_IMG_SHOW_ROUTES, STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON), SetFill(1, 1), NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_VEGETATION), diff --git a/src/table/sprites.h b/src/table/sprites.h index 576ffb88c..5d42caccb 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -56,7 +56,7 @@ static const SpriteID SPR_LARGE_SMALL_WINDOW = 682; /** Extra graphic spritenumbers */ static const SpriteID SPR_OPENTTD_BASE = 4896; -static const uint16 OPENTTD_SPRITE_COUNT = 174; +static const uint16 OPENTTD_SPRITE_COUNT = 175; /* Halftile-selection sprites */ static const SpriteID SPR_HALFTILE_SELECTION_FLAT = SPR_OPENTTD_BASE; @@ -159,6 +159,8 @@ static const SpriteID SPR_IMG_DELETE_RIGHT = SPR_OPENTTD_BASE + 167; static const SpriteID SPR_WINDOW_DEFSIZE = SPR_OPENTTD_BASE + 168; +static const SpriteID SPR_IMG_CARGOFLOW = SPR_OPENTTD_BASE + 174; + static const SpriteID SPR_SIGNALS_BASE = SPR_OPENTTD_BASE + OPENTTD_SPRITE_COUNT; static const uint16 PRESIGNAL_SPRITE_COUNT = 48; static const uint16 PRESIGNAL_AND_SEMAPHORE_SPRITE_COUNT = 112; |
