gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-12 01:24:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r24853) -Fix: Extend widget data member to 32 bits so that sprite IDs >= 2^16 can be used.

Browse Source
This commit is contained in:
peter1138 2012-12-25 22:10:43 +00:00
parent 629efeedb4
commit 1ef4f7712d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrf_gui.cpp
View File

@ -1212,7 +1212,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
has_missing |= c->status == GCS_NOT_FOUND; has_missing |= c->status == GCS_NOT_FOUND;
has_compatible |= HasBit(c->flags, GCF_COMPATIBLE); has_compatible |= HasBit(c->flags, GCF_COMPATIBLE);
} }
uint16 widget_data; uint32 widget_data;
StringID tool_tip; StringID tool_tip;
if (has_missing || has_compatible) { if (has_missing || has_compatible) {
widget_data = STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON; widget_data = STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON;

4
src/widget.cpp
View File

@ -822,7 +822,7 @@ void NWidgetResizeBase::AssignSizePosition(SizingType sizing, uint x, uint y, ui
* @param widget_data Data component of the widget. @see Widget::data * @param widget_data Data component of the widget. @see Widget::data
* @param tool_tip Tool tip of the widget. @see Widget::tootips * @param tool_tip Tool tip of the widget. @see Widget::tootips
*/ */
NWidgetCore::NWidgetCore(WidgetType tp, Colours colour, uint fill_x, uint fill_y, uint16 widget_data, StringID tool_tip) : NWidgetResizeBase(tp, fill_x, fill_y) NWidgetCore::NWidgetCore(WidgetType tp, Colours colour, uint fill_x, uint fill_y, uint32 widget_data, StringID tool_tip) : NWidgetResizeBase(tp, fill_x, fill_y)
{ {
this->colour = colour; this->colour = colour;
this->index = -1; this->index = -1;
@ -846,7 +846,7 @@ void NWidgetCore::SetIndex(int index)
* @param widget_data Data to use. * @param widget_data Data to use.
* @param tool_tip Tool tip string to use. * @param tool_tip Tool tip string to use.
*/ */
void NWidgetCore::SetDataTip(uint16 widget_data, StringID tool_tip) void NWidgetCore::SetDataTip(uint32 widget_data, StringID tool_tip)
{ {
this->widget_data = widget_data; this->widget_data = widget_data;
this->tool_tip = tool_tip; this->tool_tip = tool_tip;

6
src/widget_type.h
View File

@ -281,10 +281,10 @@ DECLARE_ENUM_AS_BIT_SET(NWidgetDisplay)
*/ */
class NWidgetCore : public NWidgetResizeBase { class NWidgetCore : public NWidgetResizeBase {
public: 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 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 void SetLowered(bool lowered);
inline bool IsLowered() const; inline bool IsLowered() const;
@ -300,7 +300,7 @@ public:
NWidgetDisplay disp_flags; ///< Flags that affect display and interaction with the widget. NWidgetDisplay disp_flags; ///< Flags that affect display and interaction with the widget.
Colours colour; ///< Colour of this 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'). 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 StringID tool_tip; ///< Tooltip of the widget. @see Widget::tootips
int scrollbar_index; ///< Index of an attached scrollbar. int scrollbar_index; ///< Index of an attached scrollbar.
TextColour highlight_colour; ///< Colour of highlight. TextColour highlight_colour; ///< Colour of highlight.