diff options
| author | rubidium <rubidium@openttd.org> | 2014-10-06 19:16:29 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2014-10-06 19:16:29 +0000 |
| commit | 0af26b8a3786f243dd6920dbeac7d140fb447775 (patch) | |
| tree | 5e4e2fdf3e4fc7c3d053f0b01acbc073afb6dfcc | |
| parent | 8c7f376ae174d4bf653a8f4fa17d5188acf83cb5 (diff) | |
| download | openttd-0af26b8a3786f243dd6920dbeac7d140fb447775.tar.xz | |
(svn r26971) -Fix: widget_data was sometimes uint16 and sometimes uint32; make it always be uint32
| -rw-r--r-- | src/widget.cpp | 2 | ||||
| -rw-r--r-- | src/widget_type.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/widget.cpp b/src/widget.cpp index cfbb6f400..0532142ae 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -2107,7 +2107,7 @@ Dimension NWidgetLeaf::dropdown_dimension = {0, 0}; * @param data Data of the widget. * @param tip Tooltip of the widget. */ -NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint16 data, StringID tip) : NWidgetCore(tp, colour, 1, 1, data, tip) +NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint32 data, StringID tip) : NWidgetCore(tp, colour, 1, 1, data, tip) { assert(index >= 0 || tp == WWT_LABEL || tp == WWT_TEXT || tp == WWT_CAPTION || tp == WWT_RESIZEBOX || tp == WWT_SHADEBOX || tp == WWT_DEFSIZEBOX || tp == WWT_DEBUGBOX || tp == WWT_STICKYBOX || tp == WWT_CLOSEBOX); if (index >= 0) this->SetIndex(index); diff --git a/src/widget_type.h b/src/widget_type.h index 6d8b32bc9..39efbb463 100644 --- a/src/widget_type.h +++ b/src/widget_type.h @@ -769,7 +769,7 @@ private: */ class NWidgetLeaf : public NWidgetCore { public: - NWidgetLeaf(WidgetType tp, Colours colour, int index, uint16 data, StringID tip); + NWidgetLeaf(WidgetType tp, Colours colour, int index, uint32 data, StringID tip); /* virtual */ void SetupSmallestSize(Window *w, bool init_array); /* virtual */ void Draw(const Window *w); @@ -856,7 +856,7 @@ static inline uint ComputeMaxSize(uint base, uint max_space, uint step) * @ingroup NestedWidgetParts */ struct NWidgetPartDataTip { - uint16 data; ///< Data value of the widget. + uint32 data; ///< Data value of the widget. StringID tooltip; ///< Tooltip of the widget. }; @@ -1011,7 +1011,7 @@ static inline NWidgetPart EndContainer() * @param tip Tooltip of the widget. * @ingroup NestedWidgetParts */ -static inline NWidgetPart SetDataTip(uint16 data, StringID tip) +static inline NWidgetPart SetDataTip(uint32 data, StringID tip) { NWidgetPart part; |