From 8b9ffbe15824cc0ca405e5c3ed49a276995a9739 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Thu, 8 May 2008 13:21:55 +0000
Subject: [PATCH] (svn r13009) -Codechange: move more tile highlighting related
 functions/types to tilehighlight_*.h.

---
 src/gui.h                | 29 -----------------------------
 src/tilehighlight_func.h |  5 +++++
 src/tilehighlight_type.h |  2 +-
 src/viewport.cpp         |  2 +-
 src/viewport_func.h      |  5 -----
 src/viewport_type.h      | 29 +++++++++++++++++++++++++++++
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/gui.h b/src/gui.h
index 9e1bddf769..8572ab85e2 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -48,35 +48,6 @@ void ShowBuildAirToolbar();
 void ShowGenerateLandscape();
 void ShowHeightmapLoad();
 
-/** Drag and drop selection process, or, what to do with an area of land when
- * you've selected it. */
-enum {
-	DDSP_DEMOLISH_AREA,
-	DDSP_RAISE_AND_LEVEL_AREA,
-	DDSP_LOWER_AND_LEVEL_AREA,
-	DDSP_LEVEL_AREA,
-	DDSP_CREATE_DESERT,
-	DDSP_CREATE_ROCKS,
-	DDSP_CREATE_WATER,
-	DDSP_CREATE_RIVER,
-	DDSP_PLANT_TREES,
-	DDSP_BUILD_BRIDGE,
-
-	/* Rail specific actions */
-	DDSP_PLACE_RAIL_NE,
-	DDSP_PLACE_RAIL_NW,
-	DDSP_PLACE_AUTORAIL,
-	DDSP_BUILD_SIGNALS,
-	DDSP_BUILD_STATION,
-	DDSP_REMOVE_STATION,
-	DDSP_CONVERT_RAIL,
-
-	/* Road specific actions */
-	DDSP_PLACE_ROAD_X_DIR,
-	DDSP_PLACE_ROAD_Y_DIR,
-	DDSP_PLACE_AUTOROAD,
-};
-
 /* misc_gui.cpp */
 void PlaceLandBlockInfo();
 void ShowAboutWindow();
diff --git a/src/tilehighlight_func.h b/src/tilehighlight_func.h
index 13278aa5fa..3789134b10 100644
--- a/src/tilehighlight_func.h
+++ b/src/tilehighlight_func.h
@@ -20,6 +20,11 @@ bool HandlePlacePushButton(Window *w, int widget, CursorID cursor, ViewportHighl
 void SetObjectToPlaceWnd(CursorID icon, SpriteID pal, ViewportHighlightMode mode, Window *w);
 void SetObjectToPlace(CursorID icon, SpriteID pal, ViewportHighlightMode mode, WindowClass window_class, WindowNumber window_num);
 
+void VpSelectTilesWithMethod(int x, int y, ViewportPlaceMethod method);
+void VpStartPlaceSizing(TileIndex tile, ViewportPlaceMethod method, ViewportDragDropSelectionProcess process);
+void VpSetPresizeRange(TileIndex from, TileIndex to);
+void VpSetPlaceSizingLimit(int limit);
+
 extern PlaceProc *_place_proc;
 extern TileHighlightData _thd;
 
diff --git a/src/tilehighlight_type.h b/src/tilehighlight_type.h
index 0637d374e8..1ad04d9ea2 100644
--- a/src/tilehighlight_type.h
+++ b/src/tilehighlight_type.h
@@ -69,7 +69,7 @@ struct TileHighlightData {
 	WindowNumber window_number;
 
 	ViewportPlaceMethod select_method;
-	byte select_proc;
+	ViewportDragDropSelectionProcess select_proc;
 
 	TileIndex redsq;
 };
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 3de54e9871..fed5d26e9e 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -2228,7 +2228,7 @@ void UpdateTileSelection()
 }
 
 /** highlighting tiles while only going over them with the mouse */
-void VpStartPlaceSizing(TileIndex tile, ViewportPlaceMethod method, byte process)
+void VpStartPlaceSizing(TileIndex tile, ViewportPlaceMethod method, ViewportDragDropSelectionProcess process)
 {
 	_thd.select_method = method;
 	_thd.select_proc   = process;
diff --git a/src/viewport_func.h b/src/viewport_func.h
index 7be3e733e7..3cada2a1da 100644
--- a/src/viewport_func.h
+++ b/src/viewport_func.h
@@ -51,11 +51,6 @@ void SetTileSelectBigSize(int ox, int oy, int sx, int sy);
 
 Vehicle *CheckMouseOverVehicle();
 
-void VpSelectTilesWithMethod(int x, int y, ViewportPlaceMethod method);
-void VpStartPlaceSizing(TileIndex tile, ViewportPlaceMethod method, byte process);
-void VpSetPresizeRange(TileIndex from, TileIndex to);
-void VpSetPlaceSizingLimit(int limit);
-
 void ViewportDoDraw(const ViewPort *vp, int left, int top, int right, int bottom);
 
 void ResetObjectToPlace();
diff --git a/src/viewport_type.h b/src/viewport_type.h
index 166ca65933..98f56b8852 100644
--- a/src/viewport_type.h
+++ b/src/viewport_type.h
@@ -58,4 +58,33 @@ enum ViewportPlaceMethod {
 	VPM_SIGNALDIRS      = 6, ///< similiar to VMP_RAILDIRS, but with different cursor
 };
 
+/** Drag and drop selection process, or, what to do with an area of land when
+ * you've selected it. */
+enum ViewportDragDropSelectionProcess {
+	DDSP_DEMOLISH_AREA,
+	DDSP_RAISE_AND_LEVEL_AREA,
+	DDSP_LOWER_AND_LEVEL_AREA,
+	DDSP_LEVEL_AREA,
+	DDSP_CREATE_DESERT,
+	DDSP_CREATE_ROCKS,
+	DDSP_CREATE_WATER,
+	DDSP_CREATE_RIVER,
+	DDSP_PLANT_TREES,
+	DDSP_BUILD_BRIDGE,
+
+	/* Rail specific actions */
+	DDSP_PLACE_RAIL_NE,
+	DDSP_PLACE_RAIL_NW,
+	DDSP_PLACE_AUTORAIL,
+	DDSP_BUILD_SIGNALS,
+	DDSP_BUILD_STATION,
+	DDSP_REMOVE_STATION,
+	DDSP_CONVERT_RAIL,
+
+	/* Road specific actions */
+	DDSP_PLACE_ROAD_X_DIR,
+	DDSP_PLACE_ROAD_Y_DIR,
+	DDSP_PLACE_AUTOROAD,
+};
+
 #endif /* VIEWPORT_TYPE_H */