summaryrefslogtreecommitdiff
path: root/src/table
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-11-19 09:37:23 +0100
committerErich Eckner <git@eckner.net>2018-11-19 09:37:23 +0100
commit49b595f952647a19dd97214e5dce9e019d196236 (patch)
tree33f798813dbc54aa6d6d7e9fd4e35fdda8c5eebe /src/table
parent34eb5364bbfa6a3093f9ff062a5909349b09ea22 (diff)
downloadopenttd-49b595f952647a19dd97214e5dce9e019d196236.tar.xz
sloped stations appliedsloped-stations-original
Diffstat (limited to 'src/table')
-rw-r--r--src/table/sprites.h19
-rw-r--r--src/table/station_land.h64
2 files changed, 82 insertions, 1 deletions
diff --git a/src/table/sprites.h b/src/table/sprites.h
index c9ca6c98d..9bf448236 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -207,7 +207,24 @@ enum Sprites {
SPR_TRUCK_STOP_DT_Y_E = SPR_ROADSTOP_BASE + 5,
SPR_TRUCK_STOP_DT_X_W = SPR_ROADSTOP_BASE + 6,
SPR_TRUCK_STOP_DT_X_E = SPR_ROADSTOP_BASE + 7,
- ROADSTOP_SPRITE_COUNT = 8,
+ // sprites for sloped graphics
+ SPR_BUS_STOP_DT_SE_W = SPR_ROADSTOP_BASE + 12,
+ SPR_BUS_STOP_DT_SE_E = SPR_ROADSTOP_BASE + 13,
+ SPR_BUS_STOP_DT_NE_E = SPR_ROADSTOP_BASE + 14,
+ SPR_BUS_STOP_DT_NE_W = SPR_ROADSTOP_BASE + 15,
+ SPR_BUS_STOP_DT_NW_W = SPR_ROADSTOP_BASE + 16,
+ SPR_BUS_STOP_DT_NW_E = SPR_ROADSTOP_BASE + 17,
+ SPR_BUS_STOP_DT_SW_E = SPR_ROADSTOP_BASE + 18,
+ SPR_BUS_STOP_DT_SW_W = SPR_ROADSTOP_BASE + 19,
+ SPR_TRUCK_STOP_DT_SE_W = SPR_ROADSTOP_BASE + 20,
+ SPR_TRUCK_STOP_DT_SE_E = SPR_ROADSTOP_BASE + 21,
+ SPR_TRUCK_STOP_DT_NE_E = SPR_ROADSTOP_BASE + 22,
+ SPR_TRUCK_STOP_DT_NE_W = SPR_ROADSTOP_BASE + 23,
+ SPR_TRUCK_STOP_DT_NW_W = SPR_ROADSTOP_BASE + 24,
+ SPR_TRUCK_STOP_DT_NW_E = SPR_ROADSTOP_BASE + 25,
+ SPR_TRUCK_STOP_DT_SW_E = SPR_ROADSTOP_BASE + 26,
+ SPR_TRUCK_STOP_DT_SW_W = SPR_ROADSTOP_BASE + 27,
+ ROADSTOP_SPRITE_COUNT = 28,
/* Tramway sprites */
SPR_TRAMWAY_BASE = SPR_ROADSTOP_BASE + ROADSTOP_SPRITE_COUNT,
diff --git a/src/table/station_land.h b/src/table/station_land.h
index 5dfcddaf6..c705fbbac 100644
--- a/src/table/station_land.h
+++ b/src/table/station_land.h
@@ -1013,6 +1013,62 @@ static const DrawTileSeqStruct _station_display_datas_0171[] = {
TILE_SEQ_END()
};
+// drive-through bus stop SE slope
+static const DrawTileSeqStruct _station_display_datas_0172[] = {
+ TILE_SEQ_LINE( 0, 0, 0, 16, 3, 16, SPR_BUS_STOP_DT_SE_W | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_LINE( 0, 13, 0, 16, 3, 16, SPR_BUS_STOP_DT_SE_E | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_END()
+};
+
+// drive-through bus stop NE slope
+static const DrawTileSeqStruct _station_display_datas_0173[] = {
+ TILE_SEQ_LINE( 0, 0, 0, 16, 3, 16, SPR_BUS_STOP_DT_NE_W | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_LINE( 0, 13, 0, 16, 3, 16, SPR_BUS_STOP_DT_NE_E | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_END()
+};
+
+// drive-through bus stop NW slope
+static const DrawTileSeqStruct _station_display_datas_0174[] = {
+ TILE_SEQ_LINE( 0, 0, 0, 16, 3, 16, SPR_BUS_STOP_DT_NW_W | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_LINE( 0, 13, 0, 16, 3, 16, SPR_BUS_STOP_DT_NW_E | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_END()
+};
+
+// drive-through bus stop SW slope
+static const DrawTileSeqStruct _station_display_datas_0175[] = {
+ TILE_SEQ_LINE( 0, 0, 0, 16, 3, 16, SPR_BUS_STOP_DT_SW_W | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_LINE( 0, 13, 0, 16, 3, 16, SPR_BUS_STOP_DT_SW_E | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_END()
+};
+
+// drive-through truck stop SE slope
+static const DrawTileSeqStruct _station_display_datas_0176[] = {
+ TILE_SEQ_LINE( 0, 0, 0, 16, 3, 16, SPR_TRUCK_STOP_DT_SE_W | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_LINE( 0, 13, 0, 16, 3, 16, SPR_TRUCK_STOP_DT_SE_E | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_END()
+};
+
+// drive-through truck stop NE slope
+static const DrawTileSeqStruct _station_display_datas_0177[] = {
+ TILE_SEQ_LINE( 0, 0, 0, 16, 3, 16, SPR_TRUCK_STOP_DT_NE_W | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_LINE( 0, 13, 0, 16, 3, 16, SPR_TRUCK_STOP_DT_NE_E | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_END()
+};
+
+// drive-through truck stop NW slope
+static const DrawTileSeqStruct _station_display_datas_0178[] = {
+ TILE_SEQ_LINE( 0, 0, 0, 16, 3, 16, SPR_TRUCK_STOP_DT_NW_W | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_LINE( 0, 13, 0, 16, 3, 16, SPR_TRUCK_STOP_DT_NW_E | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_END()
+};
+
+// drive-through truck stop SW slope
+static const DrawTileSeqStruct _station_display_datas_0179[] = {
+ TILE_SEQ_LINE( 0, 0, 0, 16, 3, 16, SPR_TRUCK_STOP_DT_SW_W | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_LINE( 0, 13, 0, 16, 3, 16, SPR_TRUCK_STOP_DT_SW_E | (1 << PALETTE_MODIFIER_COLOUR))
+ TILE_SEQ_END()
+};
+
#undef TILE_SEQ_END
#undef TILE_SEQ_LINE
#undef TILE_SEQ_LINE_PAL
@@ -1189,6 +1245,10 @@ static const DrawTileSprites _station_display_datas_truck[] = {
TILE_SPRITE_LINE(SPR_TRUCK_STOP_NW_GROUND | (1 << PALETTE_MODIFIER_COLOUR), _station_display_datas_70)
TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_X, _station_display_datas_0168)
TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_Y, _station_display_datas_0169)
+ TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_X, _station_display_datas_0176)
+ TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_Y, _station_display_datas_0177)
+ TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_X, _station_display_datas_0178)
+ TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_Y, _station_display_datas_0179)
};
static const DrawTileSprites _station_display_datas_bus[] = {
@@ -1198,6 +1258,10 @@ static const DrawTileSprites _station_display_datas_bus[] = {
TILE_SPRITE_LINE(SPR_BUS_STOP_NW_GROUND | (1 << PALETTE_MODIFIER_COLOUR), _station_display_datas_74)
TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_X, _station_display_datas_0170)
TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_Y, _station_display_datas_0171)
+ TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_X, _station_display_datas_0172)
+ TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_Y, _station_display_datas_0173)
+ TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_X, _station_display_datas_0174)
+ TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_Y, _station_display_datas_0175)
};
static const DrawTileSprites _station_display_datas_oilrig[] = {