# HG changeset patch # User rubidium # Date 1210253450 0 # Node ID b4c7d2c33bda7b6c3f49a764e9d389193c87d26a # Parent ba0f18cfc795bb3f114d0242a55d486a32e87c13 (svn r13011) -Codechange: move PlaceProc_BuyLand out of rail_gui.cpp to the place where it is used and remove some unneeded globalisations of some other PlaceProc functions. diff -r ba0f18cfc795 -r b4c7d2c33bda src/rail_gui.cpp --- a/src/rail_gui.cpp Thu May 08 13:29:35 2008 +0000 +++ b/src/rail_gui.cpp Thu May 08 13:30:50 2008 +0000 @@ -251,11 +251,6 @@ CMD_BUILD_TUNNEL | CMD_MSG(STR_5016_CAN_T_BUILD_TUNNEL_HERE)); } -void PlaceProc_BuyLand(TileIndex tile) -{ - DoCommandP(tile, 0, 0, CcPlaySound1E, CMD_PURCHASE_LAND_AREA | CMD_NO_WATER | CMD_MSG(STR_5806_CAN_T_PURCHASE_THIS_LAND)); -} - static void PlaceRail_ConvertRail(TileIndex tile) { VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_CONVERT_RAIL); diff -r ba0f18cfc795 -r b4c7d2c33bda src/terraform_gui.cpp --- a/src/terraform_gui.cpp Thu May 08 13:29:35 2008 +0000 +++ b/src/terraform_gui.cpp Thu May 08 13:30:50 2008 +0000 @@ -159,6 +159,11 @@ 'O', }; +static void PlaceProc_BuyLand(TileIndex tile) +{ + DoCommandP(tile, 0, 0, CcPlaySound1E, CMD_PURCHASE_LAND_AREA | CMD_NO_WATER | CMD_MSG(STR_5806_CAN_T_PURCHASE_THIS_LAND)); +} + void PlaceProc_DemolishArea(TileIndex tile) { VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_DEMOLISH_AREA); @@ -174,7 +179,7 @@ VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_LOWER_AND_LEVEL_AREA); } -void PlaceProc_LevelLand(TileIndex tile) +static void PlaceProc_LevelLand(TileIndex tile) { VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_LEVEL_AREA); } diff -r ba0f18cfc795 -r b4c7d2c33bda src/tilehighlight_func.h --- a/src/tilehighlight_func.h Thu May 08 13:29:35 2008 +0000 +++ b/src/tilehighlight_func.h Thu May 08 13:30:50 2008 +0000 @@ -12,8 +12,6 @@ typedef void PlaceProc(TileIndex tile); void PlaceProc_DemolishArea(TileIndex tile); -void PlaceProc_LevelLand(TileIndex tile); -void PlaceProc_BuyLand(TileIndex tile); bool GUIPlaceProcDragXY(const WindowEvent *e); bool HandlePlacePushButton(Window *w, int widget, CursorID cursor, ViewportHighlightMode mode, PlaceProc *placeproc);