gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-07-20 10:56:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18303) -Fix: Widget indices are valid when >= 0.

Browse Source
This commit is contained in:
frosch 2009-11-26 22:46:13 +00:00
parent 421a24001c
commit efffb1b92c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widget.cpp
View File

@ -1589,7 +1589,7 @@ NWidgetCore *NWidgetBackground::GetWidgetFromPos(int x, int y)
Scrollbar *NWidgetBackground::FindScrollbar(Window *w, bool allow_next) const Scrollbar *NWidgetBackground::FindScrollbar(Window *w, bool allow_next) const
{ {
if (this->index > 0 && allow_next && this->child == NULL && (uint)(this->index) + 1 < w->nested_array_size) { if (this->index >= 0 && allow_next && this->child == NULL && (uint)(this->index) + 1 < w->nested_array_size) {
const NWidgetCore *next_wid = w->GetWidget<NWidgetCore>(this->index + 1); const NWidgetCore *next_wid = w->GetWidget<NWidgetCore>(this->index + 1);
if (next_wid != NULL) return next_wid->FindScrollbar(w, false); if (next_wid != NULL) return next_wid->FindScrollbar(w, false);
} }
@ -2058,7 +2058,7 @@ Scrollbar *NWidgetLeaf::FindScrollbar(Window *w, bool allow_next) const
if (this->type == WWT_SCROLLBAR) return &w->vscroll; if (this->type == WWT_SCROLLBAR) return &w->vscroll;
if (this->type == WWT_SCROLL2BAR) return &w->vscroll2; if (this->type == WWT_SCROLL2BAR) return &w->vscroll2;
if (this->index > 0 && allow_next && (uint)(this->index) + 1 < w->nested_array_size) { if (this->index >= 0 && allow_next && (uint)(this->index) + 1 < w->nested_array_size) {
const NWidgetCore *next_wid = w->GetWidget<NWidgetCore>(this->index + 1); const NWidgetCore *next_wid = w->GetWidget<NWidgetCore>(this->index + 1);
if (next_wid != NULL) return next_wid->FindScrollbar(w, false); if (next_wid != NULL) return next_wid->FindScrollbar(w, false);
} }