cpp/openttd-patchpack/source Changeset - r4066:919d15dcd976

Changeset - r4066:919d15dcd976

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

richk - 18 years ago 2006-06-25 13:42:37
richk@openttd.org

(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.

5 files changed with 71 insertions and 34 deletions:

data/airports.grf

bin+mod

station_cmd.c

station_map.h

table/sprites.h

table/station_land.h

0 comments (0 inline, 0 general)

data/airports.grf

➞

Show inline comments

binary diff not shown

station_cmd.c

➞

Show inline comments

@@ @@ -1600,18 +1600,18 @@ static const byte _airport_sections_inte @@
 // Intercontinental Airport (vlarge) - 4 runways
 static const byte _airport_sections_intercontinental[] = {
 , 120,  89,  89,  89,  89,  89,  89, 118,
 ,  22,  22,  22,  22,  22,  22, 119, 117,
 ,  54,  87,   8,   8,   8,   8,  51, 117,
-,  18,  87,  85, 116, 116,   8,   9,  10,
+, 162,  87,  85, 116, 116,   8,   9,  10,
 ,   8,   8,  11,  31,  11,   8, 160,  32,
 , 160,   8,  11,  27,  11,   8,   8,  10,
 ,   8,   8,  11,  30,  11,   8,   8,  10,
 , 142,   8,  11,  29,  11,  10,  12,  10,
 ,  58,  87,   8,   8,   8,  10,  56, 117,
 , 142,   8,  11,  29,  11,  10, 163,  10,
 , 164,  87,   8,   8,   8,  10,  37, 117,
 , 120,  89,  89,  89,  89,  89,  89, 119,
 ,  22,  22,  22,  22,  22,  22, 119,  37
 };
 // Commuter Airfield (small)
@@ @@ -2238,12 +2238,13 @@ static void TileLoop_Station(TileIndex t @@
 	switch (GetStationGfx(tile)) {
 		case GFX_RADAR_LARGE_FIRST:
 		case GFX_WINDSACK_FIRST : // for small airport
 		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;
 		case GFX_OILRIG_BASE: //(station part)
 		case GFX_BUOY_BASE:
 			TileLoop_Water(tile);
@@ @@ -2297,12 +2298,23 @@ static void AnimateTile_Station(TileInde @@
 		if (++gfx == GFX_WINDSACK_LAST+1) {
 			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);
+	}
+}
 static void ClickTile_Station(TileIndex tile)
+{

station_map.h

➞

Show inline comments

@@ @@ -37,13 +37,15 @@ enum { @@
 	GFX_RADAR_INTERNATIONAL_FIRST =  90,
 	GFX_RADAR_INTERNATIONAL_LAST  = 101,
 	GFX_RADAR_METROPOLITAN_FIRST  = 102,
 	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 {
 	RAILWAY_SIZE = GFX_AIRPORT_BASE - GFX_RAILWAY_BASE,
 	AIRPORT_SIZE = GFX_TRUCK_BASE - GFX_AIRPORT_BASE,
 	TRUCK_SIZE = GFX_BUS_BASE - GFX_TRUCK_BASE,

table/sprites.h

➞

Show inline comments

@@ @@ -91,12 +91,14 @@ enum Sprites { @@
 	SPR_NEWHANGAR_S_WALL = SPR_AIRPORTX_BASE + 7,
 	SPR_NEWHANGAR_W = SPR_AIRPORTX_BASE + 8,
 	SPR_NEWHANGAR_W_WALL = SPR_AIRPORTX_BASE + 9,
 	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
 	/* is itself no foundation sprite, because tileh 0 has no foundation */
 	SPR_FOUNDATION_BASE = 989,

table/station_land.h

➞

Show inline comments

@@ @@ -980,28 +980,31 @@ static const DrawTileSeqStruct _station_ @@
 };
 //END
 // 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()
 };
 // 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()
 };
 // 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()
 };
 // helidepot office with concrete underground - no fence
 static const DrawTileSeqStruct _station_display_datas_0160[] = {
@@ @@ -1013,12 +1016,24 @@ static const DrawTileSeqStruct _station_ @@
 static const DrawTileSeqStruct _station_display_datas_0161[] = {
 	{  0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, // fences east
 	{  0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, // fences south
 	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 },
 	{ SPR_RAIL_TRACK_X,              _station_display_datas_2 },
 	{ SPR_RAIL_TRACK_Y,              _station_display_datas_3 },
 	{ SPR_RAIL_TRACK_X,              _station_display_datas_4 },
@@ @@ -1143,40 +1158,46 @@ static const DrawTileSprites _station_di @@
 	{ SPR_AIRPORT_APRON,             _station_display_datas_0123 },
 	{ SPR_AIRPORT_APRON,             _station_display_datas_0124 },
 	{ SPR_NSRUNWAY1,                 _station_display_datas_0125 },
 	{ 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 },
 };

0 comments (0 inline, 0 general)