diff options
author | glx <glx@openttd.org> | 2008-05-11 15:08:44 +0000 |
---|---|---|
committer | glx <glx@openttd.org> | 2008-05-11 15:08:44 +0000 |
commit | c708ab3b486a2ecf1f163c900ff71fd46764bdfa (patch) | |
tree | dfb592610399f3c49e4292af8aacfd992b50d368 /src/window_gui.h | |
parent | c47926311b5f90086f0c7a44c30f3455748d524c (diff) | |
download | openttd-c708ab3b486a2ecf1f163c900ff71fd46764bdfa.tar.xz |
(svn r13047) -Codechange: remove vp_d
Diffstat (limited to 'src/window_gui.h')
-rw-r--r-- | src/window_gui.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/window_gui.h b/src/window_gui.h index a647cb8c6..73f7065e7 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -271,6 +271,17 @@ struct ResizeInfo { }; /** + * Data structure for a window viewport + */ +struct ViewportData : ViewPort { + VehicleID follow_vehicle; + int32 scrollpos_x; + int32 scrollpos_y; + int32 dest_scrollpos_x; + int32 dest_scrollpos_y; +}; + + /** * Data structure for an opened window */ struct Window : ZeroedMemoryAllocator { @@ -306,7 +317,7 @@ public: byte caption_color; ///< Background color of the window caption, contains PlayerID - ViewPort *viewport; ///< Pointer to viewport, if present + ViewportData *viewport; ///< Pointer to viewport data, if present const Widget *original_widget; ///< Original widget layout, copied from WindowDesc Widget *widget; ///< Widgets of the window uint widget_count; ///< Number of widgets of the window @@ -540,16 +551,6 @@ struct depot_d { }; assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(depot_d)); -struct vp_d { - VehicleID follow_vehicle; - int32 scrollpos_x; - int32 scrollpos_y; - int32 dest_scrollpos_x; - int32 dest_scrollpos_y; - ViewPort vp_data; ///< Screen position and zoom of the viewport -}; -assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vp_d)); - enum SortListFlags { VL_NONE = 0, ///< no sort VL_DESC = 1 << 0, ///< sort descending or ascending |