From 1ef4f7712dec1142a4ff35f8a59f649a5643156c Mon Sep 17 00:00:00 2001 From: peter1138 Date: Tue, 25 Dec 2012 22:10:43 +0000 Subject: (svn r24853) -Fix: Extend widget data member to 32 bits so that sprite IDs >= 2^16 can be used. --- src/widget_type.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/widget_type.h') diff --git a/src/widget_type.h b/src/widget_type.h index 6d267e1b5..495c5267d 100644 --- a/src/widget_type.h +++ b/src/widget_type.h @@ -281,10 +281,10 @@ DECLARE_ENUM_AS_BIT_SET(NWidgetDisplay) */ class NWidgetCore : public NWidgetResizeBase { public: - NWidgetCore(WidgetType tp, Colours colour, uint fill_x, uint fill_y, uint16 widget_data, StringID tool_tip); + NWidgetCore(WidgetType tp, Colours colour, uint fill_x, uint fill_y, uint32 widget_data, StringID tool_tip); void SetIndex(int index); - void SetDataTip(uint16 widget_data, StringID tool_tip); + void SetDataTip(uint32 widget_data, StringID tool_tip); inline void SetLowered(bool lowered); inline bool IsLowered() const; @@ -300,7 +300,7 @@ public: NWidgetDisplay disp_flags; ///< Flags that affect display and interaction with the widget. Colours colour; ///< Colour of this widget. int index; ///< Index of the nested widget in the widget array of the window (\c -1 means 'not used'). - uint16 widget_data; ///< Data of the widget. @see Widget::data + uint32 widget_data; ///< Data of the widget. @see Widget::data StringID tool_tip; ///< Tooltip of the widget. @see Widget::tootips int scrollbar_index; ///< Index of an attached scrollbar. TextColour highlight_colour; ///< Colour of highlight. -- cgit v1.2.3-54-g00ecf