From f4e2a462fe92152b3079eacf62f4f334481500d3 Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 26 Sep 2022 17:09:30 +0200 Subject: [PATCH] Cleanup: Remove unused flag sprites. --- media/baseset/openttd.grf | Bin 510635 -> 508716 bytes media/baseset/openttd/flags.nfo | 43 ------------------------------ media/baseset/openttd/flags.png | Bin 1763 -> 0 bytes media/baseset/openttd/openttd.nfo | 1 - src/network/network_gui.cpp | 3 +-- src/newgrf.cpp | 2 +- src/table/sprites.h | 6 +---- 7 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 media/baseset/openttd/flags.nfo delete mode 100644 media/baseset/openttd/flags.png diff --git a/media/baseset/openttd.grf b/media/baseset/openttd.grf index 837e4b12d2553699331ad6ba878d38afda6aa109..e3ebf2dd675589b31cdab66116ae5db1d72520bf 100644 GIT binary patch delta 44 zcmZ2IRenvIJPQlM|DBC2tt^bKEKIE|%&jaeTUl7ABJPQlM|ND(Btt^bKEKIE|%&jaeTUl7AHf_d?886r#a5K()!Ob}H1UJ*PnJ-vQh%wIG zA@+jjgyIE-7v>xMFm-Zo-@anf_DL(YZxf)R{c``pg|F&)0 zR&aNSbtrb|tnkHDRnL6x+&PdTj7cxJS@(g!3vR}w7hKGfC-cAHc_GHSZy*2U$q%?0 zlQt->FlS0i0)+*pIn4b0{2*h%ZiE}Tf}14?>R_fM!5!R~?ySGS#=LFcwinFo+qP{J z6x_G(2Im3p6Ji(SE^wdFzQBDz2U~!$f_?UanUVhi_X(aG+!rJ+aIUSG3a=Mz zFSuF3$@K;Q1MU}GOxq@(;AWmYdGZNvM*bUI4|FzQ)6T{W&jYN2f>4ix!WkYqIMUq( zHc(=i{GuM78gPazJ2=$4jz*5b6=|N zNOL_iRPW>$$}iL&fU*uZwyeX(&krh1UNFDlW|}L@6X{UNAEY3T`^U^Md;U&kJeB zeJi*xD6&ohfg9#GxL#llJecQia5MYW`Q6}V8}fE6(Ezu;z^c7m5# zP;kZzo*Pmupknd_?*r}=ycf7{NTKM3X`RduN=eLYlR;|1wLpj12C);`6R;NE%$qlF fhC7g-4_0k-=zz+H_8EDs?KAS&w$I38pArH9jlN{l diff --git a/media/baseset/openttd/flags.nfo b/media/baseset/openttd/flags.nfo deleted file mode 100644 index 3c125ec79a..0000000000 --- a/media/baseset/openttd/flags.nfo +++ /dev/null @@ -1,43 +0,0 @@ -// 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 . -// - -1 * 0 0C "Flag graphics" - -1 * 3 05 14 24 - -1 sprites/flags.png 8bpp 34 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 50 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 66 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 82 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 98 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 114 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 130 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 146 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 162 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 178 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 194 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 210 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 226 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 242 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 258 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 274 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 290 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 306 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 322 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 338 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 354 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 370 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 386 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 402 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 418 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 434 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 450 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 466 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 482 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 498 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 514 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 530 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 546 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 562 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 578 8 11 8 0 0 normal - -1 sprites/flags.png 8bpp 594 8 11 8 0 0 normal diff --git a/media/baseset/openttd/flags.png b/media/baseset/openttd/flags.png deleted file mode 100644 index 2e0401ffce5ca5255c45c91e645da4e53e2649cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1763 zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYU{K&-W?*2r>-Oe20|NtNage(c!@6@aFBuq^ z83KGlTp1Yt3kV1(C@2^h7&tgM1Ox=6q@cI-HD;>3*`H(tDW z@#oJU6B`c~pO}b*f}E0;mYx}N7OdH@kDV>^bn~0>hsdHh=y!_-HUB*l?6Y$aIug%;^Z&Fem58mJSyQh6Ej!1{aPw2?9GR zB(BU+c(Fs^&lQG0KN|l0IiSG8;2^>gA|sHaBhz4^F~!4TMU2mmoQNY0Iaj7MaF{R% zI4~##uoxt;I27=Nw1{L(k!e_=BV!_=Jof8TY3>GpB9vUnWCOjDq5;Y+@Jvj~w8X|l&1QJXnN?bHL zLM)afIP540IMa}DWlF(=6%B9pObL)-Nzo9gu+Zr7aafR&u%n|xMZ?9wB*eiXB_N*J$sZGw zKPeG^Ce-}dvEa{*6Mw$E@enD9(dj90S<#bnWJSk=6B~Y9*zy0xg+De73^5E04Gatm z7#NN)Fg##j_`|^PCxGEk4#S@ghCfRf{v2TVbBE#2ABHm>98V^&{F%e>XM@3?BPoAw z%;1oS;8DpCF{zPp>CuQ;Vo|ZjW5$h?H4kFunB;75s5#*?;X%xUFMm$F`LX5Bo0dH{ zB4(`l!tmuQ!`E*N-@Y?^|H1I%C&SNQ48MLe{Qkr6=P$$Ge+>WrGyM0F;KGcXt!FgQ3c1Ozbr|IeV{QlR2d zqTy4a6HsFi(%_LYA*E%-jW2%^8kV>u^!)$-|8%(bLIwuriJmTwAr-gY&b(cC+d#lI zTr}Z|$0esr4b>dgC-SpCa2QLiWcq!3X28Em!Hv<24zjxxFurL@oD=bAZ(UEgf>`(Q zgG?r-0xYSno&6p)Z64c%&rg05ukC-_S>;>jlus$g(|?Gc`n_yw(WO`Br~lMH__0n- zpeuYwm?zr;2G5m$Q*2bu1uQ7i`uD&0{V|5jDYCXq zPG>EO{|0M0MNMM#m|OoV`M)c}>aSCa3cLT`_;}Y!A&V{GT+9*+71Ng@3{GD2O&PfU zOy2Z2>*=R&bNkm{`M-!~QJTh6p4GkweeXKnhzQ6zziYFJ7gOMSg~N(FC-NO!BDd)2 zuUYj!dDc(&X3+R}@zb~NcM2`m9h;^)3a~gRWJoI94h+u>510GD_4aoD6LtITW%%BG zH(*$P`SH6g)i!h4svn!)xE7V{6MMb+@2k+S+dfL2dR=_CE`HwoRqanp?^f-eay{<$ zMfuP9&A&wJ?;Q=l9hO`(xuUWr?Q*1a{`|eiDs=kQ*S!Dp`CDx2!o4T9)z~Q2C)VHk zXmq(qdfNBi=f@|1&wu~)?O_wU>}CJztJbnlSj_ySLQ>(l+xM;7Y)hoy=_u43TC?>t zLm~GcedbGR4JU7W&iv_<5%+|BTQ7cNo|I|NcI3l9Kd}#!D=|1zAN@DK34XkU$;Z+RK(?q)e;ld znS8iE%j^utdZ%ieeO}Bh*T4UXdo%5a0rQ`KR*Wi4*Lb46_$DlW`T5-6!_V7o8futx z_=RPaX7U{RwZD(2NW`dv>BKe0q+6yFnU~nPf7QMHu&1b{a;njZr$1MjG`lo>Ig@tl zv1Chsd)bj7#*f+;^dIQof68-+;URY%bIbAbjD~3rOLCZ_Srz*F1t&az{!&(D;-}@3 zDOE?L`fVOFS$|fZz`_w9Af?bLYtOPo%OdG(?5(uN(-~HpIQ(e(^3Ll$$1Oo^rXzoM zW}Dvl?l=Ed{LJUU3^Gm1;`94Omp|P` z9cFUBDo#!>v9q7oFEHUZ!-Ol|6D*u%^j;@^Ef-*8>D8(}YxSx&?y=UtyU*|6+x&OZ zj}NoN|7)}?DE+rspoxKl#gTypL@^3*Fe!kN6i0)D07Ih!0~1IBN-=P-FbZ(|x?aU> Ypl7yEa#DId0|Nttr>mdKI;Vst0C>SetMinimalSize(14 + GetSpriteSize(SPR_LOCK, nullptr, ZOOM_LVL_OUT_4X).width - + GetSpriteSize(SPR_BLOT, nullptr, ZOOM_LVL_OUT_4X).width - + GetSpriteSize(SPR_FLAGS_BASE, nullptr, ZOOM_LVL_OUT_4X).width, 12); + + GetSpriteSize(SPR_BLOT, nullptr, ZOOM_LVL_OUT_4X).width, 12); leaf->SetFill(0, 1); this->Add(leaf); diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 1bc05c49b0..f52e512a0b 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -6170,7 +6170,7 @@ static const Action5Type _action5_types[] = { /* 0x11 */ { A5BLOCK_ALLOW_OFFSET, SPR_ROADSTOP_BASE, 1, ROADSTOP_SPRITE_COUNT, "Road stop graphics" }, /* 0x12 */ { A5BLOCK_ALLOW_OFFSET, SPR_AQUEDUCT_BASE, 1, AQUEDUCT_SPRITE_COUNT, "Aqueduct graphics" }, /* 0x13 */ { A5BLOCK_ALLOW_OFFSET, SPR_AUTORAIL_BASE, 1, AUTORAIL_SPRITE_COUNT, "Autorail graphics" }, - /* 0x14 */ { A5BLOCK_ALLOW_OFFSET, SPR_FLAGS_BASE, 1, FLAGS_SPRITE_COUNT, "Flag graphics" }, + /* 0x14 */ { A5BLOCK_INVALID, 0, 1, 0, "Flag graphics" }, // deprecated, no longer used. /* 0x15 */ { A5BLOCK_ALLOW_OFFSET, SPR_OPENTTD_BASE, 1, OPENTTD_SPRITE_COUNT, "OpenTTD GUI graphics" }, /* 0x16 */ { A5BLOCK_ALLOW_OFFSET, SPR_AIRPORT_PREVIEW_BASE, 1, SPR_AIRPORT_PREVIEW_COUNT, "Airport preview graphics" }, /* 0x17 */ { A5BLOCK_ALLOW_OFFSET, SPR_RAILTYPE_TUNNEL_BASE, 1, RAILTYPE_TUNNEL_BASE_COUNT, "Railtype tunnel base" }, diff --git a/src/table/sprites.h b/src/table/sprites.h index b7bb910203..16240d4bbc 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -293,12 +293,8 @@ static const uint16 TRAMWAY_SPRITE_COUNT = 119; static const SpriteID SPR_ONEWAY_BASE = SPR_TRAMWAY_BASE + TRAMWAY_SPRITE_COUNT; static const uint16 ONEWAY_SPRITE_COUNT = 6; -/** Flags sprites (in same order as enum NetworkLanguage) */ -static const SpriteID SPR_FLAGS_BASE = SPR_ONEWAY_BASE + ONEWAY_SPRITE_COUNT; -static const uint16 FLAGS_SPRITE_COUNT = 36; - /** Tunnel sprites with grass only for custom railtype tunnel. */ -static const SpriteID SPR_RAILTYPE_TUNNEL_BASE = SPR_FLAGS_BASE + FLAGS_SPRITE_COUNT; +static const SpriteID SPR_RAILTYPE_TUNNEL_BASE = SPR_ONEWAY_BASE + ONEWAY_SPRITE_COUNT; static const uint16 RAILTYPE_TUNNEL_BASE_COUNT = 16; /* 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. */