dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r2799) Make the only two non-const widget lists const

Browse Source
This commit is contained in:
tron
2005-08-03 13:07:29 +00:00
parent 940872e51f
commit c2178ab832
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
misc_gui.c
View File

@@ -615,7 +615,7 @@ void ShowFeederIncomeAnimation(int x, int y, int z, int32 cost)
AddTextEffect(STR_FEEDER, pt.x, pt.y, 0x250); AddTextEffect(STR_FEEDER, pt.x, pt.y, 0x250);
} }
static Widget _tooltips_widgets[] = { static const Widget _tooltips_widgets[] = {
{ WWT_PANEL, RESIZE_NONE, 14, 0, 199, 0, 31, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 14, 0, 199, 0, 31, 0x0, STR_NULL},
{ WIDGETS_END}, { WIDGETS_END},
}; };
@@ -665,9 +665,6 @@ void GuiShowTooltips(StringID string_id)
right = 200; right = 200;
} }
_tooltips_widgets[0].right = right;
_tooltips_widgets[0].bottom = bottom;
y = _cursor.pos.y + 30; y = _cursor.pos.y + 30;
if (y < 22) y = 22; if (y < 22) y = 22;
@@ -681,6 +678,8 @@ void GuiShowTooltips(StringID string_id)
w = AllocateWindow(x, y, right, bottom, TooltipsWndProc, WC_TOOLTIPS, _tooltips_widgets); w = AllocateWindow(x, y, right, bottom, TooltipsWndProc, WC_TOOLTIPS, _tooltips_widgets);
WP(w,tooltips_d).string_id = string_id; WP(w,tooltips_d).string_id = string_id;
w->flags4 &= ~WF_WHITE_BORDER_MASK; w->flags4 &= ~WF_WHITE_BORDER_MASK;
w->widget[0].right = right;
w->widget[0].bottom = bottom;
} }

2
train_gui.c
View File

@@ -879,7 +879,7 @@ static void ShowRailVehicleRefitWindow(Vehicle *v)
WP(w,refit_d).sel = -1; WP(w,refit_d).sel = -1;
} }
static Widget _train_view_widgets[] = { static const Widget _train_view_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW }, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW },
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 237, 0, 13, STR_882E, STR_018C_WINDOW_TITLE_DRAG_THIS }, { WWT_CAPTION, RESIZE_RIGHT, 14, 11, 237, 0, 13, STR_882E, STR_018C_WINDOW_TITLE_DRAG_THIS },
{ WWT_STICKYBOX, RESIZE_LR, 14, 238, 249, 0, 13, 0x0, STR_STICKY_BUTTON }, { WWT_STICKYBOX, RESIZE_LR, 14, 238, 249, 0, 13, 0x0, STR_STICKY_BUTTON },