diff options
| -rw-r--r-- | table/sprites.h | 1131 | ||||
| -rw-r--r-- | table/station_land.h | 578 | ||||
| -rw-r--r-- | unmovable_cmd.c | 2 |
3 files changed, 881 insertions, 830 deletions
diff --git a/table/sprites.h b/table/sprites.h index 663fbdd28..946c2d823 100644 --- a/table/sprites.h +++ b/table/sprites.h @@ -5,8 +5,8 @@ /** @file sprites.h This file contails all sprite-related enums and defines. These consist mainly of - the sprite numbers and a bunch of masks and macros to handle sprites and to get - rid of all the magic numbers in the code. + the sprite numbers and a bunch of masks and macros to handle sprites and to get + rid of all the magic numbers in the code. @NOTE: ALL SPRITE NUMBERS BELOW 5126 are in the main files @@ -51,7 +51,7 @@ enum Sprites { SPR_CANALS_BASE = 5382, SPR_SLOPES_BASE = SPR_CANALS_BASE + 70, SPR_AUTORAIL_BASE = SPR_SLOPES_BASE + 78, - SPR_OPENTTD_BASE = SPR_AUTORAIL_BASE + 55, + SPR_OPENTTD_BASE = SPR_AUTORAIL_BASE + 55, // can be lowered once autorail.grf is finalized SPR_BLOT = SPR_OPENTTD_BASE + 29, // colored circle (mainly used as vehicle profit marker and for sever compatibility) @@ -93,45 +93,45 @@ enum Sprites { SPR_MIN_SLICE = SPR_OPENTTD_BASE + 64, /* Unmovables spritenumbers */ - SPR_UNMOVABLE_TRANSMITTER = 2601, - SPR_UNMOVABLE_LIGHTHOUSE = 2602, - SPR_TINYHQ_NORTH = 2603, - SPR_TINYHQ_EAST = 2604, - SPR_TINYHQ_WEST = 2605, - SPR_TINYHQ_SOUTH = 2606, - SPR_SMALLHQ_NORTH = 2607, - SPR_SMALLHQ_EAST = 2608, - SPR_SMALLHQ_WEST = 2609, - SPR_SMALLHQ_SOUTH = 2610, - SPR_MEDIUMHQ_NORTH = 2611, - SPR_MEDIUMHQ_NORTH_WALL = 2612, - SPR_MEDIUMHQ_EAST = 2613, - SPR_MEDIUMHQ_EAST_WALL = 2614, - SPR_MEDIUMHQ_WEST = 2615, - SPR_MEDIUMHQ_WEST_WALL = 2616, //very tiny piece of wall - SPR_MEDIUMHQ_SOUTH = 2617, - SPR_LARGEHQ_NORTH_GROUND = 2618, - SPR_LARGEHQ_NORTH_BUILD = 2619, - SPR_LARGEHQ_EAST_GROUND = 2620, - SPR_LARGEHQ_EAST_BUILD = 2621, - SPR_LARGEHQ_WEST_GROUND = 2622, - SPR_LARGEHQ_WEST_BUILD = 2623, - SPR_LARGEHQ_SOUTH = 2624, - SPR_HUGEHQ_NORTH_GROUND = 2625, - SPR_HUGEHQ_NORTH_BUILD = 2626, - SPR_HUGEHQ_EAST_GROUND = 2627, - SPR_HUGEHQ_EAST_BUILD = 2628, - SPR_HUGEHQ_WEST_GROUND = 2629, - SPR_HUGEHQ_WEST_BUILD = 2630, - SPR_HUGEHQ_SOUTH = 2631, - SPR_STATUE_GROUND = 1420, + SPR_UNMOVABLE_TRANSMITTER = 2601, + SPR_UNMOVABLE_LIGHTHOUSE = 2602, + SPR_TINYHQ_NORTH = 2603, + SPR_TINYHQ_EAST = 2604, + SPR_TINYHQ_WEST = 2605, + SPR_TINYHQ_SOUTH = 2606, + SPR_SMALLHQ_NORTH = 2607, + SPR_SMALLHQ_EAST = 2608, + SPR_SMALLHQ_WEST = 2609, + SPR_SMALLHQ_SOUTH = 2610, + SPR_MEDIUMHQ_NORTH = 2611, + SPR_MEDIUMHQ_NORTH_WALL = 2612, + SPR_MEDIUMHQ_EAST = 2613, + SPR_MEDIUMHQ_EAST_WALL = 2614, + SPR_MEDIUMHQ_WEST = 2615, + SPR_MEDIUMHQ_WEST_WALL = 2616, //very tiny piece of wall + SPR_MEDIUMHQ_SOUTH = 2617, + SPR_LARGEHQ_NORTH_GROUND = 2618, + SPR_LARGEHQ_NORTH_BUILD = 2619, + SPR_LARGEHQ_EAST_GROUND = 2620, + SPR_LARGEHQ_EAST_BUILD = 2621, + SPR_LARGEHQ_WEST_GROUND = 2622, + SPR_LARGEHQ_WEST_BUILD = 2623, + SPR_LARGEHQ_SOUTH = 2624, + SPR_HUGEHQ_NORTH_GROUND = 2625, + SPR_HUGEHQ_NORTH_BUILD = 2626, + SPR_HUGEHQ_EAST_GROUND = 2627, + SPR_HUGEHQ_EAST_BUILD = 2628, + SPR_HUGEHQ_WEST_GROUND = 2629, + SPR_HUGEHQ_WEST_BUILD = 2630, + SPR_HUGEHQ_SOUTH = 2631, + SPR_CONCRETE_GROUND = 1420, SPR_STATUE_COMPANY = 2632, - SPR_BOUGHT_LAND = 4790, + SPR_BOUGHT_LAND = 4790, /* sprites for rail and rail stations*/ - SPR_RAIL_SNOW_OFFSET = 26, - SPR_MONO_SNOW_OFFSET = 26, - SPR_MGLV_SNOW_OFFSET = 26, + SPR_RAIL_SNOW_OFFSET = 26, + SPR_MONO_SNOW_OFFSET = 26, + SPR_MGLV_SNOW_OFFSET = 26, SPR_RAIL_SINGLE_Y = 1005, SPR_RAIL_SINGLE_X = 1006, @@ -139,36 +139,36 @@ enum Sprites { SPR_RAIL_SINGLE_SOUTH = 1008, SPR_RAIL_SINGLE_EAST = 1009, SPR_RAIL_SINGLE_WEST = 1010, - SPR_RAIL_TRACK_Y = 1011, - SPR_RAIL_TRACK_X = 1012, + SPR_RAIL_TRACK_Y = 1011, + SPR_RAIL_TRACK_X = 1012, SPR_RAIL_TRACK_BASE = 1018, SPR_RAIL_TRACK_N_S = 1035, - SPR_RAIL_TRACK_Y_SNOW = 1037, - SPR_RAIL_TRACK_X_SNOW = 1038, - SPR_RAIL_DEPOT_SE_1 = 1063, - SPR_RAIL_DEPOT_SE_2 = 1064, - SPR_RAIL_DEPOT_SW_1 = 1065, - SPR_RAIL_DEPOT_SW_2 = 1066, - SPR_RAIL_DEPOT_NE = 1067, - SPR_RAIL_DEPOT_NW = 1068, - SPR_RAIL_PLATFORM_Y_FRONT = 1069, - SPR_RAIL_PLATFORM_X_REAR = 1070, - SPR_RAIL_PLATFORM_Y_REAR = 1071, - SPR_RAIL_PLATFORM_X_FRONT = 1072, - SPR_RAIL_PLATFORM_BUILDING_X = 1073, - SPR_RAIL_PLATFORM_BUILDING_Y = 1074, - SPR_RAIL_PLATFORM_PILLARS_Y_FRONT = 1075, - SPR_RAIL_PLATFORM_PILLARS_X_REAR = 1076, - SPR_RAIL_PLATFORM_PILLARS_Y_REAR = 1077, - SPR_RAIL_PLATFORM_PILLARS_X_FRONT = 1078, - SPR_RAIL_ROOF_STRUCTURE_X_TILE_A = 1079, //First half of the roof structure - SPR_RAIL_ROOF_STRUCTURE_Y_TILE_A = 1080, - SPR_RAIL_ROOF_STRUCTURE_X_TILE_B = 1081, //Second half of the roof structure - SPR_RAIL_ROOF_STRUCTURE_Y_TILE_B = 1082, - SPR_RAIL_ROOF_GLASS_X_TILE_A = 1083, //First half of the roof glass - SPR_RAIL_ROOF_GLASS_Y_TILE_A = 1084, - SPR_RAIL_ROOF_GLASS_X_TILE_B = 1085, //second half of the roof glass - SPR_RAIL_ROOF_GLASS_Y_TILE_B = 1086, + SPR_RAIL_TRACK_Y_SNOW = 1037, + SPR_RAIL_TRACK_X_SNOW = 1038, + SPR_RAIL_DEPOT_SE_1 = 1063, + SPR_RAIL_DEPOT_SE_2 = 1064, + SPR_RAIL_DEPOT_SW_1 = 1065, + SPR_RAIL_DEPOT_SW_2 = 1066, + SPR_RAIL_DEPOT_NE = 1067, + SPR_RAIL_DEPOT_NW = 1068, + SPR_RAIL_PLATFORM_Y_FRONT = 1069, + SPR_RAIL_PLATFORM_X_REAR = 1070, + SPR_RAIL_PLATFORM_Y_REAR = 1071, + SPR_RAIL_PLATFORM_X_FRONT = 1072, + SPR_RAIL_PLATFORM_BUILDING_X = 1073, + SPR_RAIL_PLATFORM_BUILDING_Y = 1074, + SPR_RAIL_PLATFORM_PILLARS_Y_FRONT = 1075, + SPR_RAIL_PLATFORM_PILLARS_X_REAR = 1076, + SPR_RAIL_PLATFORM_PILLARS_Y_REAR = 1077, + SPR_RAIL_PLATFORM_PILLARS_X_FRONT = 1078, + SPR_RAIL_ROOF_STRUCTURE_X_TILE_A = 1079, //First half of the roof structure + SPR_RAIL_ROOF_STRUCTURE_Y_TILE_A = 1080, + SPR_RAIL_ROOF_STRUCTURE_X_TILE_B = 1081, //Second half of the roof structure + SPR_RAIL_ROOF_STRUCTURE_Y_TILE_B = 1082, + SPR_RAIL_ROOF_GLASS_X_TILE_A = 1083, //First half of the roof glass + SPR_RAIL_ROOF_GLASS_Y_TILE_A = 1084, + SPR_RAIL_ROOF_GLASS_X_TILE_B = 1085, //second half of the roof glass + SPR_RAIL_ROOF_GLASS_Y_TILE_B = 1086, SPR_MONO_SINGLE_Y = 1087, SPR_MONO_SINGLE_X = 1088, SPR_MONO_SINGLE_NORTH = 1089, @@ -187,233 +187,232 @@ enum Sprites { SPR_MGLV_TRACK_Y = 1175, SPR_MGLV_TRACK_BASE = 1182, SPR_MGLV_TRACK_N_S = 1199, - SPR_WAYPOINT_X_1 = SPR_OPENTTD_BASE + 15, - SPR_WAYPOINT_X_2 = SPR_OPENTTD_BASE + 16, - SPR_WAYPOINT_Y_1 = SPR_OPENTTD_BASE + 17, - SPR_WAYPOINT_Y_2 = SPR_OPENTTD_BASE + 18, - OFFSET_TILEH_IMPOSSIBLE = 0, - OFFSET_TILEH_1 = 14, - OFFSET_TILEH_2 = 15, - OFFSET_TILEH_3 = 22, - OFFSET_TILEH_4 = 13, - OFFSET_TILEH_6 = 21, - OFFSET_TILEH_7 = 17, - OFFSET_TILEH_8 = 12, - OFFSET_TILEH_9 = 23, - OFFSET_TILEH_11 = 18, - OFFSET_TILEH_12 = 20, - OFFSET_TILEH_13 = 19, - OFFSET_TILEH_14 = 16, + SPR_WAYPOINT_X_1 = SPR_OPENTTD_BASE + 15, + SPR_WAYPOINT_X_2 = SPR_OPENTTD_BASE + 16, + SPR_WAYPOINT_Y_1 = SPR_OPENTTD_BASE + 17, + SPR_WAYPOINT_Y_2 = SPR_OPENTTD_BASE + 18, + OFFSET_TILEH_IMPOSSIBLE = 0, + OFFSET_TILEH_1 = 14, + OFFSET_TILEH_2 = 15, + OFFSET_TILEH_3 = 22, + OFFSET_TILEH_4 = 13, + OFFSET_TILEH_6 = 21, + OFFSET_TILEH_7 = 17, + OFFSET_TILEH_8 = 12, + OFFSET_TILEH_9 = 23, + OFFSET_TILEH_11 = 18, + OFFSET_TILEH_12 = 20, + OFFSET_TILEH_13 = 19, + OFFSET_TILEH_14 = 16, /* sprites for airports and airfields*/ /* Small airports are AIRFIELD, everything else is AIRPORT */ - SPR_HELIPORT = 2633, - SPR_AIRPORT_APRON = 2634, - SPR_AIRPORT_AIRCRAFT_STAND = 2635, - SPR_AIRPORT_TAXIWAY_NS_WEST = 2636, - SPR_AIRPORT_TAXIWAY_EW_SOUTH = 2637, - SPR_AIRPORT_TAXIWAY_XING_SOUTH = 2638, - SPR_AIRPORT_TAXIWAY_XING_WEST = 2639, - SPR_AIRPORT_TAXIWAY_NS_CTR = 2640, - SPR_AIRPORT_TAXIWAY_XING_EAST = 2641, - SPR_AIRPORT_TAXIWAY_NS_EAST = 2642, - SPR_AIRPORT_TAXIWAY_EW_NORTH = 2643, - SPR_AIRPORT_TAXIWAY_EW_CTR = 2644, - SPR_AIRPORT_RUNWAY_EXIT_A = 2645, - SPR_AIRPORT_RUNWAY_EXIT_B = 2646, - SPR_AIRPORT_RUNWAY_EXIT_C = 2647, - SPR_AIRPORT_RUNWAY_EXIT_D = 2648, - SPR_AIRPORT_RUNWAY_END = 2649, //We should have different ends - SPR_AIRPORT_TERMINAL_A = 2650, - SPR_AIRPORT_TOWER = 2651, - SPR_AIRPORT_CONCOURSE = 2652, - SPR_AIRPORT_TERMINAL_B = 2653, - SPR_AIRPORT_TERMINAL_C = 2654, - SPR_AIRPORT_HANGAR_FRONT = 2655, - SPR_AIRPORT_HANGAR_REAR = 2656, - SPR_AIRFIELD_HANGAR_FRONT = 2657, - SPR_AIRFIELD_HANGAR_REAR = 2658, - SPR_AIRPORT_JETWAY_1 = 2659, - SPR_AIRPORT_JETWAY_2 = 2660, - SPR_AIRPORT_JETWAY_3 = 2661, - SPR_AIRPORT_PASSENGER_TUNNEL = 2662, - SPR_AIRPORT_FENCE_Y = 2663, - SPR_AIRPORT_FENCE_X = 2664, - SPR_AIRFIELD_TERM_A = 2665, - SPR_AIRFIELD_TERM_B = 2666, - SPR_AIRFIELD_TERM_C_GROUND = 2667, - SPR_AIRFIELD_TERM_C_BUILD = 2668, - SPR_AIRFIELD_APRON_A = 2669, - SPR_AIRFIELD_APRON_B = 2670, - SPR_AIRFIELD_APRON_C = 2671, - SPR_AIRFIELD_APRON_D = 2672, - SPR_AIRFIELD_RUNWAY_NEAR_END = 2673, - SPR_AIRFIELD_RUNWAY_MIDDLE = 2674, - SPR_AIRFIELD_RUNWAY_FAR_END = 2675, - SPR_AIRFIELD_WIND_1 = 2676, - SPR_AIRFIELD_WIND_2 = 2677, - SPR_AIRFIELD_WIND_3 = 2678, - SPR_AIRFIELD_WIND_4 = 2679, - SPR_AIRPORT_RADAR_1 = 2680, - SPR_AIRPORT_RADAR_2 = 2681, - SPR_AIRPORT_RADAR_3 = 2682, - SPR_AIRPORT_RADAR_4 = 2683, - SPR_AIRPORT_RADAR_5 = 2684, - SPR_AIRPORT_RADAR_6 = 2685, - SPR_AIRPORT_RADAR_7 = 2686, - SPR_AIRPORT_RADAR_8 = 2687, - SPR_AIRPORT_RADAR_9 = 2688, - SPR_AIRPORT_RADAR_A = 2689, - SPR_AIRPORT_RADAR_B = 2690, - SPR_AIRPORT_RADAR_C = 2691, - SPR_AIRPORT_HELIPAD = SPR_OPENTTD_BASE + 28, + SPR_HELIPORT = 2633, + SPR_AIRPORT_APRON = 2634, + SPR_AIRPORT_AIRCRAFT_STAND = 2635, + SPR_AIRPORT_TAXIWAY_NS_WEST = 2636, + SPR_AIRPORT_TAXIWAY_EW_SOUTH = 2637, + SPR_AIRPORT_TAXIWAY_XING_SOUTH = 2638, + SPR_AIRPORT_TAXIWAY_XING_WEST = 2639, + SPR_AIRPORT_TAXIWAY_NS_CTR = 2640, + SPR_AIRPORT_TAXIWAY_XING_EAST = 2641, + SPR_AIRPORT_TAXIWAY_NS_EAST = 2642, + SPR_AIRPORT_TAXIWAY_EW_NORTH = 2643, + SPR_AIRPORT_TAXIWAY_EW_CTR = 2644, + SPR_AIRPORT_RUNWAY_EXIT_A = 2645, + SPR_AIRPORT_RUNWAY_EXIT_B = 2646, + SPR_AIRPORT_RUNWAY_EXIT_C = 2647, + SPR_AIRPORT_RUNWAY_EXIT_D = 2648, + SPR_AIRPORT_RUNWAY_END = 2649, //We should have different ends + SPR_AIRPORT_TERMINAL_A = 2650, + SPR_AIRPORT_TOWER = 2651, + SPR_AIRPORT_CONCOURSE = 2652, + SPR_AIRPORT_TERMINAL_B = 2653, + SPR_AIRPORT_TERMINAL_C = 2654, + SPR_AIRPORT_HANGAR_FRONT = 2655, + SPR_AIRPORT_HANGAR_REAR = 2656, + SPR_AIRFIELD_HANGAR_FRONT = 2657, + SPR_AIRFIELD_HANGAR_REAR = 2658, + SPR_AIRPORT_JETWAY_1 = 2659, + SPR_AIRPORT_JETWAY_2 = 2660, + SPR_AIRPORT_JETWAY_3 = 2661, + SPR_AIRPORT_PASSENGER_TUNNEL = 2662, + SPR_AIRPORT_FENCE_Y = 2663, + SPR_AIRPORT_FENCE_X = 2664, + SPR_AIRFIELD_TERM_A = 2665, + SPR_AIRFIELD_TERM_B = 2666, + SPR_AIRFIELD_TERM_C_GROUND = 2667, + SPR_AIRFIELD_TERM_C_BUILD = 2668, + SPR_AIRFIELD_APRON_A = 2669, + SPR_AIRFIELD_APRON_B = 2670, + SPR_AIRFIELD_APRON_C = 2671, + SPR_AIRFIELD_APRON_D = 2672, + SPR_AIRFIELD_RUNWAY_NEAR_END = 2673, + SPR_AIRFIELD_RUNWAY_MIDDLE = 2674, + SPR_AIRFIELD_RUNWAY_FAR_END = 2675, + SPR_AIRFIELD_WIND_1 = 2676, + SPR_AIRFIELD_WIND_2 = 2677, + SPR_AIRFIELD_WIND_3 = 2678, + SPR_AIRFIELD_WIND_4 = 2679, + SPR_AIRPORT_RADAR_1 = 2680, + SPR_AIRPORT_RADAR_2 = 2681, + SPR_AIRPORT_RADAR_3 = 2682, + SPR_AIRPORT_RADAR_4 = 2683, + SPR_AIRPORT_RADAR_5 = 2684, + SPR_AIRPORT_RADAR_6 = 2685, + SPR_AIRPORT_RADAR_7 = 2686, + SPR_AIRPORT_RADAR_8 = 2687, + SPR_AIRPORT_RADAR_9 = 2688, + SPR_AIRPORT_RADAR_A = 2689, + SPR_AIRPORT_RADAR_B = 2690, + SPR_AIRPORT_RADAR_C = 2691, + SPR_AIRPORT_HELIPAD = SPR_OPENTTD_BASE + 28, /* Road Stops */ /* Road stops have a ground tile and 3 buildings, one on each side - (except the side where the entry is). These are marked _A _B and _C - */ - SPR_BUS_STOP_NE_GROUND = 2692, - SPR_BUS_STOP_SE_GROUND = 2693, - SPR_BUS_STOP_SW_GROUND = 2694, - SPR_BUS_STOP_NW_GROUND = 2695, - SPR_BUS_STOP_NE_BUILD_A = 2696, - SPR_BUS_STOP_SE_BUILD_A = 2697, - SPR_BUS_STOP_SW_BUILD_A = 2698, - SPR_BUS_STOP_NW_BUILD_A = 2699, - SPR_BUS_STOP_NE_BUILD_B = 2700, - SPR_BUS_STOP_SE_BUILD_B = 2701, - SPR_BUS_STOP_SW_BUILD_B = 2702, - SPR_BUS_STOP_NW_BUILD_B = 2703, - SPR_BUS_STOP_NE_BUILD_C = 2704, - SPR_BUS_STOP_SE_BUILD_C = 2705, - SPR_BUS_STOP_SW_BUILD_C = 2706, - SPR_BUS_STOP_NW_BUILD_C = 2707, - SPR_TRUCK_STOP_NE_GROUND = 2708, - SPR_TRUCK_STOP_SE_GROUND = 2709, - SPR_TRUCK_STOP_SW_GROUND = 2710, - SPR_TRUCK_STOP_NW_GROUND = 2711, - SPR_TRUCK_STOP_NE_BUILD_A = 2712, - SPR_TRUCK_STOP_SE_BUILD_A = 2713, - SPR_TRUCK_STOP_SW_BUILD_A = 2714, - SPR_TRUCK_STOP_NW_BUILD_A = 2715, - SPR_TRUCK_STOP_NE_BUILD_B = 2716, - SPR_TRUCK_STOP_SE_BUILD_B = 2717, - SPR_TRUCK_STOP_SW_BUILD_B = 2718, - SPR_TRUCK_STOP_NW_BUILD_B = 2719, - SPR_TRUCK_STOP_NE_BUILD_C = 2720, - SPR_TRUCK_STOP_SE_BUILD_C = 2721, - SPR_TRUCK_STOP_SW_BUILD_C = 2722, - SPR_TRUCK_STOP_NW_BUILD_C = 2723, + * (except the side where the entry is). These are marked _A _B and _C */ + SPR_BUS_STOP_NE_GROUND = 2692, + SPR_BUS_STOP_SE_GROUND = 2693, + SPR_BUS_STOP_SW_GROUND = 2694, + SPR_BUS_STOP_NW_GROUND = 2695, + SPR_BUS_STOP_NE_BUILD_A = 2696, + SPR_BUS_STOP_SE_BUILD_A = 2697, + SPR_BUS_STOP_SW_BUILD_A = 2698, + SPR_BUS_STOP_NW_BUILD_A = 2699, + SPR_BUS_STOP_NE_BUILD_B = 2700, + SPR_BUS_STOP_SE_BUILD_B = 2701, + SPR_BUS_STOP_SW_BUILD_B = 2702, + SPR_BUS_STOP_NW_BUILD_B = 2703, + SPR_BUS_STOP_NE_BUILD_C = 2704, + SPR_BUS_STOP_SE_BUILD_C = 2705, + SPR_BUS_STOP_SW_BUILD_C = 2706, + SPR_BUS_STOP_NW_BUILD_C = 2707, + SPR_TRUCK_STOP_NE_GROUND = 2708, + SPR_TRUCK_STOP_SE_GROUND = 2709, + SPR_TRUCK_STOP_SW_GROUND = 2710, + SPR_TRUCK_STOP_NW_GROUND = 2711, + SPR_TRUCK_STOP_NE_BUILD_A = 2712, + SPR_TRUCK_STOP_SE_BUILD_A = 2713, + SPR_TRUCK_STOP_SW_BUILD_A = 2714, + SPR_TRUCK_STOP_NW_BUILD_A = 2715, + SPR_TRUCK_STOP_NE_BUILD_B = 2716, + SPR_TRUCK_STOP_SE_BUILD_B = 2717, + SPR_TRUCK_STOP_SW_BUILD_B = 2718, + SPR_TRUCK_STOP_NW_BUILD_B = 2719, + SPR_TRUCK_STOP_NE_BUILD_C = 2720, + SPR_TRUCK_STOP_SE_BUILD_C = 2721, + SPR_TRUCK_STOP_SW_BUILD_C = 2722, + SPR_TRUCK_STOP_NW_BUILD_C = 2723, /* Sprites for docks */ /* Docks consist of two tiles, the sloped one and the flat one */ - SPR_DOCK_SLOPE_NE = 2727, - SPR_DOCK_SLOPE_SE = 2728, - SPR_DOCK_SLOPE_SW = 2729, - SPR_DOCK_SLOPE_NW = 2730, - SPR_DOCK_FLAT_X = 2731, //for NE and SW - SPR_DOCK_FLAT_Y = 2732, //for NW and SE - SPR_BUOY = 4076, //XXX this sucks, because it displays wrong stuff on canals + SPR_DOCK_SLOPE_NE = 2727, + SPR_DOCK_SLOPE_SE = 2728, + SPR_DOCK_SLOPE_SW = 2729, + SPR_DOCK_SLOPE_NW = 2730, + SPR_DOCK_FLAT_X = 2731, //for NE and SW + SPR_DOCK_FLAT_Y = 2732, //for NW and SE + SPR_BUOY = 4076, //XXX this sucks, because it displays wrong stuff on canals /* Sprites for road */ - SPR_ROAD_Y = 1332, - SPR_ROAD_X = 1333, - SPR_ROAD_Y_SNOW = 1351, - SPR_ROAD_X_SNOW = 1352, + SPR_ROAD_Y = 1332, + SPR_ROAD_X = 1333, + SPR_ROAD_Y_SNOW = 1351, + SPR_ROAD_X_SNOW = 1352, SPR_EXCAVATION_X = 1414, SPR_EXCAVATION_Y = 1415, /* Landscape sprites */ - SPR_FLAT_BARE_LAND = 3924, - SPR_FLAT_1_THIRD_GRASS_TILE = 3943, - SPR_FLAT_2_THIRD_GRASS_TILE = 3962, - SPR_FLAT_GRASS_TILE = 3981, - SPR_FLAT_ROUGH_LAND = 4000, - SPR_FLAT_ROUGH_LAND_1 = 4019, - SPR_FLAT_ROUGH_LAND_2 = 4020, - SPR_FLAT_ROUGH_LAND_3 = 4021, - SPR_FLAT_ROUGH_LAND_4 = 4022, - SPR_FLAT_ROCKY_LAND_1 = 4023, - SPR_FLAT_ROCKY_LAND_2 = 4042, - SPR_FLAT_WATER_TILE = 4061, - SPR_FLAT_1_QUART_SNOWY_TILE = 4493, - SPR_FLAT_2_QUART_SNOWY_TILE = 4512, - SPR_FLAT_3_QUART_SNOWY_TILE = 4531, - SPR_FLAT_SNOWY_TILE = 4550, + SPR_FLAT_BARE_LAND = 3924, + SPR_FLAT_1_THIRD_GRASS_TILE = 3943, + SPR_FLAT_2_THIRD_GRASS_TILE = 3962, + SPR_FLAT_GRASS_TILE = 3981, + SPR_FLAT_ROUGH_LAND = 4000, + SPR_FLAT_ROUGH_LAND_1 = 4019, + SPR_FLAT_ROUGH_LAND_2 = 4020, + SPR_FLAT_ROUGH_LAND_3 = 4021, + SPR_FLAT_ROUGH_LAND_4 = 4022, + SPR_FLAT_ROCKY_LAND_1 = 4023, + SPR_FLAT_ROCKY_LAND_2 = 4042, + SPR_FLAT_WATER_TILE = 4061, + SPR_FLAT_1_QUART_SNOWY_TILE = 4493, + SPR_FLAT_2_QUART_SNOWY_TILE = 4512, + SPR_FLAT_3_QUART_SNOWY_TILE = 4531, + SPR_FLAT_SNOWY_TILE = 4550, /* Hedge, Farmland-fence sprites */ - SPR_HEDGE_BUSHES = 4090, - SPR_HEDGE_BUSHES_WITH_GATE = 4096, - SPR_HEDGE_FENCE = 4102, - SPR_HEDGE_BLOOMBUSH_YELLOW = 4108, - SPR_HEDGE_BLOOMBUSH_RED = 4114, - SPR_HEDGE_STONE = 4120, + SPR_HEDGE_BUSHES = 4090, + SPR_HEDGE_BUSHES_WITH_GATE = 4096, + SPR_HEDGE_FENCE = 4102, + SPR_HEDGE_BLOOMBUSH_YELLOW = 4108, + SPR_HEDGE_BLOOMBUSH_RED = 4114, + SPR_HEDGE_STONE = 4120, /* Farmland sprites, only flat tiles listed, various stages */ - SPR_FARMLAND_BARE = 4126, - SPR_FARMLAND_STATE_1 = 4145, - SPR_FARMLAND_STATE_2 = 4164, - SPR_FARMLAND_STATE_3 = 4183, - SPR_FARMLAND_STATE_4 = 4202, - SPR_FARMLAND_STATE_5 = 4221, - SPR_FARMLAND_STATE_6 = 4240, - SPR_FARMLAND_STATE_7 = 4259, - SPR_FARMLAND_HAYPACKS = 4278, + SPR_FARMLAND_BARE = 4126, + SPR_FARMLAND_STATE_1 = 4145, + SPR_FARMLAND_STATE_2 = 4164, + SPR_FARMLAND_STATE_3 = 4183, + SPR_FARMLAND_STATE_4 = 4202, + SPR_FARMLAND_STATE_5 = 4221, + SPR_FARMLAND_STATE_6 = 4240, + SPR_FARMLAND_STATE_7 = 4259, + SPR_FARMLAND_HAYPACKS = 4278, /* Shores */ - SPR_NO_SHORE = 0, //used for tileh which have no shore - SPR_SHORE_TILEH_4 = 4062, - SPR_SHORE_TILEH_1 = 4063, - SPR_SHORE_TILEH_2 = 4064, - SPR_SHORE_TILEH_8 = 4065, - SPR_SHORE_TILEH_6 = 4066, - SPR_SHORE_TILEH_12 = 4067, - SPR_SHORE_TILEH_3 = 4068, - SPR_SHORE_TILEH_9 = 4069, + SPR_NO_SHORE = 0, //used for tileh which have no shore + SPR_SHORE_TILEH_4 = 4062, + SPR_SHORE_TILEH_1 = 4063, + SPR_SHORE_TILEH_2 = 4064, + SPR_SHORE_TILEH_8 = 4065, + SPR_SHORE_TILEH_6 = 4066, + SPR_SHORE_TILEH_12 = 4067, + SPR_SHORE_TILEH_3 = 4068, + SPR_SHORE_TILEH_9 = 4069, /* Water-related sprites */ - SPR_SHIP_DEPOT_SE_FRONT = 4070, - SPR_SHIP_DEPOT_SW_FRONT = 4071, - SPR_SHIP_DEPOT_NW = 4072, - SPR_SHIP_DEPOT_NE = 4073, - SPR_SHIP_DEPOT_SE_REAR = 4074, - SPR_SHIP_DEPOT_SW_REAR = 4075, + SPR_SHIP_DEPOT_SE_FRONT = 4070, + SPR_SHIP_DEPOT_SW_FRONT = 4071, + SPR_SHIP_DEPOT_NW = 4072, + SPR_SHIP_DEPOT_NE = 4073, + SPR_SHIP_DEPOT_SE_REAR = 4074, + SPR_SHIP_DEPOT_SW_REAR = 4075, //here come sloped water sprites - SPR_WATER_SLOPE_Y_UP = SPR_CANALS_BASE + 5, //Water flowing negative Y direction - SPR_WATER_SLOPE_X_DOWN = SPR_CANALS_BASE + 6, //positive X - SPR_WATER_SLOPE_X_UP = SPR_CANALS_BASE + 7, //negative X - SPR_WATER_SLOPE_Y_DOWN = SPR_CANALS_BASE + 8, //positive Y + SPR_WATER_SLOPE_Y_UP = SPR_CANALS_BASE + 5, //Water flowing negative Y direction + SPR_WATER_SLOPE_X_DOWN = SPR_CANALS_BASE + 6, //positive X + SPR_WATER_SLOPE_X_UP = SPR_CANALS_BASE + 7, //negative X + SPR_WATER_SLOPE_Y_DOWN = SPR_CANALS_BASE + 8, //positive Y //sprites for the shiplifts //there are 4 kinds of shiplifts, each of them is 3 tiles long. //the four kinds are running in the X and Y direction and //are "lowering" either in the "+" or the "-" direction. //the three tiles are the center tile (where the slope is) //and a bottom and a top tile - SPR_SHIPLIFT_Y_UP_CENTER_REAR = SPR_CANALS_BASE + 9, - SPR_SHIPLIFT_X_DOWN_CENTER_REAR = SPR_CANALS_BASE + 10, - SPR_SHIPLIFT_X_UP_CENTER_REAR = SPR_CANALS_BASE + 11, - SPR_SHIPLIFT_Y_DOWN_CENTER_REAR = SPR_CANALS_BASE + 12, - SPR_SHIPLIFT_Y_UP_CENTER_FRONT = SPR_CANALS_BASE + 13, - SPR_SHIPLIFT_X_DOWN_CENTER_FRONT = SPR_CANALS_BASE + 14, - SPR_SHIPLIFT_X_UP_CENTER_FRONT = SPR_CANALS_BASE + 15, - SPR_SHIPLIFT_Y_DOWN_CENTER_FRONT = SPR_CANALS_BASE + 16, - SPR_SHIPLIFT_Y_UP_BOTTOM_REAR = SPR_CANALS_BASE + 17, - SPR_SHIPLIFT_X_DOWN_BOTTOM_REAR = SPR_CANALS_BASE + 18, - SPR_SHIPLIFT_X_UP_BOTTOM_REAR = SPR_CANALS_BASE + 19, - SPR_SHIPLIFT_Y_DOWN_BOTTOM_REAR = SPR_CANALS_BASE + 20, - SPR_SHIPLIFT_Y_UP_BOTTOM_FRONT = SPR_CANALS_BASE + 21, - SPR_SHIPLIFT_X_DOWN_BOTTOM_FRONT = SPR_CANALS_BASE + 22, - SPR_SHIPLIFT_X_UP_BOTTOM_FRONT = SPR_CANALS_BASE + 23, - SPR_SHIPLIFT_Y_DOWN_BOTTOM_FRONT = SPR_CANALS_BASE + 24, - SPR_SHIPLIFT_Y_UP_TOP_REAR = SPR_CANALS_BASE + 25, - SPR_SHIPLIFT_X_DOWN_TOP_REAR = SPR_CANALS_BASE + 26, - SPR_SHIPLIFT_X_UP_TOP_REAR = SPR_CANALS_BASE + 27, - SPR_SHIPLIFT_Y_DOWN_TOP_REAR = SPR_CANALS_BASE + 28, - SPR_SHIPLIFT_Y_UP_TOP_FRONT = SPR_CANALS_BASE + 29, - SPR_SHIPLIFT_X_DOWN_TOP_FRONT = SPR_CANALS_BASE + 30, - SPR_SHIPLIFT_X_UP_TOP_FRONT = SPR_CANALS_BASE + 31, - SPR_SHIPLIFT_Y_DOWN_TOP_FRONT = SPR_CANALS_BASE + 32, + SPR_SHIPLIFT_Y_UP_CENTER_REAR = SPR_CANALS_BASE + 9, + SPR_SHIPLIFT_X_DOWN_CENTER_REAR = SPR_CANALS_BASE + 10, + SPR_SHIPLIFT_X_UP_CENTER_REAR = SPR_CANALS_BASE + 11, + SPR_SHIPLIFT_Y_DOWN_CENTER_REAR = SPR_CANALS_BASE + 12, + SPR_SHIPLIFT_Y_UP_CENTER_FRONT = SPR_CANALS_BASE + 13, + SPR_SHIPLIFT_X_DOWN_CENTER_FRONT = SPR_CANALS_BASE + 14, + SPR_SHIPLIFT_X_UP_CENTER_FRONT = SPR_CANALS_BASE + 15, + SPR_SHIPLIFT_Y_DOWN_CENTER_FRONT = SPR_CANALS_BASE + 16, + SPR_SHIPLIFT_Y_UP_BOTTOM_REAR = SPR_CANALS_BASE + 17, + SPR_SHIPLIFT_X_DOWN_BOTTOM_REAR = SPR_CANALS_BASE + 18, + SPR_SHIPLIFT_X_UP_BOTTOM_REAR = SPR_CANALS_BASE + 19, + SPR_SHIPLIFT_Y_DOWN_BOTTOM_REAR = SPR_CANALS_BASE + 20, + SPR_SHIPLIFT_Y_UP_BOTTOM_FRONT = SPR_CANALS_BASE + 21, + SPR_SHIPLIFT_X_DOWN_BOTTOM_FRONT = SPR_CANALS_BASE + 22, + SPR_SHIPLIFT_X_UP_BOTTOM_FRONT = SPR_CANALS_BASE + 23, + SPR_SHIPLIFT_Y_DOWN_BOTTOM_FRONT = SPR_CANALS_BASE + 24, + SPR_SHIPLIFT_Y_UP_TOP_REAR = SPR_CANALS_BASE + 25, + SPR_SHIPLIFT_X_DOWN_TOP_REAR = SPR_CANALS_BASE + 26, + SPR_SHIPLIFT_X_UP_TOP_REAR = SPR_CANALS_BASE + 27, + SPR_SHIPLIFT_Y_DOWN_TOP_REAR = SPR_CANALS_BASE + 28, + SPR_SHIPLIFT_Y_UP_TOP_FRONT = SPR_CANALS_BASE + 29, + SPR_SHIPLIFT_X_DOWN_TOP_FRONT = SPR_CANALS_BASE + 30, + SPR_SHIPLIFT_X_UP_TOP_FRONT = SPR_CANALS_BASE + 31, + SPR_SHIPLIFT_Y_DOWN_TOP_FRONT = SPR_CANALS_BASE + 32, /* Sprites for tunnels and bridges */ SPR_TUNNEL_ENTRY_REAR_RAIL = 2365, @@ -430,74 +429,74 @@ enum Sprites { SPR_PILLARS_BASE = SPR_OPENTTD_BASE + 30, /* Wooden bridge (type 0) */ - SPR_BTWDN_RAIL_Y_REAR = 2545, - SPR_BTWDN_RAIL_X_REAR = 2546, - SPR_BTWDN_ROAD_Y_REAR = 2547, - SPR_BTWDN_ROAD_X_REAR = 2548, - SPR_BTWDN_Y_FRONT = 2549, - SPR_BTWDN_X_FRONT = 2550, - SPR_BTWDN_Y_PILLAR = 2551, - SPR_BTWDN_X_PILLAR = 2552, - SPR_BTWDN_MONO_Y_REAR = 4361, - SPR_BTWDN_MONO_X_REAR = 4362, - SPR_BTWDN_MGLV_Y_REAR = 4400, - SPR_BTWDN_MGLV_X_REAR = 4401, + SPR_BTWDN_RAIL_Y_REAR = 2545, + SPR_BTWDN_RAIL_X_REAR = 2546, + SPR_BTWDN_ROAD_Y_REAR = 2547, + SPR_BTWDN_ROAD_X_REAR = 2548, + SPR_BTWDN_Y_FRONT = 2549, + SPR_BTWDN_X_FRONT = 2550, + SPR_BTWDN_Y_PILLAR = 2551, + SPR_BTWDN_X_PILLAR = 2552, + SPR_BTWDN_MONO_Y_REAR = 4361, + SPR_BTWDN_MONO_X_REAR = 4362, + SPR_BTWDN_MGLV_Y_REAR = 4400, + SPR_BTWDN_MGLV_X_REAR = 4401, /* ramps */ - SPR_BTWDN_ROAD_RAMP_Y_DOWN = 2529, - SPR_BTWDN_ROAD_RAMP_X_DOWN = 2530, - SPR_BTWDN_ROAD_RAMP_X_UP = 2531, //for some weird reason the order is swapped - SPR_BTWDN_ROAD_RAMP_Y_UP = 2532, //between X and Y. - SPR_BTWDN_ROAD_Y_SLOPE_UP = 2533, - SPR_BTWDN_ROAD_X_SLOPE_UP = 2534, - SPR_BTWDN_ROAD_Y_SLOPE_DOWN = 2535, + SPR_BTWDN_ROAD_RAMP_Y_DOWN = 2529, + SPR_BTWDN_ROAD_RAMP_X_DOWN = 2530, + SPR_BTWDN_ROAD_RAMP_X_UP = 2531, //for some weird reason the order is swapped + SPR_BTWDN_ROAD_RAMP_Y_UP = 2532, //between X and Y. + SPR_BTWDN_ROAD_Y_SLOPE_UP = 2533, + SPR_BTWDN_ROAD_X_SLOPE_UP = 2534, + SPR_BTWDN_ROAD_Y_SLOPE_DOWN = 2535, SPR_BTWDN_ROAD_X_SLOPE_DOWN = 2536, - SPR_BTWDN_RAIL_RAMP_Y_DOWN = 2537, - SPR_BTWDN_RAIL_RAMP_X_DOWN = 2538, - SPR_BTWDN_RAIL_RAMP_X_UP = 2539, //for some weird reason the order is swapped - SPR_BTWDN_RAIL_RAMP_Y_UP = 2540, //between X and Y. - SPR_BTWDN_RAIL_Y_SLOPE_UP = 2541, - SPR_BTWDN_RAIL_X_SLOPE_UP = 2542, - SPR_BTWDN_RAIL_Y_SLOPE_DOWN = 2543, + SPR_BTWDN_RAIL_RAMP_Y_DOWN = 2537, + SPR_BTWDN_RAIL_RAMP_X_DOWN = 2538, + SPR_BTWDN_RAIL_RAMP_X_UP = 2539, //for some weird reason the order is swapped + SPR_BTWDN_RAIL_RAMP_Y_UP = 2540, //between X and Y. + SPR_BTWDN_RAIL_Y_SLOPE_UP = 2541, + SPR_BTWDN_RAIL_X_SLOPE_UP = 2542, + SPR_BTWDN_RAIL_Y_SLOPE_DOWN = 2543, SPR_BTWDN_RAIL_X_SLOPE_DOWN = 2544, - SPR_BTWDN_MONO_RAMP_Y_DOWN = 4352, - SPR_BTWDN_MONO_RAMP_X_DOWN = 4353, - SPR_BTWDN_MONO_RAMP_X_UP = 4354, //for some weird reason the order is swapped - SPR_BTWDN_MONO_RAMP_Y_UP = 4355, //between X and Y. - SPR_BTWDN_MONO_Y_SLOPE_UP = 4356, - SPR_BTWDN_MONO_X_SLOPE_UP = 4357, - SPR_BTWDN_MONO_Y_SLOPE_DOWN = 4358, + SPR_BTWDN_MONO_RAMP_Y_DOWN = 4352, + SPR_BTWDN_MONO_RAMP_X_DOWN = 4353, + SPR_BTWDN_MONO_RAMP_X_UP = 4354, //for some weird reason the order is swapped + SPR_BTWDN_MONO_RAMP_Y_UP = 4355, //between X and Y. + SPR_BTWDN_MONO_Y_SLOPE_UP = 4356, + SPR_BTWDN_MONO_X_SLOPE_UP = 4357, + SPR_BTWDN_MONO_Y_SLOPE_DOWN = 4358, SPR_BTWDN_MONO_X_SLOPE_DOWN = 4359, - SPR_BTWDN_MGLV_RAMP_Y_DOWN = 4392, - SPR_BTWDN_MGLV_RAMP_X_DOWN = 4393, - SPR_BTWDN_MGLV_RAMP_X_UP = 4394, //for some weird reason the order is swapped - SPR_BTWDN_MGLV_RAMP_Y_UP = 4395, //between X and Y. - SPR_BTWDN_MGLV_Y_SLOPE_UP = 4396, - SPR_BTWDN_MGLV_X_SLOPE_UP = 4397, - SPR_BTWDN_MGLV_Y_SLOPE_DOWN = 4398, + SPR_BTWDN_MGLV_RAMP_Y_DOWN = 4392, + SPR_BTWDN_MGLV_RAMP_X_DOWN = 4393, + SPR_BTWDN_MGLV_RAMP_X_UP = 4394, //for some weird reason the order is swapped + SPR_BTWDN_MGLV_RAMP_Y_UP = 4395, //between X and Y. + SPR_BTWDN_MGLV_Y_SLOPE_UP = 4396, + SPR_BTWDN_MGLV_X_SLOPE_UP = 4397, + SPR_BTWDN_MGLV_Y_SLOPE_DOWN = 4398, SPR_BTWDN_MGLV_X_SLOPE_DOWN = 4399, /* Steel Girder with arches */ /* BTSGA == Bridge Type Steel Girder Arched */ /* This is bridge type number 2 */ - SPR_BTSGA_RAIL_X_REAR = 2499, - SPR_BTSGA_RAIL_Y_REAR = 2500, - SPR_BTSGA_ROAD_X_REAR = 2501, - SPR_BTSGA_ROAD_Y_REAR = 2502, - SPR_BTSGA_X_FRONT = 2503, - SPR_BTSGA_Y_FRONT = 2504, - SPR_BTSGA_X_PILLAR = 2505, - SPR_BTSGA_Y_PILLAR = 2606, - SPR_BTSGA_MONO_X_REAR = 4324, - SPR_BTSGA_MONO_Y_REAR = 4325, - SPR_BTSGA_MGLV_X_REAR = 4364, - SPR_BTSGA_MGLV_Y_REAR = 4365, + SPR_BTSGA_RAIL_X_REAR = 2499, + SPR_BTSGA_RAIL_Y_REAR = 2500, + SPR_BTSGA_ROAD_X_REAR = 2501, + SPR_BTSGA_ROAD_Y_REAR = 2502, + SPR_BTSGA_X_FRONT = 2503, + SPR_BTSGA_Y_FRONT = 2504, + SPR_BTSGA_X_PILLAR = 2505, + SPR_BTSGA_Y_PILLAR = 2606, + SPR_BTSGA_MONO_X_REAR = 4324, + SPR_BTSGA_MONO_Y_REAR = 4325, + SPR_BTSGA_MGLV_X_REAR = 4364, + SPR_BTSGA_MGLV_Y_REAR = 4365, /* BTSUS == Suspension bridge */ /* TILE_* denotes the different tiles a suspension bridge can have TILE_A and TILE_B are the "beginnings" and "ends" of the suspension system. they have small rectangluar endcaps - TILE_C and TILE_D look almost identical to TILE_A and + TILE_C and TILE_D look almost identical to TILE_A and TILE_B, but they do not have the "endcaps". They form the middle part TILE_E is a condensed configuration of two pillars. while they @@ -507,143 +506,142 @@ enum Sprites { plugged in when pillars should be 3 tiles apart */ - SPR_BTSUS_ROAD_Y_REAR_TILE_A = 2453, - SPR_BTSUS_ROAD_Y_REAR_TILE_B = 2454, - SPR_BTSUS_Y_FRONT_TILE_A = 2455, - SPR_BTSUS_Y_FRONT_TILE_B = 2456, - SPR_BTSUS_ROAD_Y_REAR_TILE_D = 2457, - SPR_BTSUS_ROAD_Y_REAR_TILE_C = 2458, - SPR_BTSUS_Y_FRONT_TILE_D = 2459, - SPR_BTSUS_Y_FRONT_TILE_C = 2460, - SPR_BTSUS_ROAD_X_REAR_TILE_A = 2461, - SPR_BTSUS_ROAD_X_REAR_TILE_B = 2462, - SPR_BTSUS_X_FRONT_TILE_A = 2463, - SPR_BTSUS_X_FRONT_TILE_B = 2464, - SPR_BTSUS_ROAD_X_TILE_D = 2465, - SPR_BTSUS_ROAD_X_TILE_C = 2466, - SPR_BTSUS_X_FRONT_TILE_D = 2467, - SPR_BTSUS_X_FRONT_TILE_C = 2468, - SPR_BTSUS_RAIL_Y_REAR_TILE_A = 2469, - SPR_BTSUS_RAIL_Y_REAR_TILE_B = 2470, - SPR_BTSUS_RAIL_Y_REAR_TILE_D = 2471, - SPR_BTSUS_RAIL_Y_REAR_TILE_C = 2472, - SPR_BTSUS_RAIL_X_REAR_TILE_A = 2473, - SPR_BTSUS_RAIL_X_REAR_TILE_B = 2474, - SPR_BTSUS_RAIL_X_REAR_TILE_D = 2475, - SPR_BTSUS_RAIL_X_REAR_TILE_C = 2476, - SPR_BTSUS_Y_PILLAR_TILE_A = 2477, - SPR_BTSUS_Y_PILLAR_TILE_B = 2478, - SPR_BTSUS_Y_PILLAR_TILE_D = 2479, - SPR_BTSUS_Y_PILLAR_TILE_C = 2480, - SPR_BTSUS_X_PILLAR_TILE_A = 2481, - SPR_BTSUS_X_PILLAR_TILE_B = 2482, - SPR_BTSUS_X_PILLAR_TILE_D = 2483, - SPR_BTSUS_X_PILLAR_TILE_C = 2484, - SPR_BTSUS_RAIL_Y_REAR_TILE_E = 2485, - SPR_BTSUS_RAIL_X_REAR_TILE_E = 2486, - SPR_BTSUS_ROAD_Y_REAR_TILE_E = 2487, - SPR_BTSUS_ROAD_X_REAR_TILE_E = 2488, - SPR_BTSUS_Y_FRONT_TILE_E = 2489, - SPR_BTSUS_X_FRONT_TILE_E = 2490, - SPR_BTSUS_Y_PILLAR_TILE_E = 2491, - SPR_BTSUS_X_PILLAR_TILE_E = 2492, - SPR_BTSUS_RAIL_X_REAR_TILE_F = 2493, - SPR_BTSUS_RAIL_Y_REAR_TILE_F = 2494, - SPR_BTSUS_ROAD_X_REAR_TILE_F = 2495, - SPR_BTSUS_ROAD_Y_REAR_TILE_F = 2496, - SPR_BTSUS_Y_FRONT = 2497, - SPR_BTSUS_X_FRONT = 2498, - SPR_BTSUS_MONO_Y_REAR_TILE_A = 4334, - SPR_BTSUS_MONO_Y_REAR_TILE_B = 4335, - SPR_BTSUS_MONO_Y_REAR_TILE_D = 4336, - SPR_BTSUS_MONO_Y_REAR_TILE_C = 4337, - SPR_BTSUS_MONO_X_REAR_TILE_A = 4338, - SPR_BTSUS_MONO_X_REAR_TILE_B = 4339, - SPR_BTSUS_MONO_X_REAR_TILE_D = 4340, - SPR_BTSUS_MONO_X_REAR_TILE_C = 4341, - SPR_BTSUS_MONO_Y_REAR_TILE_E = 4342, - SPR_BTSUS_MONO_X_REAR_TILE_E = 4343, - SPR_BTSUS_MONO_X_REAR_TILE_F = 4344, - SPR_BTSUS_MONO_Y_REAR_TILE_F = 4345, - SPR_BTSUS_MGLV_Y_REAR_TILE_A = 4374, - SPR_BTSUS_MGLV_Y_REAR_TILE_B = 4375, - SPR_BTSUS_MGLV_Y_REAR_TILE_D = 4376, - SPR_BTSUS_MGLV_Y_REAR_TILE_C = 4377, - SPR_BTSUS_MGLV_X_REAR_TILE_A = 4378, - SPR_BTSUS_MGLV_X_REAR_TILE_B = 4379, - SPR_BTSUS_MGLV_X_REAR_TILE_D = 4380, - SPR_BTSUS_MGLV_X_REAR_TILE_C = 4381, - SPR_BTSUS_MGLV_Y_REAR_TILE_E = 4382, - SPR_BTSUS_MGLV_X_REAR_TILE_E = 4383, - SPR_BTSUS_MGLV_X_REAR_TILE_F = 4384, - SPR_BTSUS_MGLV_Y_REAR_TILE_F = 4385, + SPR_BTSUS_ROAD_Y_REAR_TILE_A = 2453, + SPR_BTSUS_ROAD_Y_REAR_TILE_B = 2454, + SPR_BTSUS_Y_FRONT_TILE_A = 2455, + SPR_BTSUS_Y_FRONT_TILE_B = 2456, + SPR_BTSUS_ROAD_Y_REAR_TILE_D = 2457, + SPR_BTSUS_ROAD_Y_REAR_TILE_C = 2458, + SPR_BTSUS_Y_FRONT_TILE_D = 2459, + SPR_BTSUS_Y_FRONT_TILE_C = 2460, + SPR_BTSUS_ROAD_X_REAR_TILE_A = 2461, + SPR_BTSUS_ROAD_X_REAR_TILE_B = 2462, + SPR_BTSUS_X_FRONT_TILE_A = 2463, + SPR_BTSUS_X_FRONT_TILE_B = 2464, + SPR_BTSUS_ROAD_X_TILE_D = 2465, + SPR_BTSUS_ROAD_X_TILE_C = 2466, + SPR_BTSUS_X_FRONT_TILE_D = 2467, + SPR_BTSUS_X_FRONT_TILE_C = 2468, + SPR_BTSUS_RAIL_Y_REAR_TILE_A = 2469, + SPR_BTSUS_RAIL_Y_REAR_TILE_B = 2470, + SPR_BTSUS_RAIL_Y_REAR_TILE_D = 2471, + SPR_BTSUS_RAIL_Y_REAR_TILE_C = 2472, + SPR_BTSUS_RAIL_X_REAR_TILE_A = 2473, + SPR_BTSUS_RAIL_X_REAR_TILE_B = 2474, + SPR_BTSUS_RAIL_X_REAR_TILE_D = 2475, + SPR_BTSUS_RAIL_X_REAR_TILE_C = 2476, + SPR_BTSUS_Y_PILLAR_TILE_A = 2477, + SPR_BTSUS_Y_PILLAR_TILE_B = 2478, + SPR_BTSUS_Y_PILLAR_TILE_D = 2479, + SPR_BTSUS_Y_PILLAR_TILE_C = 2480, + SPR_BTSUS_X_PILLAR_TILE_A = 2481, + SPR_BTSUS_X_PILLAR_TILE_B = 2482, + SPR_BTSUS_X_PILLAR_TILE_D = 2483, + SPR_BTSUS_X_PILLAR_TILE_C = 2484, + SPR_BTSUS_RAIL_Y_REAR_TILE_E = 2485, + SPR_BTSUS_RAIL_X_REAR_TILE_E = 2486, + SPR_BTSUS_ROAD_Y_REAR_TILE_E = 2487, + SPR_BTSUS_ROAD_X_REAR_TILE_E = 2488, + SPR_BTSUS_Y_FRONT_TILE_E = 2489, + SPR_BTSUS_X_FRONT_TILE_E = 2490, + SPR_BTSUS_Y_PILLAR_TILE_E = 2491, + SPR_BTSUS_X_PILLAR_TILE_E = 2492, + SPR_BTSUS_RAIL_X_REAR_TILE_F = 2493, + SPR_BTSUS_RAIL_Y_REAR_TILE_F = 2494, + SPR_BTSUS_ROAD_X_REAR_TILE_F = 2495, + SPR_BTSUS_ROAD_Y_REAR_TILE_F = 2496, + SPR_BTSUS_Y_FRONT = 2497, + SPR_BTSUS_X_FRONT = 2498, + SPR_BTSUS_MONO_Y_REAR_TILE_A = 4334, + SPR_BTSUS_MONO_Y_REAR_TILE_B = 4335, + SPR_BTSUS_MONO_Y_REAR_TILE_D = 4336, + SPR_BTSUS_MONO_Y_REAR_TILE_C = 4337, + SPR_BTSUS_MONO_X_REAR_TILE_A = 4338, + SPR_BTSUS_MONO_X_REAR_TILE_B = 4339, + SPR_BTSUS_MONO_X_REAR_TILE_D = 4340, + SPR_BTSUS_MONO_X_REAR_TILE_C = 4341, + SPR_BTSUS_MONO_Y_REAR_TILE_E = 4342, + SPR_BTSUS_MONO_X_REAR_TILE_E = 4343, + SPR_BTSUS_MONO_X_REAR_TILE_F = 4344, + SPR_BTSUS_MONO_Y_REAR_TILE_F = 4345, + SPR_BTSUS_MGLV_Y_REAR_TILE_A = 4374, + SPR_BTSUS_MGLV_Y_REAR_TILE_B = 4375, + SPR_BTSUS_MGLV_Y_REAR_TILE_D = 4376, + SPR_BTSUS_MGLV_Y_REAR_TILE_C = 4377, + SPR_BTSUS_MGLV_X_REAR_TILE_A = 4378, + SPR_BTSUS_MGLV_X_REAR_TILE_B = 4379, + SPR_BTSUS_MGLV_X_REAR_TILE_D = 4380, + SPR_BTSUS_MGLV_X_REAR_TILE_C = 4381, + SPR_BTSUS_MGLV_Y_REAR_TILE_E = 4382, + SPR_BTSUS_MGLV_X_REAR_TILE_E = 4383, + SPR_BTSUS_MGLV_X_REAR_TILE_F = 4384, + SPR_BTSUS_MGLV_Y_REAR_TILE_F = 4385, /* cantilever bridges */ /* They have three different kinds of tiles: - END(ing), MID(dle), BEG(gining) - */ - SPR_BTCAN_RAIL_X_BEG = 2507, - SPR_BTCAN_RAIL_X_MID = 2508, - SPR_BTCAN_RAIL_X_END = 2509, - SPR_BTCAN_RAIL_Y_END = 2510, - SPR_BTCAN_RAIL_Y_MID = 2511, - SPR_BTCAN_RAIL_Y_BEG = 2512, - SPR_BTCAN_ROAD_X_BEG = 2513, - SPR_BTCAN_ROAD_X_MID = 2514, - SPR_BTCAN_ROAD_X_END = 2515, - SPR_BTCAN_ROAD_Y_END = 2516, - SPR_BTCAN_ROAD_Y_MID = 2517, - SPR_BTCAN_ROAD_Y_BEG = 2518, - SPR_BTCAN_X_FRONT_BEG = 2519, - SPR_BTCAN_X_FRONT_MID = 2520, - SPR_BTCAN_X_FRONT_END = 2521, - SPR_BTCAN_Y_FRONT_END = 2522, - SPR_BTCAN_Y_FRONT_MID = 2523, - SPR_BTCAN_Y_FRONT_BEG = 2524, - SPR_BTCAN_X_PILLAR_BEG = 2525, - SPR_BTCAN_X_PILLAR_MID = 2526, - SPR_BTCAN_Y_PILLAR_MID = 2527, - SPR_BTCAN_Y_PILLAR_BEG = 2528, - SPR_BTCAN_MONO_X_BEG = 4346, - SPR_BTCAN_MONO_X_MID = 4347, - SPR_BTCAN_MONO_X_END = 4348, - SPR_BTCAN_MONO_Y_END = 4349, - SPR_BTCAN_MONO_Y_MID = 4350, - SPR_BTCAN_MONO_Y_BEG = 4351, - SPR_BTCAN_MGLV_X_BEG = 4386, - SPR_BTCAN_MGLV_X_MID = 4387, - SPR_BTCAN_MGLV_X_END = 4388, - SPR_BTCAN_MGLV_Y_END = 4389, - SPR_BTCAN_MGLV_Y_MID = 4390, - SPR_BTCAN_MGLV_Y_BEG = 4391, + * END(ing), MID(dle), BEG(gining) */ + SPR_BTCAN_RAIL_X_BEG = 2507, + SPR_BTCAN_RAIL_X_MID = 2508, + SPR_BTCAN_RAIL_X_END = 2509, + SPR_BTCAN_RAIL_Y_END = 2510, + SPR_BTCAN_RAIL_Y_MID = 2511, + SPR_BTCAN_RAIL_Y_BEG = 2512, + SPR_BTCAN_ROAD_X_BEG = 2513, + SPR_BTCAN_ROAD_X_MID = 2514, + SPR_BTCAN_ROAD_X_END = 2515, + SPR_BTCAN_ROAD_Y_END = 2516, + SPR_BTCAN_ROAD_Y_MID = 2517, + SPR_BTCAN_ROAD_Y_BEG = 2518, + SPR_BTCAN_X_FRONT_BEG = 2519, + SPR_BTCAN_X_FRONT_MID = 2520, + SPR_BTCAN_X_FRONT_END = 2521, + SPR_BTCAN_Y_FRONT_END = 2522, + SPR_BTCAN_Y_FRONT_MID = 2523, + SPR_BTCAN_Y_FRONT_BEG = 2524, + SPR_BTCAN_X_PILLAR_BEG = 2525, + SPR_BTCAN_X_PILLAR_MID = 2526, + SPR_BTCAN_Y_PILLAR_MID = 2527, + SPR_BTCAN_Y_PILLAR_BEG = 2528, + SPR_BTCAN_MONO_X_BEG = 4346, + SPR_BTCAN_MONO_X_MID = 4347, + SPR_BTCAN_MONO_X_END = 4348, + SPR_BTCAN_MONO_Y_END = 4349, + SPR_BTCAN_MONO_Y_MID = 4350, + SPR_BTCAN_MONO_Y_BEG = 4351, + SPR_BTCAN_MGLV_X_BEG = 4386, + SPR_BTCAN_MGLV_X_MID = 4387, + SPR_BTCAN_MGLV_X_END = 4388, + SPR_BTCAN_MGLV_Y_END = 4389, + SPR_BTCAN_MGLV_Y_MID = 4390, + SPR_BTCAN_MGLV_Y_BEG = 4391, /* little concrete bridge */ - SPR_BTCON_RAIL_X = 2493, - SPR_BTCON_RAIL_Y = 2494, - SPR_BTCON_ROAD_X = 2495, - SPR_BTCON_ROAD_Y = 2496, - SPR_BTCON_X_FRONT = 2497, - SPR_BTCON_Y_FRONT = 2498, - SPR_BTCON_X_PILLAR = 2505, - SPR_BTCON_Y_PILLAR = 2506, - SPR_BTCON_MONO_X = 4344, - SPR_BTCON_MONO_Y = 4345, - SPR_BTCON_MGLV_X = 4384, - SPR_BTCON_MGLV_Y = 4385, + SPR_BTCON_RAIL_X = 2493, + SPR_BTCON_RAIL_Y = 2494, + SPR_BTCON_ROAD_X = 2495, + SPR_BTCON_ROAD_Y = 2496, + SPR_BTCON_X_FRONT = 2497, + SPR_BTCON_Y_FRONT = 2498, + SPR_BTCON_X_PILLAR = 2505, + SPR_BTCON_Y_PILLAR = 2506, + SPR_BTCON_MONO_X = 4344, + SPR_BTCON_MONO_Y = 4345, + SPR_BTCON_MGLV_X = 4384, + SPR_BTCON_MGLV_Y = 4385, /* little steel girder bridge */ - SPR_BTGIR_RAIL_X = 2553, - SPR_BTGIR_RAIL_Y = 2554, - SPR_BTGIR_ROAD_X = 2555, - SPR_BTGIR_ROAD_Y = 2556, - SPR_BTGIR_X_FRONT = 2557, - SPR_BTGIR_Y_FRONT = 2558, - SPR_BTGIR_X_PILLAR = 2505, - SPR_BTGIR_Y_PILLAR = 2506, - SPR_BTGIR_MONO_X = 4362, - SPR_BTGIR_MONO_Y = 4363, - SPR_BTGIR_MGLV_X = 4402, - SPR_BTGIR_MGLV_Y = 4403, + SPR_BTGIR_RAIL_X = 2553, + SPR_BTGIR_RAIL_Y = 2554, + SPR_BTGIR_ROAD_X = 2555, + SPR_BTGIR_ROAD_Y = 2556, + SPR_BTGIR_X_FRONT = 2557, + SPR_BTGIR_Y_FRONT = 2558, + SPR_BTGIR_X_PILLAR = 2505, + SPR_BTGIR_Y_PILLAR = 2506, + SPR_BTGIR_MONO_X = 4362, + SPR_BTGIR_MONO_Y = 4363, + SPR_BTGIR_MGLV_X = 4402, + SPR_BTGIR_MGLV_Y = 4403, /* tubular bridges */ /* tubular bridges have 3 kinds of tiles: @@ -651,64 +649,119 @@ enum Sprites { a middle tile (full tunnel), marked _MID and an end tile (half a tube on the near side, maked _END */ - SPR_BTTUB_X_FRONT_BEG = 2559, - SPR_BTTUB_X_FRONT_MID = 2660, - SPR_BTTUB_X_FRONT_END = 2561, - SPR_BTTUB_Y_FRONT_END = 2562, - SPR_BTTUB_Y_FRONT_MID = 2563, - SPR_BTTUB_Y_FRONT_BEG = 2564, - SPR_BTTUB_X_RAIL_REAR_BEG = 2569, - SPR_BTTUB_X_RAIL_REAR_MID = 2570, - SPR_BTTUB_X_RAIL_REAR_END = 2571, + SPR_BTTUB_X_FRONT_BEG = 2559, + SPR_BTTUB_X_FRONT_MID = 2660, + SPR_BTTUB_X_FRONT_END = 2561, + SPR_BTTUB_Y_FRONT_END = 2562, + SPR_BTTUB_Y_FRONT_MID = 2563, + SPR_BTTUB_Y_FRONT_BEG = 2564, + SPR_BTTUB_X_RAIL_REAR_BEG = 2569, + SPR_BTTUB_X_RAIL_REAR_MID = 2570, + SPR_BTTUB_X_RAIL_REAR_END = 2571, /* ramps (for all bridges except wood and tubular?)*/ SPR_BTGEN_RAIL_X_SLOPE_DOWN = 2437, - SPR_BTGEN_RAIL_X_SLOPE_UP = 2438, - SPR_BTGEN_RAIL_Y_SLOPE_DOWN = 2439, - SPR_BTGEN_RAIL_Y_SLOPE_UP = 2440, - SPR_BTGEN_RAIL_RAMP_X_UP = 2441, - SPR_BTGEN_RAIL_RAMP_X_DOWN = 2442, - SPR_BTGEN_RAIL_RAMP_Y_UP = 2443, - SPR_BTGEN_RAIL_RAMP_Y_DOWN = 2444, + SPR_BTGEN_RAIL_X_SLOPE_UP = 2438, + SPR_BTGEN_RAIL_Y_SLOPE_DOWN = 2439, + SPR_BTGEN_RAIL_Y_SLOPE_UP = 2440, + SPR_BTGEN_RAIL_RAMP_X_UP = 2441, + SPR_BTGEN_RAIL_RAMP_X_DOWN = 2442, + SPR_BTGEN_RAIL_RAMP_Y_UP = 2443, + SPR_BTGEN_RAIL_RAMP_Y_DOWN = 2444, SPR_BTGEN_ROAD_X_SLOPE_DOWN = 2445, - SPR_BTGEN_ROAD_X_SLOPE_UP = 2446, - SPR_BTGEN_ROAD_Y_SLOPE_DOWN = 2447, - SPR_BTGEN_ROAD_Y_SLOPE_UP = 2448, - SPR_BTGEN_ROAD_RAMP_X_UP = 2449, - SPR_BTGEN_ROAD_RAMP_X_DOWN = 2450, - SPR_BTGEN_ROAD_RAMP_Y_UP = 2451, - SPR_BTGEN_ROAD_RAMP_Y_DOWN = 2452, + SPR_BTGEN_ROAD_X_SLOPE_UP = 2446, + SPR_BTGEN_ROAD_Y_SLOPE_DOWN = 2447, + SPR_BTGEN_ROAD_Y_SLOPE_UP = 2448, + SPR_BTGEN_ROAD_RAMP_X_UP = 2449, + SPR_BTGEN_ROAD_RAMP_X_DOWN = 2450, + SPR_BTGEN_ROAD_RAMP_Y_UP = 2451, + SPR_BTGEN_ROAD_RAMP_Y_DOWN = 2452, SPR_BTGEN_MONO_X_SLOPE_DOWN = 4326, - SPR_BTGEN_MONO_X_SLOPE_UP = 4327, - SPR_BTGEN_MONO_Y_SLOPE_DOWN = 4328, - SPR_BTGEN_MONO_Y_SLOPE_UP = 4329, - SPR_BTGEN_MONO_RAMP_X_UP = 4330, - SPR_BTGEN_MONO_RAMP_X_DOWN = 4331, - SPR_BTGEN_MONO_RAMP_Y_UP = 4332, - SPR_BTGEN_MONO_RAMP_Y_DOWN = 4333, + SPR_BTGEN_MONO_X_SLOPE_UP = 4327, + SPR_BTGEN_MONO_Y_SLOPE_DOWN = 4328, + SPR_BTGEN_MONO_Y_SLOPE_UP = 4329, + SPR_BTGEN_MONO_RAMP_X_UP = 4330, + SPR_BTGEN_MONO_RAMP_X_DOWN = 4331, + SPR_BTGEN_MONO_RAMP_Y_UP = 4332, + SPR_BTGEN_MONO_RAMP_Y_DOWN = 4333, SPR_BTGEN_MGLV_X_SLOPE_DOWN = 4366, - SPR_BTGEN_MGLV_X_SLOPE_UP = 4367, - SPR_BTGEN_MGLV_Y_SLOPE_DOWN = 4368, - SPR_BTGEN_MGLV_Y_SLOPE_UP = 4369, - SPR_BTGEN_MGLV_RAMP_X_UP = 4370, - SPR_BTGEN_MGLV_RAMP_X_DOWN = 4371, - SPR_BTGEN_MGLV_RAMP_Y_UP = 4372, - SPR_BTGEN_MGLV_RAMP_Y_DOWN = 4373, + SPR_BTGEN_MGLV_X_SLOPE_UP = 4367, + SPR_BTGEN_MGLV_Y_SLOPE_DOWN = 4368, + SPR_BTGEN_MGLV_Y_SLOPE_UP = 4369, + SPR_BTGEN_MGLV_RAMP_X_UP = 4370, + SPR_BTGEN_MGLV_RAMP_X_DOWN = 4371, + SPR_BTGEN_MGLV_RAMP_Y_UP = 4372, + SPR_BTGEN_MGLV_RAMP_Y_DOWN = 4373, /* Vehicle sprite-flags (red/green) */ - SPR_FLAG_VEH_STOPPED = 3090, - SPR_FLAG_VEH_RUNNING = 3091, + SPR_FLAG_VEH_STOPPED = 3090, + SPR_FLAG_VEH_RUNNING = 3091, /* Rotor sprite numbers */ - SPR_ROTOR_STOPPED = 3901, - SPR_ROTOR_MOVING_1 = 3902, - SPR_ROTOR_MOVING_3 = 3904, + SPR_ROTOR_STOPPED = 3901, + SPR_ROTOR_MOVING_1 = 3902, + SPR_ROTOR_MOVING_3 = 3904, /* Town/house sprites */ SPR_LIFT = 1443, + //used in town_land.h + //CNST1..3 = Those are the different stages of construction + //The last 2 hexas correspond to the type of building it represent, if any + SPR_CNST1_TALLOFFICE_00 = 1421, + SPR_CNST2_TALLOFFICE_00 = 1422, + SPR_CNST3_TALLOFFICE_00 = 1423, + SPR_GROUND_TALLOFFICE_00 = 1424, + SPR_BUILD_TALLOFFICE_00 = 1425, //temperate + SPR_CNST1_OFFICE_01 = 1426, + SPR_CNST2_OFFICE_01 = 1427, + SPR_BUILD_OFFICE_01 = 1428, //temperate + SPR_GROUND_OFFICE_01 = 1429, + SPR_CNST1_SMLBLCKFLATS_02 = 1430, //Small Block of Flats + SPR_CNST2_SMLBLCKFLATS_02 = 1431, + SPR_BUILD_SMLBLCKFLATS_02 = 1432, //temperate + SPR_GROUND_SMLBLCKFLATS_02 = 1433, + SPR_CNST1_TEMPCHURCH = 1434, + SPR_CNST2_TEMPCHURCH = 1435, + SPR_BUILD_TEMPCHURCH = 1436, + SPR_GROUND_TEMPCHURCH = 1437, + SPR_CNST1_LARGEOFFICE_04 = 1440, + SPR_CNST2_LARGEOFFICE_04 = 1441, + SPR_BUILD_LARGEOFFICE_04 = 1442, // temperate, sub-arctic, subtropical + SPR_BUILD_LARGEOFFICE_04_SNOW = 4569, // same, with snow + // These are in fact two houses for the same houseID. so V1 and V2 + SPR_CNST1_TOWNHOUSE_06_V1 = 1444, + SPR_CNST2_TOWNHOUSE_06_V1 = 1445, + SPR_BUILD_TOWNHOUSE_06_V1 = 1446, // 1st variation + SPR_GRND_TOWNHOUSE_06_V1 = 1447, + SPR_CNST1_TOWNHOUSE_06_V2 = 1501, // used as ground, but is stage1 + SPR_CNST1_TOWNHOUSE_06_V2_P = 1502, // pipes extensions for previous + SPR_CNST2_TOWNHOUSE_06_V2_G = 1503, // Ground of cnst stage 2 + SPR_CNST2_TOWNHOUSE_06_V2 = 1504, // real cnst stage 2 + SPR_GRND_TOWNHOUSE_06_V2 = 1505, + SPR_BUILD_TOWNHOUSE_06_V2 = 1506, // 2nd variation + SPR_CNST1_HOTEL_07_NW = 1448, + SPR_CNST2_HOTEL_07_NW = 1449, + SPR_BUILD_HOTEL_07_NW = 1450, + SPR_CNST1_HOTEL_07_SE = 1451, + SPR_CNST2_HOTEL_07_SE = 1452, + SPR_BUILD_HOTEL_07_SE = 1453, + SPR_STATUE_HORSERIDER_09 = 1454, + SPR_FOUNTAIN_0A = 1455, + SPR_PARKSTATUE_0B = 1456, + SPR_PARKALLEY_0C = 1457, + SPR_CNST1_OFFICE_0D = 1458, + SPR_CNST2_OFFICE_0D = 1459, + SPR_BUILD_OFFICE_0D = 1460, + SPR_CNST1_SHOPOFFICE_0E = 1461, + SPR_CNST2_SHOPOFFICE_0E = 1462, + SPR_BUILD_SHOPOFFICE_0E = 1463, + SPR_CNST1_SHOPOFFICE_0F = 1464, + SPR_CNST2_SHOPOFFICE_0F = 1465, + SPR_BUILD_SHOPOFFICE_0F = 1466, + /* Easter egg/disaster sprites */ SPR_BLIMP = 3905, // Zeppelin SPR_BLIMP_CRASHING = 3906, @@ -885,14 +938,14 @@ enum Sprites { SPR_BUBBLE_ABSORB_4 = 4762, /* road_gui.c */ - SPR_IMG_ROAD_NW = 1309, - SPR_IMG_ROAD_NE = 1310, - SPR_IMG_ROAD_DEPOT = 1295, - SPR_IMG_BUS_STATION = 749, - SPR_IMG_TRUCK_BAY = 750, - SPR_IMG_BRIDGE = 2594, - SPR_IMG_ROAD_TUNNEL = 2429, - SPR_IMG_REMOVE = 714, + SPR_IMG_ROAD_NW = 1309, + SPR_IMG_ROAD_NE = 1310, + SPR_IMG_ROAD_DEPOT = 1295, + SPR_IMG_BUS_STATION = 749, + SPR_IMG_TRUCK_BAY = 750, + SPR_IMG_BRIDGE = 2594, + SPR_IMG_ROAD_TUNNEL = 2429, + SPR_IMG_REMOVE = 714, /* rail_gui.c */ SPR_IMG_AUTORAIL = SPR_OPENTTD_BASE + 0, @@ -963,6 +1016,7 @@ typedef enum CursorSprites { SPR_CURSOR_EW_MAGLEV = 1273, SPR_CURSOR_NWSE_MAGLEV = 1274, + SPR_CURSOR_RAIL_DEPOT = 1296, SPR_CURSOR_RAIL_STATION = 1300, SPR_CURSOR_TUNNEL_RAIL = 2434, @@ -974,8 +1028,6 @@ typedef enum CursorSprites { SPR_CURSOR_AUTOMAGLEV = SPR_OPENTTD_BASE + 6, SPR_CURSOR_WAYPOINT = SPR_OPENTTD_BASE + 7, - - SPR_CURSOR_RAIL_DEPOT = 1296, SPR_CURSOR_MONO_DEPOT = SPR_OPENTTD_BASE + 11, SPR_CURSOR_MAGLEV_DEPOT = SPR_OPENTTD_BASE + 12, @@ -997,11 +1049,11 @@ typedef enum CursorSprites { /// Animation macro in table/animcursors.h (_animcursors[]) enum AnimCursors { - ANIMCURSOR_DEMOLISH = -1, ///< 704 - 707 - demolish dynamite - ANIMCURSOR_LOWERLAND = -2, ///< 699 - 701 - lower land tool - ANIMCURSOR_RAISELAND = -3, ///< 696 - 698 - raise land tool - ANIMCURSOR_PICKSTATION = -4, ///< 716 - 718 - goto-order icon - ANIMCURSOR_BUILDSIGNALS = -5, ///< 1292 - 1293 - build signal + ANIMCURSOR_DEMOLISH = -1, ///< 704 - 707 - demolish dynamite + ANIMCURSOR_LOWERLAND = -2, ///< 699 - 701 - lower land tool + ANIMCURSOR_RAISELAND = -3, ///< 696 - 698 - raise land tool + ANIMCURSOR_PICKSTATION = -4, ///< 716 - 718 - goto-order icon + ANIMCURSOR_BUILDSIGNALS = -5, ///< 1292 - 1293 - build signal }; /** @@ -1032,9 +1084,9 @@ enum SpriteSetup { */ enum Modifiers { ///when a sprite is to be displayed transparently, this bit needs to be set. - PALETTE_MODIFIER_TRANSPARENT = 1 << TRANSPARENT_BIT, + PALETTE_MODIFIER_TRANSPARENT = 1 << TRANSPARENT_BIT, ///this bit is set when a recoloring process is in action - PALETTE_MODIFIER_COLOR = 1 << RECOLOR_BIT, + PALETTE_MODIFIER_COLOR = 1 << RECOLOR_BIT, //This is used for the GfxFillRect function ///Used to draw a "grey out" rectangle. @see GfxFillRect @@ -1044,9 +1096,8 @@ enum Modifiers { }; /** Masks needed for sprite operations. - * @note Do not modify this enum. Alter SpriteSetup instead - * @see SpriteSetup - */ + * @note Do not modify this enum. Alter SpriteSetup instead + * @see SpriteSetup */ enum SpriteMasks { ///Maximum number of sprites that can be loaded at a given time. MAX_SPRITES = (1 << SPRITE_WIDTH) - 1, @@ -1072,56 +1123,56 @@ enum PaletteSprites { //the actual sprite number is the upper 16 bits of the number ///Here a puslating red tile is drawn if you try to build a wrong tunnel or raise/lower land where it is not possible - PALETTE_TILE_RED_PULSATING = PALETTE_RECOLOR_SPRITE(0x303), + PALETTE_TILE_RED_PULSATING = PALETTE_RECOLOR_SPRITE(0x303), ///makes a square red. is used when removing rails or other stuff - PALETTE_SEL_TILE_RED = PALETTE_RECOLOR_SPRITE(0x304), + PALETTE_SEL_TILE_RED = PALETTE_RECOLOR_SPRITE(0x304), ///This draws a blueish square (catchment areas for example) - PALETTE_SEL_TILE_BLUE = PALETTE_RECOLOR_SPRITE(0x305), + PALETTE_SEL_TILE_BLUE = PALETTE_RECOLOR_SPRITE(0x305), //0x306 is a real sprite (the little dot you get when you try to raise/lower a corner of the map //here the color switches begin //use this if you add stuff to the value, so that the resulting color //is not a fixed value. //NOTE THAT THE SWITCH 0x8000 is NOT present in _TO_COLORS yet! - PALETTE_TO_COLORS = 0x307 << PALETTE_SPRITE_START, - PALETTE_TO_DARK_BLUE = PALETTE_RECOLOR_SPRITE(0x307), - PALETTE_TO_PALE_GREEN = PALETTE_RECOLOR_SPRITE(0x308), - PALETTE_TO_PINK = PALETTE_RECOLOR_SPRITE(0x309), - PALETTE_TO_YELLOW = PALETTE_RECOLOR_SPRITE(0x30A), - PALETTE_TO_RED = PALETTE_RECOLOR_SPRITE(0x30B), - PALETTE_TO_LIGHT_BLUE = PALETTE_RECOLOR_SPRITE(0x30C), - PALETTE_TO_GREEN = PALETTE_RECOLOR_SPRITE(0x30D), - PALETTE_TO_DARK_GREEN = PALETTE_RECOLOR_SPRITE(0x30E), - PALETTE_TO_BLUE = PALETTE_RECOLOR_SPRITE(0x30F), - PALETTE_TO_CREAM = PALETTE_RECOLOR_SPRITE(0x310), + PALETTE_TO_COLORS = 0x307 << PALETTE_SPRITE_START, + PALETTE_TO_DARK_BLUE = PALETTE_RECOLOR_SPRITE(0x307), + PALETTE_TO_PALE_GREEN = PALETTE_RECOLOR_SPRITE(0x308), + PALETTE_TO_PINK = PALETTE_RECOLOR_SPRITE(0x309), + PALETTE_TO_YELLOW = PALETTE_RECOLOR_SPRITE(0x30A), + PALETTE_TO_RED = PALETTE_RECOLOR_SPRITE(0x30B), + PALETTE_TO_LIGHT_BLUE = PALETTE_RECOLOR_SPRITE(0x30C), + PALETTE_TO_GREEN = PALETTE_RECOLOR_SPRITE(0x30D), + PALETTE_TO_DARK_GREEN = PALETTE_RECOLOR_SPRITE(0x30E), + PALETTE_TO_BLUE = PALETTE_RECOLOR_SPRITE(0x30F), + PALETTE_TO_CREAM = PALETTE_RECOLOR_SPRITE(0x310), //maybe don't use as player color because it doesn't display in the graphs? - PALETTE_TO_MAUVE = PALETTE_RECOLOR_SPRITE(0x311), - PALETTE_TO_PURPLE = PALETTE_RECOLOR_SPRITE(0x312), - PALETTE_TO_ORANGE = PALETTE_RECOLOR_SPRITE(0x313), - PALETTE_TO_BROWN = PALETTE_RECOLOR_SPRITE(0x314), - PALETTE_TO_GREY = PALETTE_RECOLOR_SPRITE(0x315), - PALETTE_TO_WHITE = PALETTE_RECOLOR_SPRITE(0x316), - //sets color to bare land stuff, for rail and road (and crossings) - PALETTE_TO_BARE_LAND = PALETTE_RECOLOR_SPRITE(0x317), + PALETTE_TO_MAUVE = PALETTE_RECOLOR_SPRITE(0x311), + PALETTE_TO_PURPLE = PALETTE_RECOLOR_SPRITE(0x312), + PALETTE_TO_ORANGE = PALETTE_RECOLOR_SPRITE(0x313), + PALETTE_TO_BROWN = PALETTE_RECOLOR_SPRITE(0x314), + PALETTE_TO_GREY = PALETTE_RECOLOR_SPRITE(0x315), + PALETTE_TO_WHITE = PALETTE_RECOLOR_SPRITE(0x316), + //sets color to bare land stuff, for rail and road (and crossings) + PALETTE_TO_BARE_LAND = PALETTE_RECOLOR_SPRITE(0x317), //XXX is 318-31A really not used? PALETTE_TO_STRUCT_BLUE = PALETTE_RECOLOR_SPRITE(0x31B), //structure color to something brownish (for the cantilever bridges for example) - PALETTE_TO_STRUCT_BROWN = PALETTE_RECOLOR_SPRITE(0x31C), + PALETTE_TO_STRUCT_BROWN = PALETTE_RECOLOR_SPRITE(0x31C), PALETTE_TO_STRUCT_WHITE = PALETTE_RECOLOR_SPRITE(0x31D), //sets bridge or structure to red, little concrete one and cantilever use this one for example - PALETTE_TO_STRUCT_RED = PALETTE_RECOLOR_SPRITE(0x31E), + PALETTE_TO_STRUCT_RED = PALETTE_RECOLOR_SPRITE(0x31E), PALETTE_TO_STRUCT_GREEN = PALETTE_RECOLOR_SPRITE(0x31F), - PALETTE_TO_STRUCT_CONCRETE = PALETTE_RECOLOR_SPRITE(0x320), //Sets the suspension bridge to concrete, also other strucutures use it - PALETTE_TO_STRUCT_YELLOW = PALETTE_RECOLOR_SPRITE(0x321), //Sets the bridge color to yellow (suspension and tubular) - PALETTE_TO_TRANSPARENT = 0x322 << PALETTE_SPRITE_START | PALETTE_MODIFIER_TRANSPARENT, //This sets the sprite to transparent + PALETTE_TO_STRUCT_CONCRETE = PALETTE_RECOLOR_SPRITE(0x320), //Sets the suspension bridge to concrete, also other strucutures use it + PALETTE_TO_STRUCT_YELLOW = PALETTE_RECOLOR_SPRITE(0x321), //Sets the bridge color to yellow (suspension and tubular) + PALETTE_TO_TRANSPARENT = 0x322 << PALETTE_SPRITE_START | PALETTE_MODIFIER_TRANSPARENT, //This sets the sprite to transparent //This is used for changing the tubular bridges to the silicon display, or some grayish color - PALETTE_TO_STRUCT_GREY = PALETTE_RECOLOR_SPRITE(0x323), - PALETTE_CRASH = PALETTE_RECOLOR_SPRITE(0x324), //this changes stuff to the "crash color" + PALETTE_TO_STRUCT_GREY = PALETTE_RECOLOR_SPRITE(0x323), + PALETTE_CRASH = PALETTE_RECOLOR_SPRITE(0x324), //this changes stuff to the "crash color" //XXX another place where structures are colored. //I'm not sure which colors these are - PALETTE_59E = PALETTE_RECOLOR_SPRITE(0x59E), - PALETTE_59F = PALETTE_RECOLOR_SPRITE(0x59F), + PALETTE_59E = PALETTE_RECOLOR_SPRITE(0x59E), + PALETTE_59F = PALETTE_RECOLOR_SPRITE(0x59F), }; -#undef PALETTE_RECOLOR_SPRITE +/* #undef PALETTE_RECOLOR_SPRITE commented because needed in newgrf.c*/ #define MAKE_TRANSPARENT(img) (img = (img & SPRITE_MASK) | PALETTE_TO_TRANSPARENT) diff --git a/table/station_land.h b/table/station_land.h index d2f534a4e..cfdf28039 100644 --- a/table/station_land.h +++ b/table/station_land.h @@ -3,58 +3,58 @@ #define TILE_SEQ_END() { 0x80, 0, 0, 0, 0, 0, 0 } static const DrawTileSeqStruct _station_display_datas_0[] = { - { 0, 0, 0, 16, 5, 2, 0x42E | PALETTE_MODIFIER_COLOR }, - { 0, 11, 0, 16, 5, 2, 0x430 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 5, 2, SPR_RAIL_PLATFORM_X_REAR | PALETTE_MODIFIER_COLOR }, + { 0, 11, 0, 16, 5, 2, SPR_RAIL_PLATFORM_X_FRONT | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_1[] = { - { 0, 0, 0, 5, 16, 2, 0x42F | PALETTE_MODIFIER_COLOR }, - { 11, 0, 0, 5, 16, 2, 0x42D | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_Y_REAR | PALETTE_MODIFIER_COLOR }, + { 11, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_Y_FRONT | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_2[] = { - { 0, 0, 0, 16, 5, 2, 0x431 | PALETTE_MODIFIER_COLOR }, - { 0, 11, 0, 16, 5, 2, 0x430 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 5, 2, SPR_RAIL_PLATFORM_BUILDING_X | PALETTE_MODIFIER_COLOR }, + { 0, 11, 0, 16, 5, 2, SPR_RAIL_PLATFORM_X_FRONT | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_3[] = { - { 0, 0, 0, 5, 16, 2, 0x432 | PALETTE_MODIFIER_COLOR }, - { 11, 0, 0, 5, 16, 2, 0x42D | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_BUILDING_Y | PALETTE_MODIFIER_COLOR }, + { 11, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_Y_FRONT | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_4[] = { - { 0, 0, 0, 16, 5, 7, 0x434 | PALETTE_MODIFIER_COLOR }, - { 0, 11, 0, 16, 5, 2, 0x430 | PALETTE_MODIFIER_COLOR }, - { 0, 0, 16, 16, 16, 10, 0x437 | PALETTE_MODIFIER_COLOR }, - { 0, 0,0x80, 0, 0, 0, 0x43B | PALETTE_TO_TRANSPARENT }, + { 0, 0, 0, 16, 5, 7, SPR_RAIL_PLATFORM_PILLARS_X_REAR | PALETTE_MODIFIER_COLOR }, + { 0, 11, 0, 16, 5, 2, SPR_RAIL_PLATFORM_X_FRONT | PALETTE_MODIFIER_COLOR }, + { 0, 0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_X_TILE_A | PALETTE_MODIFIER_COLOR }, + { 0, 0,0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_X_TILE_A | PALETTE_TO_TRANSPARENT }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_5[] = { - { 0, 0, 0, 5, 16, 2, 0x435 | PALETTE_MODIFIER_COLOR }, - { 11, 0, 0, 5, 16, 2, 0x42D | PALETTE_MODIFIER_COLOR }, - { 0, 0, 16, 16, 16, 10, 0x438 | PALETTE_MODIFIER_COLOR }, - { 0, 0,0x80, 0, 0, 0, 0x43C | PALETTE_TO_TRANSPARENT }, + { 0, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_PILLARS_Y_REAR | PALETTE_MODIFIER_COLOR }, + { 11, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_Y_FRONT | PALETTE_MODIFIER_COLOR }, + { 0, 0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_Y_TILE_A | PALETTE_MODIFIER_COLOR }, + { 0, 0,0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_Y_TILE_A | PALETTE_TO_TRANSPARENT }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_6[] = { - { 0, 0, 0, 16, 5, 2, 0x42E | PALETTE_MODIFIER_COLOR }, - { 0, 11, 0, 16, 5, 2, 0x436 | PALETTE_MODIFIER_COLOR }, - { 0, 0, 16, 16, 16, 10, 0x439 | PALETTE_MODIFIER_COLOR }, - { 0, 0,0x80, 0, 0, 0, 0x43D | PALETTE_TO_TRANSPARENT }, + { 0, 0, 0, 16, 5, 2, SPR_RAIL_PLATFORM_X_REAR | PALETTE_MODIFIER_COLOR }, + { 0, 11, 0, 16, 5, 2, SPR_RAIL_PLATFORM_PILLARS_X_FRONT | PALETTE_MODIFIER_COLOR }, + { 0, 0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_X_TILE_B | PALETTE_MODIFIER_COLOR }, + { 0, 0,0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_X_TILE_B | PALETTE_TO_TRANSPARENT }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_7[] = { - { 0, 0, 0, 5, 16, 2, 0x42F | PALETTE_MODIFIER_COLOR }, - { 11, 0, 0, 5, 16, 2, 0x433 | PALETTE_MODIFIER_COLOR }, - { 0, 0, 16, 16, 16, 10, 0x43A | PALETTE_MODIFIER_COLOR }, - { 0, 0,0x80, 0, 0, 0, 0x43E | PALETTE_TO_TRANSPARENT }, + { 0, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_Y_REAR | PALETTE_MODIFIER_COLOR }, + { 11, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_PILLARS_Y_FRONT | PALETTE_MODIFIER_COLOR }, + { 0, 0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_Y_TILE_B | PALETTE_MODIFIER_COLOR }, + { 0, 0,0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_Y_TILE_B | PALETTE_TO_TRANSPARENT }, TILE_SEQ_END() }; @@ -63,12 +63,12 @@ static const DrawTileSeqStruct _station_display_datas_8[] = { }; static const DrawTileSeqStruct _station_display_datas_9[] = { - { 0, 0, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_10[] = { - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; @@ -113,85 +113,85 @@ static const DrawTileSeqStruct _station_display_datas_20[] = { }; static const DrawTileSeqStruct _station_display_datas_21[] = { - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_22[] = { - { 0, 15, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, + { 0, 15, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_23[] = { - { 0, 15, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, + { 0, 15, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_24[] = { - { 0, 15, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, + { 0, 15, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_25[] = { - { 0, 15, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, + { 0, 15, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_26[] = { - { 0, 15, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, + { 0, 15, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_27[] = { - { 2, 0, 0, 11, 16, 40, 0xA5A | PALETTE_MODIFIER_COLOR }, + { 2, 0, 0, 11, 16, 40, SPR_AIRPORT_TERMINAL_A | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_28[] = { - { 3, 3, 0, 10, 10, 60, 0xA5B | PALETTE_MODIFIER_COLOR }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 3, 3, 0, 10, 10, 60, SPR_AIRPORT_TOWER | PALETTE_MODIFIER_COLOR }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_29[] = { - { 0, 1, 0, 14, 14, 30, 0xA5C | PALETTE_MODIFIER_COLOR }, + { 0, 1, 0, 14, 14, 30, SPR_AIRPORT_CONCOURSE | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_30[] = { - { 3, 3, 0, 10, 11, 35, 0xA5D | PALETTE_MODIFIER_COLOR }, + { 3, 3, 0, 10, 11, 35, SPR_AIRPORT_TERMINAL_B | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_31[] = { - { 0, 3, 0, 16, 11, 40, 0xA5E | PALETTE_MODIFIER_COLOR }, + { 0, 3, 0, 16, 11, 40, SPR_AIRPORT_TERMINAL_C | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_32[] = { - { 14, 0, 0, 2, 16, 28, 0xA5F | PALETTE_MODIFIER_COLOR }, - { 0, 0, 0, 2, 16, 28, 0xA60 }, + { 14, 0, 0, 2, 16, 28, SPR_AIRPORT_HANGAR_FRONT | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 2, 16, 28, SPR_AIRPORT_HANGAR_REAR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_33[] = { - { 7, 11, 0, 3, 3, 14, 0xA63 }, - { 0, 0, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, + { 7, 11, 0, 3, 3, 14, SPR_AIRPORT_JETWAY_1 }, + { 0, 0, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_34[] = { - { 2, 7, 0, 3, 3, 14, 0xA64 }, + { 2, 7, 0, 3, 3, 14, SPR_AIRPORT_JETWAY_2 }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_35[] = { - { 3, 2, 0, 3, 3, 14, 0xA65 }, + { 3, 2, 0, 3, 3, 14, SPR_AIRPORT_JETWAY_3 }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_36[] = { - { 0, 8, 0, 14, 3, 14, 0xA66 }, + { 0, 8, 0, 14, 3, 14, SPR_AIRPORT_PASSENGER_TUNNEL }, TILE_SEQ_END() }; @@ -200,85 +200,85 @@ static const DrawTileSeqStruct _station_display_datas_37[] = { }; static const DrawTileSeqStruct _station_display_datas_38[] = { - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_39[] = { - { 7, 7, 0, 2, 2, 8, 0xA78 }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_1 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_40[] = { - { 7, 7, 0, 2, 2, 8, 0xA79 }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_2 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_41[] = { - { 7, 7, 0, 2, 2, 8, 0xA7A }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_3 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_42[] = { - { 7, 7, 0, 2, 2, 8, 0xA7B }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_4 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_43[] = { - { 7, 7, 0, 2, 2, 8, 0xA7C }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_5 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_44[] = { - { 7, 7, 0, 2, 2, 8, 0xA7D }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_6 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_45[] = { - { 7, 7, 0, 2, 2, 8, 0xA7E }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_7 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_46[] = { - { 7, 7, 0, 2, 2, 8, 0xA7F }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_8 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_47[] = { - { 7, 7, 0, 2, 2, 8, 0xA80 }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_9 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_48[] = { - { 7, 7, 0, 2, 2, 8, 0xA81 }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_A }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_49[] = { - { 7, 7, 0, 2, 2, 8, 0xA82 }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_B }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_50[] = { - { 7, 7, 0, 2, 2, 8, 0xA83 }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_C }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_51[] = { - { 7, 7, 0, 2, 2, 70, 0xA29 }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 70, SPR_UNMOVABLE_TRANSMITTER }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; @@ -291,12 +291,12 @@ static const DrawTileSeqStruct _station_display_datas_53[] = { }; static const DrawTileSeqStruct _station_display_datas_54[] = { - { 0, 0, 0, 15, 15, 30, 0xA6C | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 15, 15, 30, SPR_AIRFIELD_TERM_C_BUILD | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_55[] = { - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; @@ -309,108 +309,108 @@ static const DrawTileSeqStruct _station_display_datas_57[] = { }; static const DrawTileSeqStruct _station_display_datas_58[] = { - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, - { 4, 11, 0, 1, 1, 20, 0xA74 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, + { 4, 11, 0, 1, 1, 20, SPR_AIRFIELD_WIND_1 | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_59[] = { - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, - { 4, 11, 0, 1, 1, 20, 0xA75 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, + { 4, 11, 0, 1, 1, 20, SPR_AIRFIELD_WIND_2 | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_60[] = { - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, - { 4, 11, 0, 1, 1, 20, 0xA76 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, + { 4, 11, 0, 1, 1, 20, SPR_AIRFIELD_WIND_3 | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_61[] = { - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, - { 4, 11, 0, 1, 1, 20, 0xA77 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, + { 4, 11, 0, 1, 1, 20, SPR_AIRFIELD_WIND_4 | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_62[] = { - { 0, 15, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, + { 0, 15, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_63[] = { - { 0, 15, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, + { 0, 15, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_64[] = { - { 0, 15, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, + { 0, 15, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_65[] = { - { 14, 0, 0, 2, 16, 28, 0xA61 | PALETTE_MODIFIER_COLOR }, - { 0, 0, 0, 2, 16, 28, 0xA62 }, + { 14, 0, 0, 2, 16, 28, SPR_AIRFIELD_HANGAR_FRONT | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 2, 16, 28, SPR_AIRFIELD_HANGAR_REAR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_66[] = { - { 0, 0, 0, 16, 16, 60, 0xA49 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 16, 60, SPR_HELIPORT | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_67[] = { - { 0, 15, 0, 13, 1, 10, 0xA98 | PALETTE_MODIFIER_COLOR }, - { 13, 0, 0, 3, 16, 10, 0xA9C | PALETTE_MODIFIER_COLOR }, - { 2, 0, 0, 11, 1, 10, 0xAA0 | PALETTE_MODIFIER_COLOR }, + { 0, 15, 0, 13, 1, 10, SPR_TRUCK_STOP_NE_BUILD_A | PALETTE_MODIFIER_COLOR }, + { 13, 0, 0, 3, 16, 10, SPR_TRUCK_STOP_NE_BUILD_B | PALETTE_MODIFIER_COLOR }, + { 2, 0, 0, 11, 1, 10, SPR_TRUCK_STOP_NE_BUILD_C | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_68[] = { - { 15, 3, 0, 1, 13, 10, 0xA99 | PALETTE_MODIFIER_COLOR }, - { 0, 0, 0, 16, 3, 10, 0xA9D | PALETTE_MODIFIER_COLOR }, - { 0, 3, 0, 1, 11, 10, 0xAA1 | PALETTE_MODIFIER_COLOR }, + { 15, 3, 0, 1, 13, 10, SPR_TRUCK_STOP_SE_BUILD_A | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 3, 10, SPR_TRUCK_STOP_SE_BUILD_B | PALETTE_MODIFIER_COLOR }, + { 0, 3, 0, 1, 11, 10, SPR_TRUCK_STOP_SE_BUILD_C | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_69[] = { - { 3, 0, 0, 13, 1, 10, 0xA9A | PALETTE_MODIFIER_COLOR }, - { 0, 0, 0, 3, 16, 10, 0xA9E | PALETTE_MODIFIER_COLOR }, - { 3, 15, 0, 11, 1, 10, 0xAA2 | PALETTE_MODIFIER_COLOR }, + { 3, 0, 0, 13, 1, 10, SPR_TRUCK_STOP_SW_BUILD_A | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 3, 16, 10, SPR_TRUCK_STOP_SW_BUILD_B | PALETTE_MODIFIER_COLOR }, + { 3, 15, 0, 11, 1, 10, SPR_TRUCK_STOP_SW_BUILD_C | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_70[] = { - { 0, 0, 0, 1, 13, 10, 0xA9B | PALETTE_MODIFIER_COLOR }, - { 0, 13, 0, 16, 3, 10, 0xA9F | PALETTE_MODIFIER_COLOR }, - { 15, 2, 0, 1, 11, 10, 0xAA3 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 1, 13, 10, SPR_TRUCK_STOP_NW_BUILD_A | PALETTE_MODIFIER_COLOR }, + { 0, 13, 0, 16, 3, 10, SPR_TRUCK_STOP_NW_BUILD_B | PALETTE_MODIFIER_COLOR }, + { 15, 2, 0, 1, 11, 10, SPR_TRUCK_STOP_NW_BUILD_C | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_71[] = { - { 2, 0, 0, 11, 1, 10, 0xA88 | PALETTE_MODIFIER_COLOR }, - { 13, 0, 0, 3, 16, 10, 0xA8C | PALETTE_MODIFIER_COLOR }, - { 0, 13, 0, 13, 3, 10, 0xA90 | PALETTE_MODIFIER_COLOR }, + { 2, 0, 0, 11, 1, 10, SPR_BUS_STOP_NE_BUILD_A | PALETTE_MODIFIER_COLOR }, + { 13, 0, 0, 3, 16, 10, SPR_BUS_STOP_NE_BUILD_B | PALETTE_MODIFIER_COLOR }, + { 0, 13, 0, 13, 3, 10, SPR_BUS_STOP_NE_BUILD_C | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_72[] = { - { 0, 3, 0, 1, 11, 10, 0xA89 | PALETTE_MODIFIER_COLOR }, - { 0, 0, 0, 16, 3, 10, 0xA8D | PALETTE_MODIFIER_COLOR }, - { 13, 3, 0, 3, 13, 10, 0xA91 | PALETTE_MODIFIER_COLOR }, + { 0, 3, 0, 1, 11, 10, SPR_BUS_STOP_SE_BUILD_A | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 3, 10, SPR_BUS_STOP_SE_BUILD_B | PALETTE_MODIFIER_COLOR }, + { 13, 3, 0, 3, 13, 10, SPR_BUS_STOP_SE_BUILD_C | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_73[] = { - { 3, 15, 0, 11, 1, 10, 0xA8A | PALETTE_MODIFIER_COLOR }, - { 0, 0, 0, 3, 16, 10, 0xA8E | PALETTE_MODIFIER_COLOR }, - { 3, 0, 0, 13, 3, 10, 0xA92 | PALETTE_MODIFIER_COLOR }, + { 3, 15, 0, 11, 1, 10, SPR_BUS_STOP_SW_BUILD_A | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 3, 16, 10, SPR_BUS_STOP_SW_BUILD_B | PALETTE_MODIFIER_COLOR }, + { 3, 0, 0, 13, 3, 10, SPR_BUS_STOP_SW_BUILD_C | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_74[] = { - { 15, 2, 0, 1, 11, 10, 0xA8B | PALETTE_MODIFIER_COLOR }, - { 0, 13, 0, 16, 3, 10, 0xA8F | PALETTE_MODIFIER_COLOR }, - { 0, 0, 0, 3, 13, 10, 0xA93 | PALETTE_MODIFIER_COLOR }, + { 15, 2, 0, 1, 11, 10, SPR_BUS_STOP_NW_BUILD_A | PALETTE_MODIFIER_COLOR }, + { 0, 13, 0, 16, 3, 10, SPR_BUS_STOP_NW_BUILD_B | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 3, 13, 10, SPR_BUS_STOP_NW_BUILD_C | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; @@ -419,32 +419,32 @@ static const DrawTileSeqStruct _station_display_datas_75[] = { }; static const DrawTileSeqStruct _station_display_datas_76[] = { - { 0, 4, 0, 16, 8, 8, 0xAA7 }, + { 0, 4, 0, 16, 8, 8, SPR_DOCK_SLOPE_NE }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_77[] = { - { 4, 0, 0, 8, 16, 8, 0xAA8 }, + { 4, 0, 0, 8, 16, 8, SPR_DOCK_SLOPE_SE }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_78[] = { - { 0, 4, 0, 16, 8, 8, 0xAA9 }, + { 0, 4, 0, 16, 8, 8, SPR_DOCK_SLOPE_SW }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_79[] = { - { 4, 0, 0, 8, 16, 8, 0xAAA }, + { 4, 0, 0, 8, 16, 8, SPR_DOCK_SLOPE_NW }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_80[] = { - { 0, 4, 0, 16, 8, 8, 0xAAB }, + { 0, 4, 0, 16, 8, 8, SPR_DOCK_FLAT_X }, TILE_SEQ_END() }; static const DrawTileSeqStruct _station_display_datas_81[] = { - { 4, 0, 0, 8, 16, 8, 0xAAC }, + { 4, 0, 0, 8, 16, 8, SPR_DOCK_FLAT_Y }, TILE_SEQ_END() }; @@ -465,34 +465,34 @@ static const DrawTileSeqStruct _station_display_datas_084[] = { // control tower with concrete underground and no fence // concrete underground static const DrawTileSeqStruct _station_display_datas_085[] = { - { 3, 3, 0, 10, 10, 60, 0xA5B | PALETTE_MODIFIER_COLOR }, // control tower + { 3, 3, 0, 10, 10, 60, SPR_AIRPORT_TOWER | PALETTE_MODIFIER_COLOR }, // control tower TILE_SEQ_END() }; // new airportdepot, facing west // concrete underground static const DrawTileSeqStruct _station_display_datas_086[] = { - { 14, 0, 0, 2, 16, 28, 0xA61 | PALETTE_MODIFIER_COLOR }, - { 0, 0, 0, 2, 16, 28, 0xA62 }, + { 14, 0, 0, 2, 16, 28, SPR_AIRFIELD_HANGAR_FRONT | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 2, 16, 28, SPR_AIRFIELD_HANGAR_REAR }, TILE_SEQ_END() }; // asphalt tile with fences in north // concrete underground static const DrawTileSeqStruct _station_display_datas_087[] = { - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // end of runway static const DrawTileSeqStruct _station_display_datas_088[] = { - { 0, 0, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, // fences + { 0, 0, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, // fences TILE_SEQ_END() }; // runway tiles static const DrawTileSeqStruct _station_display_datas_089[] = { - { 0, 0, 0, 16, 1, 6, 0xA68 | PALETTE_MODIFIER_COLOR }, // fences + { 0, 0, 0, 16, 1, 6, SPR_AIRPORT_FENCE_X | PALETTE_MODIFIER_COLOR }, // fences TILE_SEQ_END() }; @@ -500,85 +500,85 @@ static const DrawTileSeqStruct _station_display_datas_089[] = { // concrete underground //BEGIN static const DrawTileSeqStruct _station_display_datas_090[] = { - { 7, 7, 0, 2, 2, 8, 0xA78 }, // turning radar - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, //fences + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_1 }, // turning radar + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, //fences TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_091[] = { - { 7, 7, 0, 2, 2, 8, 0xA79 }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_2 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_092[] = { - { 7, 7, 0, 2, 2, 8, 0xA7A }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_3 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_093[] = { - { 7, 7, 0, 2, 2, 8, 0xA7B }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_4 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_094[] = { - { 7, 7, 0, 2, 2, 8, 0xA7C }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_5 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_095[] = { - { 7, 7, 0, 2, 2, 8, 0xA7D }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_6 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_096[] = { - { 7, 7, 0, 2, 2, 8, 0xA7E }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_7 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_097[] = { - { 7, 7, 0, 2, 2, 8, 0xA7F }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_8 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_098[] = { - { 7, 7, 0, 2, 2, 8, 0xA80 }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_9 }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_099[] = { - { 7, 7, 0, 2, 2, 8, 0xA81 }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_A }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0100[] = { - { 7, 7, 0, 2, 2, 8, 0xA82 }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_B }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0101[] = { - { 7, 7, 0, 2, 2, 8, 0xA83 }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_C }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; //END @@ -587,85 +587,85 @@ static const DrawTileSeqStruct _station_display_datas_0101[] = { // concrete underground //BEGIN static const DrawTileSeqStruct _station_display_datas_0102[] = { - { 7, 7, 0, 2, 2, 8, 0xA78 }, // turning radar - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_1 }, // turning radar + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0103[] = { - { 7, 7, 0, 2, 2, 8, 0xA79 }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_2 }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0104[] = { - { 7, 7, 0, 2, 2, 8, 0xA7A }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_3 }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0105[] = { - { 7, 7, 0, 2, 2, 8, 0xA7B }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_4 }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0106[] = { - { 7, 7, 0, 2, 2, 8, 0xA7C }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_5 }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0107[] = { - { 7, 7, 0, 2, 2, 8, 0xA7D }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_6 }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0108[] = { - { 7, 7, 0, 2, 2, 8, 0xA7E }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_7 }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0109[] = { - { 7, 7, 0, 2, 2, 8, 0xA7F }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_8 }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0110[] = { - { 7, 7, 0, 2, 2, 8, 0xA80 }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_9 }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0111[] = { - { 7, 7, 0, 2, 2, 8, 0xA81 }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_A }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0112[] = { - { 7, 7, 0, 2, 2, 8, 0xA82 }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_B }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; // concrete underground static const DrawTileSeqStruct _station_display_datas_0113[] = { - { 7, 7, 0, 2, 2, 8, 0xA83 }, - { 0, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, + { 7, 7, 0, 2, 2, 8, SPR_AIRPORT_RADAR_C }, + { 0, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; //END @@ -673,125 +673,125 @@ static const DrawTileSeqStruct _station_display_datas_0113[] = { // helipad for international airport // concrete underground static const DrawTileSeqStruct _station_display_datas_0114[] = { - { 10, 6, 0, 0, 0, 0, SPR_AIRPORT_HELIPAD }, - { 15, 0, 0, 1, 16, 6, 0xA67 | PALETTE_MODIFIER_COLOR }, // fences bottom + { 10, 6, 0, 0, 0, 0, SPR_AIRPORT_HELIPAD }, + { 15, 0, 0, 1, 16, 6, SPR_AIRPORT_FENCE_Y | PALETTE_MODIFIER_COLOR }, // fences bottom TILE_SEQ_END() }; static const DrawTileSprites _station_display_datas[] = { - { 0x3F4, _station_display_datas_0 }, - { 0x3F3, _station_display_datas_1 }, - { 0x3F4, _station_display_datas_2 }, - { 0x3F3, _station_display_datas_3 }, - { 0x3F4, _station_display_datas_4 }, - { 0x3F3, _station_display_datas_5 }, - { 0x3F4, _station_display_datas_6 }, - { 0x3F3, _station_display_datas_7 }, - { 0xA4A, _station_display_datas_8 }, - { 0xA4A, _station_display_datas_9 }, - { 0xA4A, _station_display_datas_10 }, - { 0xA4B, _station_display_datas_11 }, - { 0xA4C, _station_display_datas_12 }, - { 0xA4D, _station_display_datas_13 }, - { 0xA4E, _station_display_datas_14 }, - { 0xA4F, _station_display_datas_15 }, - { 0xA50, _station_display_datas_16 }, - { 0xA51, _station_display_datas_17 }, - { 0xA52, _station_display_datas_18 }, - { 0xA53, _station_display_datas_19 }, - { 0xA54, _station_display_datas_20 }, - { 0xA53, _station_display_datas_21 }, - { 0xA55, _station_display_datas_22 }, - { 0xA56, _station_display_datas_23 }, - { 0xA57, _station_display_datas_24 }, - { 0xA58, _station_display_datas_25 }, - { 0xA59, _station_display_datas_26 }, - { 0xA4A, _station_display_datas_27 }, - { 0xF8D, _station_display_datas_28 }, - { 0xA4A, _station_display_datas_29 }, - { 0xA4A, _station_display_datas_30 }, - { 0xA4A, _station_display_datas_31 }, - { 0xA4A, _station_display_datas_32 }, - { 0xA4B, _station_display_datas_33 }, - { 0xA4B, _station_display_datas_34 }, - { 0xA4A, _station_display_datas_35 }, - { 0xA4A, _station_display_datas_36 }, - { 0xF8D, _station_display_datas_37 }, - { 0xF8D, _station_display_datas_38 }, - { 0xF8D, _station_display_datas_39 }, - { 0xF8D, _station_display_datas_40 }, - { 0xF8D, _station_display_datas_41 }, - { 0xF8D, _station_display_datas_42 }, - { 0xF8D, _station_display_datas_43 }, - { 0xF8D, _station_display_datas_44 }, - { 0xF8D, _station_display_datas_45 }, - { 0xF8D, _station_display_datas_46 }, - { 0xF8D, _station_display_datas_47 }, - { 0xF8D, _station_display_datas_48 }, - { 0xF8D, _station_display_datas_49 }, - { 0xF8D, _station_display_datas_50 }, - { 0xF8D, _station_display_datas_51 }, - { 0xA69, _station_display_datas_52 }, - { 0xA6A, _station_display_datas_53 }, - { 0xA6B | PALETTE_MODIFIER_COLOR, _station_display_datas_54 }, - { 0xA6D, _station_display_datas_55 }, - { 0xA6E, _station_display_datas_56 }, - { 0xA6F, _station_display_datas_57 }, - { 0xA70, _station_display_datas_58 }, - { 0xA70, _station_display_datas_59 }, - { 0xA70, _station_display_datas_60 }, - { 0xA70, _station_display_datas_61 }, - { 0xA71, _station_display_datas_62 }, - { 0xA72, _station_display_datas_63 }, - { 0xA73, _station_display_datas_64 }, - { 0xA4A, _station_display_datas_65 }, - { 0xF8D, _station_display_datas_66 }, - { 0xA94 | PALETTE_MODIFIER_COLOR, _station_display_datas_67 }, - { 0xA95 | PALETTE_MODIFIER_COLOR, _station_display_datas_68 }, - { 0xA96 | PALETTE_MODIFIER_COLOR, _station_display_datas_69 }, - { 0xA97 | PALETTE_MODIFIER_COLOR, _station_display_datas_70 }, - { 0xA84 | PALETTE_MODIFIER_COLOR, _station_display_datas_71 }, - { 0xA85 | PALETTE_MODIFIER_COLOR, _station_display_datas_72 }, - { 0xA86 | PALETTE_MODIFIER_COLOR, _station_display_datas_73 }, - { 0xA87 | PALETTE_MODIFIER_COLOR, _station_display_datas_74 }, - { 0xFDD, _station_display_datas_75 }, - { 0xFE4, _station_display_datas_76 }, - { 0xFE5, _station_display_datas_77 }, - { 0xFE3, _station_display_datas_78 }, - { 0xFE2, _station_display_datas_79 }, - { 0xFDD, _station_display_datas_80 }, - { 0xFDD, _station_display_datas_81 }, - { 0xFEC, _station_display_datas_82 }, - { 0xA59, _station_display_datas_083 }, - { 0xA56, _station_display_datas_084 }, - { 0xA4A, _station_display_datas_085 }, - { 0xA4A, _station_display_datas_086 }, - { 0xA4A, _station_display_datas_087 }, - { 0xA59, _station_display_datas_088 }, - { 0xA56, _station_display_datas_089 }, - { 0xA4A, _station_display_datas_090 }, - { 0xA4A, _station_display_datas_091 }, - { 0xA4A, _station_display_datas_092 }, - { 0xA4A, _station_display_datas_093 }, - { 0xA4A, _station_display_datas_094 }, - { 0xA4A, _station_display_datas_095 }, - { 0xA4A, _station_display_datas_096 }, - { 0xA4A, _station_display_datas_097 }, - { 0xA4A, _station_display_datas_098 }, - { 0xA4A, _station_display_datas_099 }, - { 0xA4A, _station_display_datas_0100 }, - { 0xA4A, _station_display_datas_0101 }, - { 0xA4A, _station_display_datas_0102 }, - { 0xA4A, _station_display_datas_0103 }, - { 0xA4A, _station_display_datas_0104 }, - { 0xA4A, _station_display_datas_0105 }, - { 0xA4A, _station_display_datas_0106 }, - { 0xA4A, _station_display_datas_0107 }, - { 0xA4A, _station_display_datas_0108 }, - { 0xA4A, _station_display_datas_0109 }, - { 0xA4A, _station_display_datas_0110 }, - { 0xA4A, _station_display_datas_0111 }, - { 0xA4A, _station_display_datas_0112 }, - { 0xA4A, _station_display_datas_0113 }, - { 0xA4A, _station_display_datas_0114 }, + { 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 }, + { SPR_RAIL_TRACK_Y, _station_display_datas_5 }, + { SPR_RAIL_TRACK_X, _station_display_datas_6 }, + { SPR_RAIL_TRACK_Y, _station_display_datas_7 }, + { SPR_AIRPORT_APRON, _station_display_datas_8 }, + { SPR_AIRPORT_APRON, _station_display_datas_9 }, + { SPR_AIRPORT_APRON, _station_display_datas_10 }, + { SPR_AIRPORT_AIRCRAFT_STAND, _station_display_datas_11 }, + { SPR_AIRPORT_TAXIWAY_NS_WEST, _station_display_datas_12 }, + { SPR_AIRPORT_TAXIWAY_EW_SOUTH, _station_display_datas_13 }, + { SPR_AIRPORT_TAXIWAY_XING_SOUTH,_station_display_datas_14 }, + { SPR_AIRPORT_TAXIWAY_XING_WEST, _station_display_datas_15 }, + { SPR_AIRPORT_TAXIWAY_NS_CTR, _station_display_datas_16 }, + { SPR_AIRPORT_TAXIWAY_XING_EAST, _station_display_datas_17 }, + { SPR_AIRPORT_TAXIWAY_NS_EAST, _station_display_datas_18 }, + { SPR_AIRPORT_TAXIWAY_EW_NORTH, _station_display_datas_19 }, + { SPR_AIRPORT_TAXIWAY_EW_CTR, _station_display_datas_20 }, + { SPR_AIRPORT_TAXIWAY_EW_NORTH, _station_display_datas_21 }, + { SPR_AIRPORT_RUNWAY_EXIT_A, _station_display_datas_22 }, + { SPR_AIRPORT_RUNWAY_EXIT_B, _station_display_datas_23 }, + { SPR_AIRPORT_RUNWAY_EXIT_C, _station_display_datas_24 }, + { SPR_AIRPORT_RUNWAY_EXIT_D, _station_display_datas_25 }, + { SPR_AIRPORT_RUNWAY_END, _station_display_datas_26 }, + { SPR_AIRPORT_APRON, _station_display_datas_27 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_28 }, + { SPR_AIRPORT_APRON, _station_display_datas_29 }, + { SPR_AIRPORT_APRON, _station_display_datas_30 }, + { SPR_AIRPORT_APRON, _station_display_datas_31 }, + { SPR_AIRPORT_APRON, _station_display_datas_32 }, + { SPR_AIRPORT_AIRCRAFT_STAND, _station_display_datas_33 }, + { SPR_AIRPORT_AIRCRAFT_STAND, _station_display_datas_34 }, + { SPR_AIRPORT_APRON, _station_display_datas_35 }, + { SPR_AIRPORT_APRON, _station_display_datas_36 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_37 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_38 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_39 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_40 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_41 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_42 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_43 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_44 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_45 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_46 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_47 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_48 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_49 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_50 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_51 }, + { SPR_AIRFIELD_TERM_A, _station_display_datas_52 }, + { SPR_AIRFIELD_TERM_B, _station_display_datas_53 }, + { SPR_AIRFIELD_TERM_C_GROUND | PALETTE_MODIFIER_COLOR, _station_display_datas_54 }, + { SPR_AIRFIELD_APRON_A, _station_display_datas_55 }, + { SPR_AIRFIELD_APRON_B, _station_display_datas_56 }, + { SPR_AIRFIELD_APRON_C, _station_display_datas_57 }, + { SPR_AIRFIELD_APRON_D, _station_display_datas_58 }, + { SPR_AIRFIELD_APRON_D, _station_display_datas_59 }, + { SPR_AIRFIELD_APRON_D, _station_display_datas_60 }, + { SPR_AIRFIELD_APRON_D, _station_display_datas_61 }, + { SPR_AIRFIELD_RUNWAY_NEAR_END, _station_display_datas_62 }, + { SPR_AIRFIELD_RUNWAY_MIDDLE, _station_display_datas_63 }, + { SPR_AIRFIELD_RUNWAY_FAR_END, _station_display_datas_64 }, + { SPR_AIRPORT_APRON, _station_display_datas_65 }, + { SPR_FLAT_GRASS_TILE, _station_display_datas_66 }, + { SPR_TRUCK_STOP_NE_GROUND | PALETTE_MODIFIER_COLOR, _station_display_datas_67 }, + { SPR_TRUCK_STOP_SE_GROUND | PALETTE_MODIFIER_COLOR, _station_display_datas_68 }, + { SPR_TRUCK_STOP_SW_GROUND | PALETTE_MODIFIER_COLOR, _station_display_datas_69 }, + { SPR_TRUCK_STOP_NW_GROUND | PALETTE_MODIFIER_COLOR, _station_display_datas_70 }, + { SPR_BUS_STOP_NE_GROUND | PALETTE_MODIFIER_COLOR, _station_display_datas_71 }, + { SPR_BUS_STOP_SE_GROUND | PALETTE_MODIFIER_COLOR, _station_display_datas_72 }, + { SPR_BUS_STOP_SW_GROUND | PALETTE_MODIFIER_COLOR, _station_display_datas_73 }, + { SPR_BUS_STOP_NW_GROUND | PALETTE_MODIFIER_COLOR, _station_display_datas_74 }, + { SPR_FLAT_WATER_TILE, _station_display_datas_75 }, + { SPR_SHORE_TILEH_3, _station_display_datas_76 }, + { SPR_SHORE_TILEH_9, _station_display_datas_77 }, + { SPR_SHORE_TILEH_12, _station_display_datas_78 }, + { SPR_SHORE_TILEH_6, _station_display_datas_79 }, + { SPR_FLAT_WATER_TILE, _station_display_datas_80 }, + { SPR_FLAT_WATER_TILE, _station_display_datas_81 }, + { SPR_BUOY, _station_display_datas_82 }, + { SPR_AIRPORT_RUNWAY_END, _station_display_datas_083 }, + { SPR_AIRPORT_RUNWAY_EXIT_B, _station_display_datas_084 }, + { SPR_AIRPORT_APRON, _station_display_datas_085 }, + { SPR_AIRPORT_APRON, _station_display_datas_086 }, + { SPR_AIRPORT_APRON, _station_display_datas_087 }, + { SPR_AIRPORT_RUNWAY_END, _station_display_datas_088 }, + { SPR_AIRPORT_RUNWAY_EXIT_B, _station_display_datas_089 }, + { SPR_AIRPORT_APRON, _station_display_datas_090 }, + { SPR_AIRPORT_APRON, _station_display_datas_091 }, + { SPR_AIRPORT_APRON, _station_display_datas_092 }, + { SPR_AIRPORT_APRON, _station_display_datas_093 }, + { SPR_AIRPORT_APRON, _station_display_datas_094 }, + { SPR_AIRPORT_APRON, _station_display_datas_095 }, + { SPR_AIRPORT_APRON, _station_display_datas_096 }, + { SPR_AIRPORT_APRON, _station_display_datas_097 }, + { SPR_AIRPORT_APRON, _station_display_datas_098 }, + { SPR_AIRPORT_APRON, _station_display_datas_099 }, + { SPR_AIRPORT_APRON, _station_display_datas_0100 }, + { SPR_AIRPORT_APRON, _station_display_datas_0101 }, + { SPR_AIRPORT_APRON, _station_display_datas_0102 }, + { SPR_AIRPORT_APRON, _station_display_datas_0103 }, + { SPR_AIRPORT_APRON, _station_display_datas_0104 }, + { SPR_AIRPORT_APRON, _station_display_datas_0105 }, + { SPR_AIRPORT_APRON, _station_display_datas_0106 }, + { SPR_AIRPORT_APRON, _station_display_datas_0107 }, + { SPR_AIRPORT_APRON, _station_display_datas_0108 }, + { SPR_AIRPORT_APRON, _station_display_datas_0109 }, + { SPR_AIRPORT_APRON, _station_display_datas_0110 }, + { SPR_AIRPORT_APRON, _station_display_datas_0111 }, + { SPR_AIRPORT_APRON, _station_display_datas_0112 }, + { SPR_AIRPORT_APRON, _station_display_datas_0113 }, + { SPR_AIRPORT_APRON, _station_display_datas_0114 }, }; diff --git a/unmovable_cmd.c b/unmovable_cmd.c index 07cdb76e4..5697f456c 100644 --- a/unmovable_cmd.c +++ b/unmovable_cmd.c @@ -117,7 +117,7 @@ static void DrawTile_Unmovable(TileInfo *ti) if (ti->map5 == 2) { // statue - DrawGroundSprite(SPR_STATUE_GROUND); + DrawGroundSprite(SPR_CONCRETE_GROUND); image = PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile)); image += PALETTE_MODIFIER_COLOR | SPR_STATUE_COMPANY; |