openttd-git: some progress in sloped-stations

1 files changed, 13 insertions, 16 deletions

diff --git a/openttd-git/sloped-stations.patch b/openttd-git/sloped-stations.patch
index e5bc8888..1ab5e714 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