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

(svn r7356) -Codechange: replace 'for (i = 0, wi = w->widget; wi->type != WWT_LAST; i++, wi++)' type for loops with 'for (i = 0; i < w->window_count; i++) { wi = &w->widget[i];'-type for loops for better readability.

Browse Source 
-Codechange: use IsWindowWidget(Disabled|Hidden) in favor of IsWidget(Disabled|Hidden).
This commit is contained in:
rubidium
2006-12-04 13:57:04 +00:00
parent 756d6a6efb
commit 9a87e1e0ea
3 changed files with 18 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
window.h
View File

@@ -665,17 +665,6 @@ static inline void EnableWindowWidget(Window *w, byte widget_index)
SetWindowWidgetDisabledState(w, widget_index, false);
}
/**
* Gets the enabled/disabled status of a widget.
* This is the same as IsWindowWidgetDisabled, only working on direct widget, instead of an index
* @param wi : Widget to get the status from
* @return status of the widget ie: disabled = true, enabled = false
*/
static inline bool IsWidgetDisabled(const Widget *wi)
{
return HASBIT(wi->display_flags, WIDG_DISABLED);
}
/**
* Gets the enabled/disabled status of a widget.
* @param w : Window on which the widget is located
@@ -685,7 +674,7 @@ static inline bool IsWidgetDisabled(const Widget *wi)
static inline bool IsWindowWidgetDisabled(const Window *w, byte widget_index)
{
assert(widget_index < w->widget_count);
return IsWidgetDisabled(&w->widget[widget_index]);
return HASBIT(w->widget[widget_index].display_flags, WIDG_DISABLED);
}
/**
@@ -722,17 +711,6 @@ static inline void ShowWindowWidget(Window *w, byte widget_index)
SetWindowWidgetHiddenState(w, widget_index, false);
}
/**
* Gets the visibility of a widget.
* Works directly on a widget, instead of an index
* @param wi Widget to get the status from
* @return status of the widget ie. hidden = true, visible = false
*/
static inline bool IsWidgetHidden(const Widget *wi)
{
return HASBIT(wi->display_flags, WIDG_HIDDEN);
}
/**
* Gets the visibility of a widget.
* @param w : Window on which the widget is located
@@ -742,7 +720,7 @@ static inline bool IsWidgetHidden(const Widget *wi)
static inline bool IsWindowWidgetHidden(const Window *w, byte widget_index)
{
assert(widget_index < w->widget_count);
return IsWidgetHidden(&w->widget[widget_index]);
return HASBIT(w->widget[widget_index].display_flags, WIDG_HIDDEN);
}
/**