summaryrefslogtreecommitdiff
path: root/main_gui.c
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-01-07 17:02:43 +0000
committertron <tron@openttd.org>2005-01-07 17:02:43 +0000
commit414ac3286b10b83d8f832c58f48f373f5130cb89 (patch)
treee4137b60a824b45ce09f668d58520e36dba10256 /main_gui.c
parentfe798488e6c03311cee8328398c7ce5e235f70c8 (diff)
downloadopenttd-414ac3286b10b83d8f832c58f48f373f5130cb89.tar.xz
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
Diffstat (limited to 'main_gui.c')
-rw-r--r--main_gui.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/main_gui.c b/main_gui.c
index 91c7bcc48..2f21e7aef 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -381,7 +381,8 @@ void ShowRenameWaypointWindow(Waypoint *cp)
/* Are we allowed to change the name of the waypoint? */
if (!CheckTileOwnership(cp->xy)) {
- ShowErrorMessage(_error_message, STR_CANT_CHANGE_WAYPOINT_NAME, GET_TILE_X(cp->xy) * 16, GET_TILE_Y(cp->xy) * 16);
+ ShowErrorMessage(_error_message, STR_CANT_CHANGE_WAYPOINT_NAME,
+ TileX(cp->xy) * 16, TileY(cp->xy) * 16);
return;
}
@@ -1143,7 +1144,7 @@ static void CommonRaiseLowerBigLand(uint tile, int mode)
_generating_world = true;
-// tile = TILE_FROM_XY(GET_TILE_X(tile)*16+_tile_fract_coords.x + 8,GET_TILE_Y(tile)*16+_tile_fract_coords.y + 8);
+// tile = TILE_FROM_XY(TileX(tile) * 16 + _tile_fract_coords.x + 8, TileY(tile) * 16 + _tile_fract_coords.y + 8);
if (_terraform_size == 1) {
DoCommandP(tile, 8, (uint32)mode, CcTerraform, CMD_TERRAFORM_LAND | CMD_AUTO);
@@ -1190,7 +1191,7 @@ static void PlaceProc_LowerBigLand(uint tile)
//{
// if (success) {
//SndPlayTileFx(0x10, tile);
- //CreateEffectVehicleAbove(GET_TILE_X(tile)*16 + 8,GET_TILE_Y(tile)*16 + 8, 2, EV_DEMOLISH);
+ //CreateEffectVehicleAbove(TileX(tile) * 16 + 8, TileY(tile) * 16 + 8, 2, EV_DEMOLISH);
// }
//}