diff options
author | celestar <celestar@openttd.org> | 2006-03-30 11:11:35 +0000 |
---|---|---|
committer | celestar <celestar@openttd.org> | 2006-03-30 11:11:35 +0000 |
commit | 24f23babd1f2933cb9ffcac1a442aee8e5862d83 (patch) | |
tree | 651dad6adb2d1f363f68c63e2cbaca3a50ec7fb2 /water_cmd.c | |
parent | ac7c9b6051aef798018cb3bea820eb1e611b0994 (diff) | |
download | openttd-24f23babd1f2933cb9ffcac1a442aee8e5862d83.tar.xz |
(svn r4171) -Codechange: Create map accessor functions for creating ship depots and locks. Make use of them
Diffstat (limited to 'water_cmd.c')
-rw-r--r-- | water_cmd.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/water_cmd.c b/water_cmd.c index 78f4e82be..0aad1df86 100644 --- a/water_cmd.c +++ b/water_cmd.c @@ -90,15 +90,10 @@ int32 CmdBuildShipDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) _last_built_ship_depot_tile = tile; depot->town_index = ClosestTownFromTile(tile, (uint)-1)->index; - ModifyTile(tile, - MP_SETTYPE(MP_WATER) | MP_MAPOWNER_CURRENT | MP_MAP5 | MP_MAP2_CLEAR | MP_MAP3LO_CLEAR | MP_MAP3HI_CLEAR, - (0x80 + p1*2) - ); - - ModifyTile(tile2, - MP_SETTYPE(MP_WATER) | MP_MAPOWNER_CURRENT | MP_MAP5 | MP_MAP2_CLEAR | MP_MAP3LO_CLEAR | MP_MAP3HI_CLEAR, - (0x81 + p1*2) - ); + MakeShipDepot(tile,_current_player, DEPOT_NORTH, p1); + MakeShipDepot(tile2,_current_player, DEPOT_SOUTH, p1); + MarkTileDirtyByTile(tile); + MarkTileDirtyByTile(tile2); } return cost + _price.build_ship_depot; @@ -150,9 +145,10 @@ static int32 DoBuildShiplift(TileIndex tile, DiagDirection dir, uint32 flags) if (GetTileSlope(tile + delta, NULL)) return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION); if (flags & DC_EXEC) { - ModifyTile(tile, MP_SETTYPE(MP_WATER) | MP_MAPOWNER | MP_MAP5 | MP_MAP2_CLEAR | MP_MAP3LO_CLEAR | MP_MAP3HI_CLEAR, OWNER_WATER, 0x10 + dir); - ModifyTile(tile - delta, MP_SETTYPE(MP_WATER) | MP_MAPOWNER | MP_MAP5 | MP_MAP2_CLEAR | MP_MAP3LO_CLEAR | MP_MAP3HI_CLEAR, OWNER_WATER, 0x14 + dir); - ModifyTile(tile + delta, MP_SETTYPE(MP_WATER) | MP_MAPOWNER | MP_MAP5 | MP_MAP2_CLEAR | MP_MAP3LO_CLEAR | MP_MAP3HI_CLEAR, OWNER_WATER, 0x18 + dir); + MakeLock(tile, dir); + MarkTileDirtyByTile(tile); + MarkTileDirtyByTile(tile - delta); + MarkTileDirtyByTile(tile + delta); } return _price.clear_water * 22 >> 3; |