From 0365c1f33ba130bcfc663309b806fe65d730381f Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 9 Jan 2008 16:55:48 +0000 Subject: (svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114). --- src/landscape.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/landscape.cpp') diff --git a/src/landscape.cpp b/src/landscape.cpp index 8c1a83711..3c0e52a7f 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -524,8 +524,6 @@ void ClearSnowLine(void) */ CommandCost CmdLandscapeClear(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { - SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); - return _tile_type_procs[GetTileType(tile)]->clear_tile_proc(tile, flags); } @@ -537,7 +535,8 @@ CommandCost CmdLandscapeClear(TileIndex tile, uint32 flags, uint32 p1, uint32 p2 */ CommandCost CmdClearArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { - CommandCost cost, ret, money; + CommandCost ret, money; + CommandCost cost(EXPENSES_CONSTRUCTION); int ex; int ey; int sx, sy; @@ -546,8 +545,6 @@ CommandCost CmdClearArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (p1 >= MapSize()) return CMD_ERROR; - SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); - /* make sure sx,sy are smaller than ex,ey */ ex = TileX(tile); ey = TileY(tile); -- cgit v1.2.3-54-g00ecf