(svn r26971) -Fix: widget_data was sometimes uint16 and sometimes uint32; make it always be uint32

This commit is contained in:
rubidium
2014-10-06 19:16:29 +00:00
parent 9f654b200d
commit fdd5b2293d
2 changed files with 4 additions and 4 deletions

View File

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