diff options
| author | Erich Eckner <git@eckner.net> | 2018-11-23 18:37:22 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-11-23 18:37:22 +0100 |
| commit | 9db4bc22d82a6fc764608507e330ea208a20d44b (patch) | |
| tree | 93eb943db198186114bb9f52f2d4e6d5a1184a19 /manualPorts/openttd-git | |
| parent | 8ebaf24230a345be05c06109fe1e570c1d7a0303 (diff) | |
| download | crux-ports-9db4bc22d82a6fc764608507e330ea208a20d44b.tar.xz | |
openttd-git: some progress for sloped stations
Diffstat (limited to 'manualPorts/openttd-git')
| -rw-r--r-- | manualPorts/openttd-git/.md5sum | 2 | ||||
| -rw-r--r-- | manualPorts/openttd-git/.signature | 4 | ||||
| -rw-r--r-- | manualPorts/openttd-git/sloped-stations.patch | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/manualPorts/openttd-git/.md5sum b/manualPorts/openttd-git/.md5sum index 0e6cc93..d40107b 100644 --- a/manualPorts/openttd-git/.md5sum +++ b/manualPorts/openttd-git/.md5sum @@ -3,5 +3,5 @@ 858b79d44aea6de5e15d9d1439e86cc3 openmsx-0.3.1.zip 6e3a5cf97fe69e3a351c3e0615a14b04 opensfx-0.2.3.zip e206897de51f145a3cffcef4f2579d45 signaltunnel.patch -cfc6052be34fee0e37da3bcc18fa1099 sloped-stations.patch +ece2a5a7225b4efb693eec28dc2b4b3b sloped-stations.patch 555687ad2dd24207dca6e2482815a87b underground.patch diff --git a/manualPorts/openttd-git/.signature b/manualPorts/openttd-git/.signature index 9a18b87..d663313 100644 --- a/manualPorts/openttd-git/.signature +++ b/manualPorts/openttd-git/.signature @@ -1,11 +1,11 @@ untrusted comment: verify with /etc/ports/deepthought.pub -RWQxCptPusLGGvD+LSu14lD81OCjZvs001UUBrHDAAFlAQxy74nxWofD2miQQLQluObamphHYTBkn4O9TKYwtlLJZG+PGbzsqAg= +RWQxCptPusLGGjDApHobQcm3hy24R5RCB+n/6dmwlQqB2046zZKuEgxihQVqDljX1UIq0zffR0wRW6NSV/6BwBWydwHSTJMeyAg= SHA256 (Pkgfile) = d55c7e21830544dceed6ec0935c34ad0674da476cd5d3b35a46e071edcbd022b SHA256 (.footprint) = b8b31b1b4b0487754b23c992bfd08ec39a569702579069de7fda397110b28fae SHA256 (opengfx-0.5.4.zip) = 3d136d776906dbe8b5df1434cb9a68d1249511a3c4cfaca55cc24cc0028ae078 SHA256 (opensfx-0.2.3.zip) = 3574745ac0c138bae53b56972591db8d778ad9faffd51deae37a48a563e71662 SHA256 (openmsx-0.3.1.zip) = 92e293ae89f13ad679f43185e83fb81fb8cad47fe63f4af3d3d9f955130460f5 SHA256 (signaltunnel.patch) = a75db5fa2fde1da0c9f5a34402f7a913f6fe2614cb7596a2e0f71f2bc80c287c -SHA256 (sloped-stations.patch) = d375e73e14a4d76b90131f23362c61f75064557c2ebc7e91908f8a00c2a36896 +SHA256 (sloped-stations.patch) = c5bb84febfc8e7826673520cf1f5395dc06ee94e21f23801c01192af6bb3625b SHA256 (underground.patch) = ab7aac239ccbb5f83daed639a3b58a55c5eb630cce1420928e42526b9ee43a09 SHA256 (476643bfa5.tar.gz) = 8e89c1f685a37543aefee2a94331669d3982f7e9244e7c8dea2e6319231069ec diff --git a/manualPorts/openttd-git/sloped-stations.patch b/manualPorts/openttd-git/sloped-stations.patch index ee682db..ff0e326 100644 --- a/manualPorts/openttd-git/sloped-stations.patch +++ b/manualPorts/openttd-git/sloped-stations.patch @@ -94,7 +94,7 @@ index 5251a53923..ce9ac81518 100644 + #endif /* ROAD_TYPE_H */ diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp -index 16f135df25..726205fd8b 100644 +index 16f135df25..bb46a2f541 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -53,6 +53,7 @@ @@ -285,10 +285,10 @@ index 16f135df25..726205fd8b 100644 static int GetSlopePixelZ_Station(TileIndex tile, uint x, uint y) { + /* this code makes vehicles and trains follow the slope on sloped stations */ -+ if (IsRailStation(tile)) { ++ if (IsRailStation(tile) || IsRoadStopTile(tile) && !IsStandardRoadStopTile(tile)) { + int z; + Slope tileh = GetTilePixelSlope(tile, &z); -+ Axis axis = GetRailStationAxis(tile); ++ Axis axis = IsRailStation(tile)?GetRailStationAxis(tile):DiagDirToAxis(GetRoadStopDir(tile)); + + z += 8*ApplyFoundationToSlope(GetRailFoundation(tileh,AxisToTrackBits(axis)), &tileh); + return z + GetPartialPixelZ(x & 0xF, y & 0xF, tileh); |