diff options
author | rubidium <rubidium@openttd.org> | 2011-11-04 10:18:13 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2011-11-04 10:18:13 +0000 |
commit | 7757a2ed406996be35c7179185f2e4e7cba37e12 (patch) | |
tree | ccf4b25e4efba9fee88cfb65ccabd68972c09400 /src/disaster_cmd.cpp | |
parent | 47203dbeb5080a5d24131a61ec12d1d3164bcb42 (diff) | |
download | openttd-7757a2ed406996be35c7179185f2e4e7cba37e12.tar.xz |
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
Diffstat (limited to 'src/disaster_cmd.cpp')
-rw-r--r-- | src/disaster_cmd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp index 155b7c9c2..df6764bc1 100644 --- a/src/disaster_cmd.cpp +++ b/src/disaster_cmd.cpp @@ -168,9 +168,9 @@ static void SetDisasterVehiclePos(DisasterVehicle *v, int x, int y, byte z) int safe_y = Clamp(y - 1, 0, MapMaxY() * TILE_SIZE); u->x_pos = x; - u->y_pos = y - 1 - (max(z - GetSlopeZ(safe_x, safe_y), 0U) >> 3); + u->y_pos = y - 1 - (max(z - GetSlopePixelZ(safe_x, safe_y), 0U) >> 3); safe_y = Clamp(u->y_pos, 0, MapMaxY() * TILE_SIZE); - u->z_pos = GetSlopeZ(safe_x, safe_y); + u->z_pos = GetSlopePixelZ(safe_x, safe_y); u->direction = v->direction; DisasterVehicleUpdateImage(u); @@ -249,7 +249,7 @@ static bool DisasterTick_Zeppeliner(DisasterVehicle *v) int x = v->x_pos; int y = v->y_pos; - byte z = GetSlopeZ(x, y); + byte z = GetSlopePixelZ(x, y); if (z < v->z_pos) z = v->z_pos - 1; SetDisasterVehiclePos(v, x, y, z); @@ -509,7 +509,7 @@ static bool DisasterTick_Big_Ufo(DisasterVehicle *v) return false; } - byte z = GetSlopeZ(v->x_pos, v->y_pos); + byte z = GetSlopePixelZ(v->x_pos, v->y_pos); if (z < v->z_pos) { SetDisasterVehiclePos(v, v->x_pos, v->y_pos, v->z_pos - 1); return true; |