From c28ce39e3cefd43ca52e5daf812048a38f23eeb7 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 7 May 2008 13:10:15 +0000 Subject: (svn r12987) -Codechange: split viewport and tile selection. --- src/viewport_type.h | 67 ----------------------------------------------------- 1 file changed, 67 deletions(-) (limited to 'src/viewport_type.h') diff --git a/src/viewport_type.h b/src/viewport_type.h index f43566fbb..e14862e65 100644 --- a/src/viewport_type.h +++ b/src/viewport_type.h @@ -5,10 +5,7 @@ #ifndef VIEWPORT_TYPE_H #define VIEWPORT_TYPE_H -#include "core/geometry_type.hpp" #include "zoom_type.h" -#include "window_type.h" -#include "tile_type.h" /** * Data structure for viewport, display of a part of the world @@ -55,68 +52,4 @@ enum ViewportPlaceMethod { VPM_SIGNALDIRS = 6, ///< similiar to VMP_RAILDIRS, but with different cursor }; -/** Viewport highlight mode (for highlighting tiles below cursor) */ -enum ViewportHighlightMode { - VHM_NONE = 0, ///< default - VHM_RECT = 1, ///< rectangle (stations, depots, ...) - VHM_POINT = 2, ///< point (lower land, raise land, level land, ...) - VHM_SPECIAL = 3, ///< special mode used for highlighting while dragging (and for tunnels/docks) - VHM_DRAG = 4, ///< dragging items in the depot windows - VHM_RAIL = 5, ///< rail pieces -}; - -/** Highlighting draw styles */ -enum HighLightStyle { - HT_NONE = 0x00, - HT_RECT = 0x80, - HT_POINT = 0x40, - HT_LINE = 0x20, ///< used for autorail highlighting (longer streches) - ///< (uses lower bits to indicate direction) - HT_RAIL = 0x10, ///< autorail (one piece) - ///< (uses lower bits to indicate direction) - HT_DRAG_MASK = 0xF0, ///< masks the drag-type - - /* lower bits (used with HT_LINE and HT_RAIL): - * (see ASCII art in autorail.h for a visual interpretation) */ - HT_DIR_X = 0, ///< X direction - HT_DIR_Y = 1, ///< Y direction - HT_DIR_HU = 2, ///< horizontal upper - HT_DIR_HL = 3, ///< horizontal lower - HT_DIR_VL = 4, ///< vertical left - HT_DIR_VR = 5, ///< vertical right - HT_DIR_MASK = 0x7 ///< masks the drag-direction -}; -DECLARE_ENUM_AS_BIT_SET(HighLightStyle); - - -struct TileHighlightData { - Point size; - Point outersize; - Point pos; - Point offs; - - Point new_pos; - Point new_size; - Point new_outersize; - - Point selend, selstart; - - byte dirty; - byte sizelimit; - - byte drawstyle; // lower bits 0-3 are reserved for detailed highlight information information - byte new_drawstyle; // only used in UpdateTileSelection() to as a buffer to compare if there was a change between old and new - byte next_drawstyle; // queued, but not yet drawn style - - ViewportHighlightMode place_mode; - bool make_square_red; - WindowClass window_class; - WindowNumber window_number; - - ViewportPlaceMethod select_method; - byte select_proc; - - TileIndex redsq; -}; - #endif /* VIEWPORT_TYPE_H */ -- cgit v1.2.3-54-g00ecf