mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26888) -Codechange: use ints for some z-levels of vehicles (ic111)

release/1.5
rubidium 2014-09-21 12:44:38 +00:00
parent 7b27a28f0a
commit 14a599409e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ground_vehicle.hpp
View File

@ -231,9 +231,9 @@ struct GroundVehicle : public SpecializedVehicle<T, Type> {
* @param update_delta Indicates to also update the delta. * @param update_delta Indicates to also update the delta.
* @return Old height of the vehicle. * @return Old height of the vehicle.
*/ */
inline byte UpdateInclination(bool new_tile, bool update_delta) inline int UpdateInclination(bool new_tile, bool update_delta)
{ {
byte old_z = this->z_pos; int old_z = this->z_pos;
if (new_tile) { if (new_tile) {
this->UpdateZPositionAndInclination(); this->UpdateZPositionAndInclination();

2
src/roadveh_cmd.cpp
View File

@ -847,7 +847,7 @@ static void RoadVehCheckOvertake(RoadVehicle *v, RoadVehicle *u)
v->overtaking = RVSB_DRIVE_SIDE; v->overtaking = RVSB_DRIVE_SIDE;
} }
static void RoadZPosAffectSpeed(RoadVehicle *v, byte old_z) static void RoadZPosAffectSpeed(RoadVehicle *v, int old_z)
{ {
if (old_z == v->z_pos || _settings_game.vehicle.roadveh_acceleration_model != AM_ORIGINAL) return; if (old_z == v->z_pos || _settings_game.vehicle.roadveh_acceleration_model != AM_ORIGINAL) return;