cpp/openttd-patchpack/source Changeset - r19897:f242204fe284

Changeset - r19897:f242204fe284

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

peter1138 - 11 years ago 2012-12-25 22:10:43
peter1138@openttd.org

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

3 files changed with 6 insertions and 6 deletions:

src/newgrf_gui.cpp

src/widget.cpp

src/widget_type.h

0 comments (0 inline, 0 general)

src/newgrf_gui.cpp

➞

Show inline comments

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

src/widget.cpp

➞

Show inline comments

@@ @@ -822,7 +822,7 @@ void NWidgetResizeBase::AssignSizePositi @@
  * @param widget_data Data component of the widget. @see Widget::data
  * @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->index = -1;
@@ @@ -846,7 +846,7 @@ void NWidgetCore::SetIndex(int index) @@
  * @param widget_data Data 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->tool_tip = tool_tip;

src/widget_type.h

➞

Show inline comments

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

0 comments (0 inline, 0 general)