(svn r2136) - Fix: [ 1174313 ] terrain hotkeys nonfunctional in scenario editor (D,Q,W,E,R,T,Y,U fltr)

- Fix: 'L' no longer opens ingame terraform bar in scenario editor bar, but the land generator one
- Feature: [ 1095110 ] Create Lake and draggable Create Desert tools (initial implementation GoneWacko), also added sticky buttons to land generator and town generator
- CodeChange: moved around some of the draggable tools, demystifying them
- CodeChange: change CmdBuildCanal to allow for XANDY dragging not only X or Y (only scenario editor)
- CodeChange: add some more enums to sprites.
- TODO: merge most of the ingame and scenario editor land terraform code. This can only be done after OnClickButton function is changed so it also includes the backreference to the widget being clicked, postponed to after 0.4.0

1 files changed, 13 insertions, 2 deletions

diff --git a/gui.h b/gui.h
index 868662144..03655a5ac 100644
--- a/gui.h
+++ b/gui.h
@@ -6,6 +6,8 @@
 /* main_gui.c */
 void SetupColorsAndInitialWindow(void);
 void CcPlaySound10(bool success, uint tile, uint32 p1, uint32 p2);
+void CcBuildCanal(bool success, uint tile, uint32 p1, uint32 p2);
+void CcTerraform(bool success, uint tile, uint32 p1, uint32 p2);
 
 /* settings_gui.c */
 void ShowGameOptions(void);
@@ -57,14 +59,23 @@ void ShowBuildAirToolbar(void);
 void ShowPlayerAircraft(int player, int station);
 
 /* terraform_gui.c */
+void ShowTerraformToolbar(void);
+
 void PlaceProc_DemolishArea(uint tile);
 void PlaceProc_LowerLand(uint tile);
 void PlaceProc_RaiseLand(uint tile);
 void PlaceProc_LevelLand(uint tile);
-void ShowTerraformToolbar(void);
+bool GUIPlaceProcDragXY(const WindowEvent *we);
+
+enum { // max 32 - 4 = 28 types
+	GUI_PlaceProc_DemolishArea    = 0 << 4,
+	GUI_PlaceProc_LevelArea       = 1 << 4,
+	GUI_PlaceProc_DesertArea      = 2 << 4,
+	GUI_PlaceProc_WaterArea       = 3 << 4,
+	GUI_PlaceProc_ConvertRailArea = 4 << 4
+};
 
 /* misc_gui.c */
-
 void PlaceLandBlockInfo(void);
 void ShowAboutWindow(void);
 void ShowBuildTreesToolbar(void);