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 ycmZ2IRenvIJPQlM|DBC2tt^bKEKIE|%&jaeTUl7AvvMcJVUyDIowhTn$P9 delta 1979 zcmZ`)zi-q?6yEWSC+t2amPKR`=z!Iou3>eQX*nTLK_n#pfQzpHBorY|*PeAnxRg=M zt(=aIk)T*z6tAl#rK^?8>2AvRUxYWivrfQXOJ2=d@5lGP_q{it-`)N6?_D8!7yth) z4g@<8-hto;LYxWz{eHUDy9ge?-g|NH#oN6%FJJxs2k%|@+duu*W7nW(A09;!@>8-#UpP;B>c2dR|RKxln?o4*uo-m!N9QcgR2RtKqL;ZmqaDBai+E8 z#f(bYAiF4<&2;}9s<^&WLv_D~^HCR}{-QGEEHqFB8tR)h_~c&{dZ-8Ve}Hk9pCF46 zg=Z-tDlO!cO1IqT&dzaiXsWteA#uB&c_7P>IGE3q2(OheiS-W(^oS+OQu_^m=}KOL zd@{loh6`*iK^vM#7J4+YVbqY0xwEPQgPlXsg)EoSo$i!feA>0!?KIwRLYQ1*bpUxzX*@iRUCLlRso5Sep#po zW;E$?m%Nz)YN#vR^4zeqMt8NeV#qLU)UcNE6#=Wd6y))xF!D~NNrJLq)PVQpOKqnI z)DUAeDq~Jfsh+uxq*peKomeVo!SMQty@Wv(JJ448jXBpew z(v{Y#bVgI*MCx4Ei_~rb(vr^#1G=xlTsJoq91YiqC(BYd$JEkBNo!iVYz=bK!++-i zf(h_8n<=P={;_@Zj$T9Fs(6}+-M@A<5Sih}2OsT5PdB3Ih@M}JUxNv|$zMSu@*ItJ z`nnf7r)#QNSywL(CxGwdk-FQ>ALk1LMiAJz+N2_L4D>Bw*JQOxdv>!1eXFarenuAr u(I~U!O0^p`p2XGtqt4~cPft%9fZ^8a+Bh89{qRq|@6#)%`ToZH=U)MhzGTw? 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 zcmXX_eQ;8D7QG2<$|%+6h)N>HS7m0INENd$E@RpFl9Eayx=*DIt!S{)6fHYqq%AdU zg37E|iNOSG;$TCSsaUDf)>zs`jmjF<(ikI?(0o)hW|G)6-ybCT1r}%b&Y64e%(;J@ zxpVGuYRkr#=cLR5fR}S6;%xvlJU-(LTD*6@(cciKgoE2QX2X?6PG4LFN-E0%h+!Cp zL$#wC2AQX=88^xikcr3k; zXOWT)mC|cAb9rI`AtOl@Md?&3v&rOiyX%9&Fps4r`BpjUR!e<)dDx;x4l}BAAz*8O zYXZUn5-%u&Y<-8&+ADVr8GWcOj4)EkrZhaIp3s^oi$mwGw+A``L&!}KL4rVWsN~3M zKwbw5`O#Rvgr!yREn2b5qVl=SVZSHR4InchC!l&j z9e@x7%#3GNI7Jp(fc&@9YGAsU02l+Doa*;WbR(a4%B zO5zrg43HX-0gw%l8;}pkc$xtO0w77CD2T-X7i+l^9Z#y~QwD*|C{bBeCRb<-DUD9C z(h`fse$LpBUe(fPxHNRO=xIBKk=)j3sXt;Ad zzAuStjGvpE(Z_=9yqXM{gDStB-Pb)bajyJoFm|4KzL3|=yuA7L=FY5;oYFk_@jD_f zaqA#{_mv+`&AaVPJ>NZjwseYl^~@&V4L=;2I5B{mUNe7tIt!zdxH=hc-tw(2{zd3$=IOYED2Rlm&J|Fz* zSoepWhkmlP?rMLye02ZO=|!c#{X4(?tv!ZH{U?UPM{h6PUvuN0o?rfF_aGXb*!kWU zH~iNPq7|jPOWTIi9~CYAY_hDUp>lHnVD}$)iOdhajFuky`X%cH+B1DJ-tfj`?W!c_ z(g8khxZ|!Jg#&ZZ8d~$$Yb(F$p^c2B&$ZsHeKR^pwlRaqtHeyl+!7q9l-AAXW~z$ELlG&i|)W)JesL>67A~$EFz$x==ub1VheLe-aPBYzR||nyFJH5MgvVV zf8nwf)yzB7w@xyPSn1|Oe@nu08DSetMinimalSize(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. */