diff options
| author | Erich Eckner <git@eckner.net> | 2020-10-10 08:44:58 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-10-10 08:59:11 +0200 |
| commit | 32707e8885747d56699b4deb50a79af69dc1ea17 (patch) | |
| tree | bb728489947b5ac5bb706834597887ef9df25042 /openttd-git/sloped-stations.patch | |
| parent | 2cdfcb392d593a81d44bc84890ee14b32fa4b21b (diff) | |
| download | archlinuxewe.git.save-32707e8885747d56699b4deb50a79af69dc1ea17.tar.xz | |
openttd-git 29599.a36a1b5ff-1 -> 29601.50417ab0c-1
Diffstat (limited to 'openttd-git/sloped-stations.patch')
| -rw-r--r-- | openttd-git/sloped-stations.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/openttd-git/sloped-stations.patch b/openttd-git/sloped-stations.patch index 1032b5dc..899030cd 100644 --- a/openttd-git/sloped-stations.patch +++ b/openttd-git/sloped-stations.patch @@ -1,5 +1,5 @@ diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp -index 162fe97799a..f3f65308dc5 100644 +index 162fe9779..f3f65308d 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -187,14 +187,6 @@ RailType AllocateRailType(RailTypeLabel label) @@ -18,7 +18,7 @@ index 162fe97799a..f3f65308dc5 100644 * --------- * |\ /| diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp -index b8aee88d60b..da61c33526d 100644 +index b8aee88d6..da61c3352 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -37,6 +37,7 @@ @@ -62,7 +62,7 @@ index b8aee88d60b..da61c33526d 100644 * Get the sprite offset within a spritegroup. * @param slope Slope diff --git a/src/road_cmd.h b/src/road_cmd.h -index 753ebd21d41..87dee9722f3 100644 +index 753ebd21d..87dee9722 100644 --- a/src/road_cmd.h +++ b/src/road_cmd.h @@ -12,8 +12,11 @@ @@ -78,7 +78,7 @@ index 753ebd21d41..87dee9722f3 100644 + #endif /* ROAD_CMD_H */ diff --git a/src/road_type.h b/src/road_type.h -index 969b141ba2c..1af4275eb99 100644 +index 969b141ba..1af4275eb 100644 --- a/src/road_type.h +++ b/src/road_type.h @@ -68,4 +68,11 @@ enum RoadBits { @@ -94,7 +94,7 @@ index 969b141ba2c..1af4275eb99 100644 + #endif /* ROAD_TYPE_H */ diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp -index 261af7042bc..cde4a50a295 100644 +index 261af7042..cde4a50a2 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -1500,7 +1500,7 @@ again: @@ -107,7 +107,7 @@ index 261af7042bc..cde4a50a295 100644 } } diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp -index 7bce21353df..bde1caa199c 100644 +index 7bce21353..bde1caa19 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -56,6 +56,7 @@ @@ -311,7 +311,7 @@ index 7bce21353df..bde1caa199c 100644 } diff --git a/src/table/sprites.h b/src/table/sprites.h -index 5df55b8ae4f..ce581949505 100644 +index 5df55b8ae..ce5819495 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -258,7 +258,26 @@ static const SpriteID SPR_TRUCK_STOP_DT_Y_W = SPR_ROADSTOP_BASE + 4; @@ -343,7 +343,7 @@ index 5df55b8ae4f..ce581949505 100644 /** Tramway sprites */ static const SpriteID SPR_TRAMWAY_BASE = SPR_ROADSTOP_BASE + ROADSTOP_SPRITE_COUNT; diff --git a/src/table/station_land.h b/src/table/station_land.h -index 6b4b2267ace..760da43e695 100644 +index 6b4b2267a..760da43e6 100644 --- a/src/table/station_land.h +++ b/src/table/station_land.h @@ -775,6 +775,62 @@ static const DrawTileSeqStruct _station_display_datas_waypoint_Y[] = { @@ -432,7 +432,7 @@ index 6b4b2267ace..760da43e695 100644 static const DrawTileSprites _station_display_datas_oilrig[] = { diff --git a/src/track_type.h b/src/track_type.h -index 70278c58d95..0c64b997806 100644 +index 70278c58d..0c64b9978 100644 --- a/src/track_type.h +++ b/src/track_type.h @@ -120,4 +120,11 @@ DECLARE_ENUM_AS_BIT_SET(TrackdirBits) |