# HG changeset patch # User tron # Date 1132051843 0 # Node ID c01dfbc7b7e3a108c055e96d0c5c41ef0c01130e # Parent 841087328e0ef164e2bc248bbd3fc2d090e8d275 (svn r3188) Use CmdFailed() to check, if a command failed, don't compare with CMD_ERROR diff -r 841087328e0e -r c01dfbc7b7e3 town_cmd.c --- a/town_cmd.c Tue Nov 15 09:47:25 2005 +0000 +++ b/town_cmd.c Tue Nov 15 10:50:43 2005 +0000 @@ -518,9 +518,10 @@ res = DoCommandByTile(tile, slope^0xF, 1, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_TERRAFORM_LAND); } - if (res == CMD_ERROR && CHANCE16I(1,3,r)) + if (CmdFailed(res) && CHANCE16I(1, 3, r)) { // We can consider building on the slope, though. goto no_slope; + } } return false; } @@ -535,8 +536,7 @@ TILE_ASSERT(tile); r = DoCommandByTile(tile, edges, dir, DC_AUTO | DC_NO_WATER, CMD_TERRAFORM_LAND); - if (r == CMD_ERROR || r >= 126*16) - return false; + if (CmdFailed(r) || r >= 126 * 16) return false; DoCommandByTile(tile, edges, dir, DC_AUTO | DC_NO_WATER | DC_EXEC, CMD_TERRAFORM_LAND); return true; } @@ -1577,8 +1577,7 @@ r = DoCommandByTile(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); _current_player = old; - if (r == CMD_ERROR) - return false; + if (CmdFailed(r)) return false; ModifyTile(tile, MP_SETTYPE(MP_UNMOVABLE) | MP_MAPOWNER_CURRENT | MP_MAP5, 2 /* map5 */