From 1423445050bc082344ad3433204372e478309cf5 Mon Sep 17 00:00:00 2001
From: richk <richk@openttd.org>
Date: Sun, 25 Jun 2006 13:42:37 +0000
Subject: [PATCH] (svn r5362) - Fix: Updated sprites in New Airports to be
 allow cleaner replacement by newgrf graphics. All tiles now use
 SPR_AIRPORT_APRON as the tarmac. Created two new sprites in airports.grf for
 half-grass half-tarmac tiles on Intercontinental airport.

---
 data/airports.grf    | Bin 9110 -> 9488 bytes
 station_cmd.c        |  18 ++++++++--
 station_map.h        |   4 ++-
 table/sprites.h      |   2 ++
 table/station_land.h |  81 +++++++++++++++++++++++++++----------------
 5 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/data/airports.grf b/data/airports.grf
index 339534afbe272c120b2dcf6c588accd451f8b8b8..8c35d18d0a6582b6d974a10b4917c14b13731765 100644
GIT binary patch
delta 990
zcmbQ{KEZ2)qhkGC22ObghKK(d7#!^w92lG!To~LKJQ%zfd>H%~0vW;?Vi}SdG8sx4
zIv8d#EN589u!Uh4!vTiF3`ZG`Gn`~N&2X0CJi|qX%M1++4G&ljaPTlRDsi_caR2|$
z-6D5`jZx+X52MrrAtrW-7ZNX|*c2PJxLL#=s4%kLkYiSC(Wrl5$iyOYgYAMjquK*!
z7DiF-jvGD?0+?GBvu=cU#IpY9Zj|NjXniqtBNNP>VRj5I4BiYO4Dk%P3^fdW42u}H
zGn{95!N9_(#OTPF%-GJjg7F07Q$|K6X(l5kccy5jT&5bPPNpeLbD5Sfwa5kC2n=kM
z@3;}19n@Yg-*G)KBs4gvQ~rf0b8txT3vT8fxsC@i4|rKZf`fW*C@}>GpWtVnAlLE2
zjyE(oBs3%>q$M;sIB3!Xea4U%)(==-sK3x*3Yz>P`~e?xXh`S_<_BRfk{PExus)&r
z!r+DD3;P$2jME=<-w0w34QY9h@xbDNB=an}h!^u7s65cFf8hSW>V`j4(3}Sy52ikd
zKT&l<;l@_Rxi9Xm@VlY<Ao;`<#sx1Py;yJ~<bvso1B@*XroPyJ<0|8#7uAd%FC{J{
zoH%`8_lc)0^W`Ht9vnO{tHYH!IB4F30|%yev_FhynJwSZapU!kq>jU^v*bD=Iu1m2
z{AHYRQ}V>^nZ}G$Uj!dmS-&!waq@%J2iy-%V4U<YeuLx9os1K1{5WBA^FCwmi)RPS
zUhy+_@8W+Y!`OKv?-Bbe&j(4b3|>XDUJnckYJSkUfl#cxWME-bWOQImVr*kv&Ul>h
zDI)`u6q6y78&ech4pTK#eFxKIra4TDnOfum18)Si$^>Nx-{@$U3JMMl3B2CXDe;06
z94j)cJz_z@ArE*SC^C2Sik#qM3J!jt!8buDC^$H@B_t#yG$c6mg%@+jB!L$~j3GA^
zUO2p9d11;lneTz$ivVc6NV8n;n8x$M`i1Qc>lcPM^j|nK)z9F1An`!$K^kMr1Ctlg
z4{DfZa@?5u!sy1t7eO~N7=vGIV4BT#V(Ec7H@F`(u?7d;n9FiN_QjPO;wxfVZgebQ
zI&tK|CZ>><6WecSz2tqdin(JE!;UK#uAVr0BAG2Tq@yEZeuvuuw;Lx}gM&LF=5@3k
zXuBE1a=jyBPRHRJdvByLh6TTf@Az}m<t8grM?|OLiF+@PGDS?CnS5f`#QqcBOdSym
zcieD&F?r{`3-&Lb9sGa8in$}A`;p8co?9jlH!ybG@_5C<)DiJ2f-&foKU1^ZOJxQy
F004}^nydf-

delta 550
zcmbQ>HO+m4qat?;3#YsT!^8g!41tq3a5>axDJUp($S5deDJUu^D)dN2yx?Tadcn<}
zm6g>oK|=9?!~;pjtOw#OSqf9cUI@L=e4)dnsQAMAffkE`;tY`&DmR=SxH4wF(0w5D
zz=COx(1Y+BPB#*6D4h^wQB+tU@F4a@<BP%@><^qCG(0H0;mEXv??V2A;un)16tQF}
zL~uW-=en`+#vJB|6+91)?eKiy_hJJJ_y7Og7sPM$-PpmjhU>+t8@dmcT;OI@yrK0V
z@PW*WKa5!q&OLa?w1MNo#0Moes&7Qzh`5maQ2Rs?Q&z-FE9R^%Y!6v48eGVF$a$md
zLiUA@8x1$PZ>(Y3!E!O>gyM}qHx9fwbd&ccKa+yOgYpZS^$(UmRA<`5bZ{+W#Dm2*
zcU&mAaP8vB7gi6vPR24uJWRNGl<5G&#=9q89MIXZ<3Ipo#K99cjSmSk?O{5^$&?jw
zbLzvH58j;o_ONBA!Oj<l>|gx2rOO!cV#>*^o9hpGo;Y-K`mIR^<R50-%)EJ$G2-T|
zQ$+{<9eBs6@Z$Zcxr~Z0FI=pjc5>FCsEY=>Ry{h%7;$OkBZEgTE;d~9Jdki<^Pyc2
z!<km_ykbB2`!&mJ&j%3)ey%#iw1n@{>Bl*jPG0(X=;@_HObY}q86MhqN{un%)Wg@C
znC1xG&c3N|Vd-tgQ&~(iL{4>F(mm+)`Z3cKvCC?^-`qaSG(qBa_$Fay#U82EZy2-Q
Q@M)ZWz|<o5M2`Us0NFYgGynhq

diff --git a/station_cmd.c b/station_cmd.c
index 386a71a7ab..27e4ebbf10 100644
--- a/station_cmd.c
+++ b/station_cmd.c
@@ -1603,12 +1603,12 @@ static const byte _airport_sections_intercontinental[] = {
   	102, 120,  89,  89,  89,  89,  89,  89, 118,
   	120,  22,  22,  22,  22,  22,  22, 119, 117,
  	 87,  54,  87,   8,   8,   8,   8,  51, 117,
- 	 87,  18,  87,  85, 116, 116,   8,   9,  10,
+ 	 87, 162,  87,  85, 116, 116,   8,   9,  10,
 	 87,   8,   8,  11,  31,  11,   8, 160,  32,
 	 32, 160,   8,  11,  27,  11,   8,   8,  10,
 	 87,   8,   8,  11,  30,  11,   8,   8,  10,
-	 87, 142,   8,  11,  29,  11,  10,  12,  10,
-	 87,  58,  87,   8,   8,   8,  10,  56, 117,
+	 87, 142,   8,  11,  29,  11,  10, 163,  10,
+	 87, 164,  87,   8,   8,   8,  10,  37, 117,
   	 87, 120,  89,  89,  89,  89,  89,  89, 119,
   	121,  22,  22,  22,  22,  22,  22, 119,  37
 };
@@ -2241,6 +2241,7 @@ static void TileLoop_Station(TileIndex tile)
 		case GFX_RADAR_INTERNATIONAL_FIRST:
 		case GFX_RADAR_METROPOLITAN_FIRST:
 		case GFX_RADAR_DISTRICTWE_FIRST: // radar district W-E airport
+		case GFX_WINDSACK_INTERCON_FIRST : // for intercontinental airport
 			AddAnimatedTile(tile);
 			break;
 
@@ -2298,6 +2299,17 @@ static void AnimateTile_Station(TileIndex tile)
 			gfx = GFX_WINDSACK_FIRST;
 		}
 
+		SetStationGfx(tile, gfx);
+		MarkTileDirtyByTile(tile);
+	// handle intercontinental windsock
+	} else if (IS_BYTE_INSIDE(gfx, GFX_WINDSACK_INTERCON_FIRST, GFX_WINDSACK_INTERCON_LAST+1)) {
+		if (_tick_counter & 1)
+			return;
+
+		if (++gfx == GFX_WINDSACK_INTERCON_LAST+1) {
+			gfx = GFX_WINDSACK_INTERCON_FIRST;
+		}
+
 		SetStationGfx(tile, gfx);
 		MarkTileDirtyByTile(tile);
 	}
diff --git a/station_map.h b/station_map.h
index 9ed3de9878..0f81679673 100644
--- a/station_map.h
+++ b/station_map.h
@@ -40,7 +40,9 @@ enum {
 	GFX_RADAR_METROPOLITAN_LAST   = 113,
 	GFX_RADAR_DISTRICTWE_FIRST    = 145,
 	GFX_RADAR_DISTRICTWE_LAST     = 156,
-	GFX_BASE_END                  = 161
+	GFX_WINDSACK_INTERCON_FIRST   = 164,
+	GFX_WINDSACK_INTERCON_LAST    = 167,
+	GFX_BASE_END                  = 167
 };
 
 enum {
diff --git a/table/sprites.h b/table/sprites.h
index cbebb555ea..32b4b319c0 100644
--- a/table/sprites.h
+++ b/table/sprites.h
@@ -94,6 +94,8 @@ enum Sprites {
 	SPR_NEWHANGAR_N = SPR_AIRPORTX_BASE + 10,
 	SPR_NEWHANGAR_E = SPR_AIRPORTX_BASE + 11,
 	SPR_NEWHELIPAD = SPR_AIRPORTX_BASE + 12,
+	SPR_GRASS_RIGHT = SPR_AIRPORTX_BASE + 13,
+	SPR_GRASS_LEFT = SPR_AIRPORTX_BASE + 14,
 
 	/* Manager face sprites */
 	SPR_GRADIENT = 874, // background gradient behind manager face
diff --git a/table/station_land.h b/table/station_land.h
index 65ed12f288..0700f97b9c 100644
--- a/table/station_land.h
+++ b/table/station_land.h
@@ -983,6 +983,7 @@ static const DrawTileSeqStruct _station_display_datas_0156[] = {
 // helipad for helistation
 // concrete underground
 static const DrawTileSeqStruct _station_display_datas_0157[] = {
+	{  0,  1,  2, 16, 11, 40, SPR_NEWHELIPAD },
 	{ 15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, // fences west
 	{  0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, // fences south
 	TILE_SEQ_END()
@@ -991,6 +992,7 @@ static const DrawTileSeqStruct _station_display_datas_0157[] = {
 // helipad for helistation
 // concrete underground
 static const DrawTileSeqStruct _station_display_datas_0158[] = {
+	{  0,  1,  2, 16, 11, 40, SPR_NEWHELIPAD },
 	{ 15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, // fences west
 	{  0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, // fences north
 	TILE_SEQ_END()
@@ -999,6 +1001,7 @@ static const DrawTileSeqStruct _station_display_datas_0158[] = {
 // helipad for helistation
 // concrete underground
 static const DrawTileSeqStruct _station_display_datas_0159[] = {
+	{  0,  1,  2, 16, 11, 40, SPR_NEWHELIPAD },
 	{  0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, // fences north
 	TILE_SEQ_END()
 };
@@ -1016,6 +1019,18 @@ static const DrawTileSeqStruct _station_display_datas_0161[] = {
 	TILE_SEQ_END()
 };
 
+// half grass half SPR_AIRPORT_APRON
+static const DrawTileSeqStruct _station_display_datas_0162[] = {
+	{ 0,  0,  0,  0,  0,  0, SPR_GRASS_LEFT },
+	TILE_SEQ_END()
+};
+
+// half grass half SPR_AIRPORT_APRON
+static const DrawTileSeqStruct _station_display_datas_0163[] = {
+	{ 0,  0,  0,  0,  0,  0, SPR_GRASS_RIGHT },
+	TILE_SEQ_END()
+};
+
 static const DrawTileSprites _station_display_datas[] = {
 	{ SPR_RAIL_TRACK_X,              _station_display_datas_0 },
 	{ SPR_RAIL_TRACK_Y,              _station_display_datas_1 },
@@ -1146,37 +1161,43 @@ static const DrawTileSprites _station_display_datas[] = {
 	{ SPR_NSRUNWAY_END,              _station_display_datas_0126 },
 	{ SPR_NSRUNWAY1,                 _station_display_datas_0127 },
 	{ SPR_NSRUNWAY_END,              _station_display_datas_0128 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0129 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0130 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0131 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0132 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0133 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0134 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0135 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0136 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0137 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0129 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0130 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0131 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0132 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0133 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0134 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0135 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0136 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0137 },
 	{ SPR_AIRPORT_AIRCRAFT_STAND,    _station_display_datas_0138 },
 	{ SPR_AIRPORT_AIRCRAFT_STAND,    _station_display_datas_0139 },
 	{ SPR_AIRPORT_AIRCRAFT_STAND,    _station_display_datas_0140 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0141 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0142 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0143 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0144 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0145 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0146 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0147 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0148 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0149 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0150 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0151 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0152 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0153 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0154 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0155 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0156 },
-	{ SPR_NEWHELIPAD,                _station_display_datas_0157 },
-	{ SPR_NEWHELIPAD,                _station_display_datas_0158 },
-	{ SPR_NEWHELIPAD,                _station_display_datas_0159 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0160 },
-	{ SPR_NEWAIRPORT_TARMAC,         _station_display_datas_0161 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0141 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0142 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0143 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0144 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0145 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0146 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0147 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0148 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0149 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0150 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0151 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0152 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0153 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0154 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0155 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0156 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0157 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0158 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0159 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0160 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0161 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0162 },
+	{ SPR_AIRPORT_APRON,             _station_display_datas_0163 },
+	{ SPR_FLAT_GRASS_TILE,          _station_display_datas_58 },
+	{ SPR_FLAT_GRASS_TILE,          _station_display_datas_59 },
+	{ SPR_FLAT_GRASS_TILE,          _station_display_datas_60 },
+	{ SPR_FLAT_GRASS_TILE,          _station_display_datas_61 },
 };