From c74ca3897017adc0606171ac79dd03b83c00420e Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 8 May 2008 13:30:50 +0000 Subject: [PATCH] (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. --- src/rail_gui.cpp | 5 ----- src/terraform_gui.cpp | 7 ++++++- src/tilehighlight_func.h | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index a15e863825..2354689b33 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -251,11 +251,6 @@ static void PlaceRail_Tunnel(TileIndex tile) 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 --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp index 12831c2930..3a7b46193a 100644 --- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -159,6 +159,11 @@ static const uint16 _terraform_keycodes[] = { '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 @@ static void PlaceProc_LowerLand(TileIndex tile) 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 --git a/src/tilehighlight_func.h b/src/tilehighlight_func.h index 3b49c23933..78eff6f5f9 100644 --- a/src/tilehighlight_func.h +++ b/src/tilehighlight_func.h @@ -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);