From 3d3ed87d99a6f7de2ae0dfbf9a192f2ecd2a123f Mon Sep 17 00:00:00 2001
From: Michael Lutz <michi@icosahedron.de>
Date: Mon, 26 Dec 2022 00:03:39 +0100
Subject: [PATCH] Fix: Bad alignment of button icons when using the original
 baseset. (#10200)

---
 media/baseset/orig_extra.grf               | Bin 328676 -> 329463 bytes
 media/baseset/orig_extra/fix_gui_icons.nfo |  12 ++++++++++++
 media/baseset/orig_extra/fix_gui_icons.png | Bin 0 -> 1493 bytes
 media/baseset/orig_extra/orig_extra.nfo    |   1 +
 4 files changed, 13 insertions(+)
 create mode 100644 media/baseset/orig_extra/fix_gui_icons.nfo
 create mode 100644 media/baseset/orig_extra/fix_gui_icons.png

diff --git a/media/baseset/orig_extra.grf b/media/baseset/orig_extra.grf
index 728a8b2555bb3de7506193ed1124209dafa33ad7..881c4631cec0aeb0ccd4b64bef6b8fcb520be2d4 100644
GIT binary patch
delta 791
zcmaFTF7mxsgoTCS|EETlRu;xq7N%Af=2jM#tt_m!m@VZQ{`0tHRwyLqWTxlkrskC>
z<fkblm6nv`=P6_+=jRpcaWnkqVrIO<#Q2Db@fp($Mn@451_lO($%^+S>pL1BOkieY
zWPHK=fNg^?*RkU#PM$gq0uMxQ$S^YQ5Pl%S!r0K<@<L>XFyomABFxP#tuHiKj~zRH
z{P+uIrV}S0XfU_5iaroIAk28`fz1PUHb%x%XU?2?!OVR2?2HEiFY;L!xwuX~C}BBu
z^5p3oA}@rQ8QC}<h_IeI$;f!}hI$1XBO?bJBin^7FSssjVP<4wIk9&G*NYn)9(7ji
zY)5vhc>RhZR;Iwfz~~n&OaV*>+L;0aUI=r>1jhuM2gd{k-VkSGdLhga9c&&O7i%8-
zK#VcqfiPph3t{fqc-dIlxY*!e^XL~&57gLVWMyOH<6elfnFj~UMhCu#XN-Q~#T0M;
zK%L1v=0zw|O!N(PwwM<4IP>5a!c4(2FQQ&Fy^wiOFUK4c9sQz$B|11d_<=7|OUw)R
z7dkJ*Kq{;stbL%&82o^ZIXJlGg)C#>gU$z{OfkVP*k1%NMn5=zW7CVO7Y;8<Up#!V
zfid6(^MgAt^d5YCAo$`KBh!l=4`d%G-r!+GL=6Ko0|Ubg<_l~Kcse9H)R_YU0$#Ax
zU*I|*#F+F#lqn$Tg6s)t#>5+9jLA0)8Dmc9-w<O=JfXp8en8}b9b@8+2<8~sm={wx
zBqSu+BomX8U)Zn)L<a;!ztH5AkYZAfVUtWsd{ObDfj2r>mVrr%Nh(S?CR*}A&x>Rp
z^I&s{NTw($<tV9`9U>et=8+Ovl9Ey{v>5B94y5n~OG;!(Nl7Y6NwG;vzS#02g)iD%
zLV`&`QYkW0N;y~ZKmfa}q@<)0oALu;M#&osSc8LO%(Gt1V^xxhl8m}h!ORd4^J4ys
zjqDPV5=u(BxhEyKV;Hg|n3yD`*p%2_oW7aPl9|bn`6Bs61uI*Olv3^m5tb|liOd(m
QEPT;YV0VDhE&~Gt04bvuUH||9

delta 37
pcmey~EApgWgoTCS|Jz2ERu;xq7N%Af=2jM#tt_m!nAsS>008R%319#K

diff --git a/media/baseset/orig_extra/fix_gui_icons.nfo b/media/baseset/orig_extra/fix_gui_icons.nfo
new file mode 100644
index 0000000000..2fdb8880bd
--- /dev/null
+++ b/media/baseset/orig_extra/fix_gui_icons.nfo
@@ -0,0 +1,12 @@
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// 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 "Fix alignment of button icons."
+
+// Fix alignment of button icons.
+   -1 * 11	 0A 03 01 DC 02 01 E2 02 01 E6 02
+   -1 sprites/fix_gui_icons.png 8bpp   8  13  20  20  0  0 normal nocrop
+   -1 sprites/fix_gui_icons.png 8bpp  40  13  20  20  0  0 normal nocrop
+   -1 sprites/fix_gui_icons.png 8bpp  72  13  20  20  0  0 normal nocrop
diff --git a/media/baseset/orig_extra/fix_gui_icons.png b/media/baseset/orig_extra/fix_gui_icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..0630179616f43a479145cfe056ec48d1d03257fe
GIT binary patch
literal 1493
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
GGywqboTbA6

literal 0
HcmV?d00001

diff --git a/media/baseset/orig_extra/orig_extra.nfo b/media/baseset/orig_extra/orig_extra.nfo
index 903d96a572..e6ecca8a00 100644
--- a/media/baseset/orig_extra/orig_extra.nfo
+++ b/media/baseset/orig_extra/orig_extra.nfo
@@ -83,3 +83,4 @@
 #include "rivers/arctic.nfo"
 #include "rivers/tropic.nfo"
 #include "rivers/toyland.nfo"
+#include "fix_gui_icons.nfo"