Mercurial > hg > openttd
changeset 17144:48e5ee157a02 draft
(svn r21882) -Codechange: make use of the fact that vehicle's Z position can change only if it has GVF_GOINGUP_BIT or GVF_GOINGDOWN_BIT set
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Fri, 21 Jan 2011 16:51:56 +0000 |
| parents | d2394a934993 |
| children | f093c470b53c |
| files | src/ground_vehicle.hpp |
| diffstat | 1 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ground_vehicle.hpp +++ b/src/ground_vehicle.hpp @@ -151,12 +151,8 @@ */ FORCEINLINE void UpdateZPosition() { - /* Flat tile, tile with two opposing corners raised and tile with 3 corners - * raised can never have sloped track ... */ - static const uint32 never_sloped = 1 << SLOPE_FLAT | 1 << SLOPE_EW | 1 << SLOPE_NS | 1 << SLOPE_NWS | 1 << SLOPE_WSE | 1 << SLOPE_SEN | 1 << SLOPE_ENW; - /* ... unless it's a bridge head. */ - if (IsTileType(this->tile, MP_TUNNELBRIDGE) || // the following check would be true for tunnels anyway - (T::From(this)->TileMayHaveSlopedTrack() && !HasBit(never_sloped, GetTileSlope(this->tile, NULL)))) { + /* Vehicle's Z position can change only if it has GVF_GOINGUP_BIT or GVF_GOINGDOWN_BIT set */ + if (HasBit(this->gv_flags, GVF_GOINGUP_BIT) || HasBit(this->gv_flags, GVF_GOINGDOWN_BIT)) { this->z_pos = GetSlopeZ(this->x_pos, this->y_pos); } else { /* Verify that assumption. */