diff options
| author | Erich Eckner <git@eckner.net> | 2018-11-23 18:41:54 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-11-23 18:41:54 +0100 |
| commit | 0933a124cd47f02c25d52dcbb5de1c4d9f4db088 (patch) | |
| tree | 5e42d5967a6a4325d48a2dbe0125177a8371475c /manualPorts/openttd-git | |
| parent | a4689d0cf3d817bca45a78715323f9bc5e1ad1d1 (diff) | |
| download | crux-ports-0933a124cd47f02c25d52dcbb5de1c4d9f4db088.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 | 16 |
3 files changed, 19 insertions, 3 deletions
diff --git a/manualPorts/openttd-git/.md5sum b/manualPorts/openttd-git/.md5sum index d40107b..4eee246 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 -ece2a5a7225b4efb693eec28dc2b4b3b sloped-stations.patch +27e7c9a7db28ab6177b12d20309cf5eb sloped-stations.patch 555687ad2dd24207dca6e2482815a87b underground.patch diff --git a/manualPorts/openttd-git/.signature b/manualPorts/openttd-git/.signature index d663313..fad2fb4 100644 --- a/manualPorts/openttd-git/.signature +++ b/manualPorts/openttd-git/.signature @@ -1,11 +1,11 @@ untrusted comment: verify with /etc/ports/deepthought.pub -RWQxCptPusLGGjDApHobQcm3hy24R5RCB+n/6dmwlQqB2046zZKuEgxihQVqDljX1UIq0zffR0wRW6NSV/6BwBWydwHSTJMeyAg= +RWQxCptPusLGGmNTo+KkhINBBvqiJhRfA1on9Sg6Dp2B4YK3mQfMdXC1X0pL+fUFZl0gpXItry4BvLaGJ8jvvQvFf/zAkmYxmwI= 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) = c5bb84febfc8e7826673520cf1f5395dc06ee94e21f23801c01192af6bb3625b +SHA256 (sloped-stations.patch) = bd1177ff8f93758d1da4293a5cedc35955422a8327b9714477072d0ade06ece6 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 ff0e326..e5bc888 100644 --- a/manualPorts/openttd-git/sloped-stations.patch +++ b/manualPorts/openttd-git/sloped-stations.patch @@ -1,3 +1,19 @@ +diff --git a/src/ground_vehicle.hpp b/src/ground_vehicle.hpp +index 56b97875fc..90934e43c9 100644 +--- a/src/ground_vehicle.hpp ++++ b/src/ground_vehicle.hpp +@@ -221,8 +221,9 @@ struct GroundVehicle : public SpecializedVehicle<T, Type> { + * without any shift */ + this->z_pos += HasBit(this->gv_flags, GVF_GOINGUP_BIT) ? d : -d; + } +- +- assert(this->z_pos == GetSlopePixelZ(this->x_pos, this->y_pos)); ++if (this->z_pos != GetSlopePixelZ(this->x_pos, this->y_pos)) { ++ fprintf(stderr,"ASSERT: %d != %d\n",this->z_pos, GetSlopePixelZ(this->x_pos, this->y_pos)); ++} + } + + /** diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index a0fd968cc6..980e2fb42b 100644 --- a/src/rail_cmd.cpp |