diff options
| author | Erich Eckner <git@eckner.net> | 2018-11-23 21:59:32 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-11-23 21:59:32 +0100 |
| commit | 3600fa49f8f45b2468f0f27ea7503f42060a2488 (patch) | |
| tree | a59419ef6e63a391d0c3bcfa1ed7f2288ccf2bda | |
| parent | 48b7e3ee64e9adf99962a0624f27f4304bc7c8ba (diff) | |
| download | archlinuxewe-3600fa49f8f45b2468f0f27ea7503f42060a2488.tar.xz | |
openttd-git: some progress in sloped-stations
| -rw-r--r-- | openttd-git/PKGBUILD | 2 | ||||
| -rw-r--r-- | openttd-git/sloped-stations.patch | 29 |
2 files changed, 14 insertions, 17 deletions
diff --git a/openttd-git/PKGBUILD b/openttd-git/PKGBUILD index cb26a4798..836419994 100644 --- a/openttd-git/PKGBUILD +++ b/openttd-git/PKGBUILD @@ -39,7 +39,7 @@ source=( ) sha512sums=('SKIP' '1b591b07d5f15c49b5ce0e961398e8cc7db99854724f7da6e23ccdff885cbbf3bcc707c42dc20cc4d6928d1b1e7559fd6e64828f31585da7f8e1d5fac5cbc4a2' - '29b5a06e5c80fe1851a596e62d4d8b68107cd4f16631c695be196d5cee8f2bbda5864a75eeb2d37834c03e861248611911224969b0e0e2a2338a37e24ea7c1a2' + '5c5f9f930288f9d2fbf4ed7dd73267c6211e042ce083d17bb79a1cd3c6c2fc901c82a5f417f055ca2fd5cbf058faac9cea244b47df646a17a88a7864a39f5440' '45e03d0a749179de6e71f12a70df40a5324aa0055612f373fe91023ac5d2a6ac0fbb471b8e290b5812bcf35e5084077ea2f12106aaf0cd976727f019c71c5268') pkgver() { diff --git a/openttd-git/sloped-stations.patch b/openttd-git/sloped-stations.patch index e5bc8888f..1ab5e714b 100644 --- a/openttd-git/sloped-stations.patch +++ b/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 |