diff options
| author | alberth <alberth@openttd.org> | 2010-12-23 14:24:34 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2010-12-23 14:24:34 +0000 |
| commit | 90780fd25bab45fb97304337f10b78c9210a7190 (patch) | |
| tree | e89a067d86fa4e9b8034660396cbb0fc2e0eb27a /src/terraform_gui.cpp | |
| parent | 1ba348914dc78ae72026aff568a2e09442be4bcb (diff) | |
| download | openttd-90780fd25bab45fb97304337f10b78c9210a7190.tar.xz | |
(svn r21608) -Codechange: Move diagnonal rectangle dragging detection completely to tile highlighting.
Diffstat (limited to 'src/terraform_gui.cpp')
| -rw-r--r-- | src/terraform_gui.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp index 1901203d5..ad403143b 100644 --- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -174,22 +174,22 @@ enum TerraformToolbarWidgets { static void TerraformClick_Lower(Window *w) { - HandlePlacePushButton(w, TTW_LOWER_LAND, ANIMCURSOR_LOWERLAND, HT_POINT, PlaceProc_LowerLand); + HandlePlacePushButton(w, TTW_LOWER_LAND, ANIMCURSOR_LOWERLAND, HT_POINT | HT_DIAGONAL, PlaceProc_LowerLand); } static void TerraformClick_Raise(Window *w) { - HandlePlacePushButton(w, TTW_RAISE_LAND, ANIMCURSOR_RAISELAND, HT_POINT, PlaceProc_RaiseLand); + HandlePlacePushButton(w, TTW_RAISE_LAND, ANIMCURSOR_RAISELAND, HT_POINT | HT_DIAGONAL, PlaceProc_RaiseLand); } static void TerraformClick_Level(Window *w) { - HandlePlacePushButton(w, TTW_LEVEL_LAND, SPR_CURSOR_LEVEL_LAND, HT_POINT, PlaceProc_LevelLand); + HandlePlacePushButton(w, TTW_LEVEL_LAND, SPR_CURSOR_LEVEL_LAND, HT_POINT | HT_DIAGONAL, PlaceProc_LevelLand); } static void TerraformClick_Dynamite(Window *w) { - HandlePlacePushButton(w, TTW_DEMOLISH, ANIMCURSOR_DEMOLISH, HT_RECT, PlaceProc_DemolishArea); + HandlePlacePushButton(w, TTW_DEMOLISH, ANIMCURSOR_DEMOLISH, HT_RECT | HT_DIAGONAL, PlaceProc_DemolishArea); } static void TerraformClick_BuyLand(Window *w) @@ -546,7 +546,7 @@ static const NWidgetPart _nested_scen_edit_land_gen_widgets[] = { */ static void EditorTerraformClick_Dynamite(Window *w) { - HandlePlacePushButton(w, ETTW_DEMOLISH, ANIMCURSOR_DEMOLISH, HT_RECT, PlaceProc_DemolishArea); + HandlePlacePushButton(w, ETTW_DEMOLISH, ANIMCURSOR_DEMOLISH, HT_RECT | HT_DIAGONAL, PlaceProc_DemolishArea); } static void EditorTerraformClick_LowerBigLand(Window *w) @@ -561,7 +561,7 @@ static void EditorTerraformClick_RaiseBigLand(Window *w) static void EditorTerraformClick_LevelLand(Window *w) { - HandlePlacePushButton(w, ETTW_LEVEL_LAND, SPR_CURSOR_LEVEL_LAND, HT_POINT, PlaceProc_LevelLand); + HandlePlacePushButton(w, ETTW_LEVEL_LAND, SPR_CURSOR_LEVEL_LAND, HT_POINT | HT_DIAGONAL, PlaceProc_LevelLand); } static void EditorTerraformClick_RockyArea(Window *w) @@ -623,17 +623,6 @@ static void ResetLandscapeConfirmationCallback(Window *w, bool confirmed) } } -/** - * Checks whether we are currently dragging diagonally. - * @returns True iff we are selecting a diagonal rectangle for an action that supports it, otherwise false. - */ -bool IsDraggingDiagonal() -{ - return _ctrl_pressed && _left_button_down && ( - _place_proc == PlaceProc_DemolishArea || _place_proc == PlaceProc_LevelLand || - _place_proc == PlaceProc_RaiseLand || _place_proc == PlaceProc_LowerLand); -} - struct ScenarioEditorLandscapeGenerationWindow : Window { ScenarioEditorLandscapeGenerationWindow(const WindowDesc *desc, WindowNumber window_number) : Window() { |