cpp/openttd-patchpack/source Changeset - r9147:6e8812a42759

Changeset - r9147:6e8812a42759

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

rubidium - 16 years ago 2008-05-08 13:21:55
rubidium@openttd.org

(svn r13009) -Codechange: move more tile highlighting related functions/types to tilehighlight_*.h.

6 files changed with 36 insertions and 36 deletions:

src/gui.h

src/tilehighlight_func.h

src/tilehighlight_type.h

src/viewport.cpp

src/viewport_func.h

src/viewport_type.h

0 comments (0 inline, 0 general)

src/gui.h

➞

Show inline comments

@@ @@ -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();

src/tilehighlight_func.h

➞

Show inline comments

@@ @@ -20,6 +20,11 @@ bool HandlePlacePushButton(Window *w, in @@
 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;

src/tilehighlight_type.h

➞

Show inline comments

@@ @@ -69,7 +69,7 @@ struct TileHighlightData { @@
 	WindowNumber window_number;
 	ViewportPlaceMethod select_method;
-	byte select_proc;
+	ViewportDragDropSelectionProcess select_proc;
 	TileIndex redsq;
 };

src/viewport.cpp

➞

Show inline comments

@@ @@ -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;

src/viewport_func.h

➞

Show inline comments

@@ @@ -51,11 +51,6 @@ void SetTileSelectBigSize(int ox, int oy @@
 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();

src/viewport_type.h

➞

Show inline comments

@@ @@ -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 */

0 comments (0 inline, 0 general)