cpp/openttd-patchpack/source Changeset - r17077:b54734623b12

Changeset - r17077:b54734623b12

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 13 years ago 2011-01-16 18:18:45
smatz@openttd.org

(svn r21824) -Codechange: don't call GetSlopeZ() when the ground vehicle is on a flat tile

1 file changed with 13 insertions and 1 deletions:

src/ground_vehicle.hpp

0 comments (0 inline, 0 general)

src/ground_vehicle.hpp

➞

Show inline comments

@@ @@ -112,9 +112,9 @@ struct GroundVehicle : public Specialize @@
 	FORCEINLINE byte UpdateInclination(bool new_tile, bool turned)
+	{
 		byte old_z = this->z_pos;
 		this->z_pos = GetSlopeZ(this->x_pos, this->y_pos);
 		if (new_tile) {
 			this->z_pos = GetSlopeZ(this->x_pos, this->y_pos);
 			ClrBit(this->gv_flags, GVF_GOINGUP_BIT);
 			ClrBit(this->gv_flags, GVF_GOINGDOWN_BIT);
@@ @@ -132,6 +132,18 @@ struct GroundVehicle : public Specialize @@
 					SetBit(this->gv_flags, (middle_z > old_z) ? GVF_GOINGUP_BIT : GVF_GOINGDOWN_BIT);
+				}
+			}
 		} else {
 			/* 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)))) {
 				this->z_pos = GetSlopeZ(this->x_pos, this->y_pos);
 			} else {
 				/* Verify that assumption. */
 				assert(this->z_pos == GetSlopeZ(this->x_pos, this->y_pos));
+			}
+		}
 		this->UpdateViewport(true, turned);

0 comments (0 inline, 0 general)