From fa8ab829e9372153edb17248ad974a8b4302f558 Mon Sep 17 00:00:00 2001 From: belugas Date: Wed, 7 May 2008 00:04:40 +0000 Subject: [PATCH] (svn r12983) -Codechange [FS#1987] : Unification of all dynamite tools calls to only one. Thanks to Roujin --- src/airport_gui.cpp | 7 +------ src/dock_gui.cpp | 7 +------ src/road_gui.cpp | 7 +------ 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index d14eb8c71a..fe2d46181a 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -40,11 +40,6 @@ static void PlaceAirport(TileIndex tile) DoCommandP(tile, _selected_airport_type, _ctrl_pressed, CcBuildAirport, CMD_BUILD_AIRPORT | CMD_NO_WATER | CMD_MSG(STR_A001_CAN_T_BUILD_AIRPORT_HERE)); } -static void PlaceAir_DemolishArea(TileIndex tile) -{ - VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_DEMOLISH_AREA); -} - enum { ATW_AIRPORT = 3, @@ -59,7 +54,7 @@ static void BuildAirClick_Airport(Window *w) static void BuildAirClick_Demolish(Window *w) { - HandlePlacePushButton(w, ATW_DEMOLISH, ANIMCURSOR_DEMOLISH, VHM_RECT, PlaceAir_DemolishArea); + HandlePlacePushButton(w, ATW_DEMOLISH, ANIMCURSOR_DEMOLISH, VHM_RECT, PlaceProc_DemolishArea); } diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index 05a1858bc4..408a5edf77 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -58,11 +58,6 @@ static void PlaceDocks_Buoy(TileIndex tile) DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_BUOY | CMD_MSG(STR_9835_CAN_T_POSITION_BUOY_HERE)); } -static void PlaceDocks_DemolishArea(TileIndex tile) -{ - VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_DEMOLISH_AREA); -} - static void PlaceDocks_BuildCanal(TileIndex tile) { VpStartPlaceSizing(tile, VPM_X_OR_Y, DDSP_CREATE_WATER); @@ -96,7 +91,7 @@ static void BuildDocksClick_Lock(Window *w) static void BuildDocksClick_Demolish(Window *w) { - HandlePlacePushButton(w, DTW_DEMOLISH, ANIMCURSOR_DEMOLISH, VHM_RECT, PlaceDocks_DemolishArea); + HandlePlacePushButton(w, DTW_DEMOLISH, ANIMCURSOR_DEMOLISH, VHM_RECT, PlaceProc_DemolishArea); } static void BuildDocksClick_Depot(Window *w) diff --git a/src/road_gui.cpp b/src/road_gui.cpp index a0e43a6cd4..e5e0804786 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -230,11 +230,6 @@ static void PlaceRoad_TruckStation(TileIndex tile) } } -static void PlaceRoad_DemolishArea(TileIndex tile) -{ - VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_DEMOLISH_AREA); -} - /** Enum referring to the widgets of the build road toolbar */ enum RoadToolbarWidgets { RTW_CLOSEBOX = 0, @@ -322,7 +317,7 @@ static void BuildRoadClick_AutoRoad(Window *w) static void BuildRoadClick_Demolish(Window *w) { - HandlePlacePushButton(w, RTW_DEMOLISH, ANIMCURSOR_DEMOLISH, VHM_RECT, PlaceRoad_DemolishArea); + HandlePlacePushButton(w, RTW_DEMOLISH, ANIMCURSOR_DEMOLISH, VHM_RECT, PlaceProc_DemolishArea); } static void BuildRoadClick_Depot(Window *w)