summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-11-23 21:57:26 +0100
committerErich Eckner <git@eckner.net>2018-11-23 21:57:26 +0100
commit49658b6f5ff7974e19b93c6886da3239e518fba1 (patch)
treeda0184b97f11e5d36638f14bee4fe524c7decd57
parent22d7716eab0927e56ec7e9a0951dc7583e72d290 (diff)
downloadcrux-ports-49658b6f5ff7974e19b93c6886da3239e518fba1.tar.xz
openttd-git: some progress for sloped stations
-rw-r--r--manualPorts/openttd-git/.md5sum2
-rw-r--r--manualPorts/openttd-git/.signature4
-rw-r--r--manualPorts/openttd-git/sloped-stations.patch29
3 files changed, 16 insertions, 19 deletions
diff --git a/manualPorts/openttd-git/.md5sum b/manualPorts/openttd-git/.md5sum
index 4eee246..378d708 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
-27e7c9a7db28ab6177b12d20309cf5eb sloped-stations.patch
+c1f6da00ef4d2416cfcf217b253e918c sloped-stations.patch
555687ad2dd24207dca6e2482815a87b underground.patch
diff --git a/manualPorts/openttd-git/.signature b/manualPorts/openttd-git/.signature
index fad2fb4..f63a0b0 100644
--- a/manualPorts/openttd-git/.signature
+++ b/manualPorts/openttd-git/.signature
@@ -1,11 +1,11 @@
untrusted comment: verify with /etc/ports/deepthought.pub
-RWQxCptPusLGGmNTo+KkhINBBvqiJhRfA1on9Sg6Dp2B4YK3mQfMdXC1X0pL+fUFZl0gpXItry4BvLaGJ8jvvQvFf/zAkmYxmwI=
+RWQxCptPusLGGr9uDUSeQ9SIdOnFFDidFAMzLwH+X+pHx7n6Pe/DhjyblJK2PlB4hCCtlYV1RWtAA/MpTOjwT34orqURNUdcJQg=
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) = bd1177ff8f93758d1da4293a5cedc35955422a8327b9714477072d0ade06ece6
+SHA256 (sloped-stations.patch) = aec800db3db84c6e86b1c2150e90f6af26c5916d59118a36a14b70bc77e5bfcd
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 e5bc888..1ab5e71 100644
--- a/manualPorts/openttd-git/sloped-stations.patch
+++ b/manualPorts/openttd-git/sloped-stations.patch
@@ -1,19 +1,3 @@
-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
@@ -109,6 +93,19 @@ index 5251a53923..ce9ac81518 100644
+};
+
#endif /* ROAD_TYPE_H */
+diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
+index 207a3f23b2..33020b302c 100644
+--- a/src/roadveh_cmd.cpp
++++ b/src/roadveh_cmd.cpp
+@@ -1458,7 +1458,7 @@ again:
+ v->x_pos = x;
+ v->y_pos = y;
+ v->UpdatePosition();
+- RoadZPosAffectSpeed(v, v->UpdateInclination(true, false));
++ RoadZPosAffectSpeed(v, v->UpdateInclination(false, false));
+ return true;
+ }
+ }
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 16f135df25..bb46a2f541 100644
--- a/src/station_cmd.cpp