gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-04 13:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18947) -Fix [FS#1510]: after clicking move up/move down in the newgrf/ai the selected item could be out of range

Browse Source
This commit is contained in:
yexo 2010-01-29 15:45:53 +00:00
parent a668e801e4
commit 81882039e3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ai/ai_gui.cpp
View File

@ -604,6 +604,7 @@ struct AIConfigWindow : public Window {
if (this->selected_slot > 1) { if (this->selected_slot > 1) {
Swap(_settings_newgame.ai_config[this->selected_slot], _settings_newgame.ai_config[this->selected_slot - 1]); Swap(_settings_newgame.ai_config[this->selected_slot], _settings_newgame.ai_config[this->selected_slot - 1]);
this->selected_slot--; this->selected_slot--;
this->vscroll.ScrollTowards(this->selected_slot);
this->InvalidateData(); this->InvalidateData();
} }
break; break;
@ -612,6 +613,7 @@ struct AIConfigWindow : public Window {
if (this->selected_slot < _settings_newgame.difficulty.max_no_competitors) { if (this->selected_slot < _settings_newgame.difficulty.max_no_competitors) {
Swap(_settings_newgame.ai_config[this->selected_slot], _settings_newgame.ai_config[this->selected_slot + 1]); Swap(_settings_newgame.ai_config[this->selected_slot], _settings_newgame.ai_config[this->selected_slot + 1]);
this->selected_slot++; this->selected_slot++;
this->vscroll.ScrollTowards(this->selected_slot);
this->InvalidateData(); this->InvalidateData();
} }
break; break;

8
src/newgrf_gui.cpp
View File

@ -777,7 +777,8 @@ struct NewGRFWindow : public Window {
GRFConfig **pc, *c; GRFConfig **pc, *c;
if (this->sel == NULL) break; if (this->sel == NULL) break;
for (pc = &this->list; (c = *pc) != NULL; pc = &c->next) { int pos = 0;
for (pc = &this->list; (c = *pc) != NULL; pc = &c->next, pos++) {
if (c->next == this->sel) { if (c->next == this->sel) {
c->next = this->sel->next; c->next = this->sel->next;
this->sel->next = c; this->sel->next = c;
@ -785,6 +786,7 @@ struct NewGRFWindow : public Window {
break; break;
} }
} }
this->vscroll.ScrollTowards(pos);
this->preset = -1; this->preset = -1;
this->InvalidateData(); this->InvalidateData();
break; break;
@ -794,7 +796,8 @@ struct NewGRFWindow : public Window {
GRFConfig **pc, *c; GRFConfig **pc, *c;
if (this->sel == NULL) break; if (this->sel == NULL) break;
for (pc = &this->list; (c = *pc) != NULL; pc = &c->next) { int pos = 1; // Start at 1 as we swap the selected newgrf with the next one
for (pc = &this->list; (c = *pc) != NULL; pc = &c->next, pos++) {
if (c == this->sel) { if (c == this->sel) {
*pc = c->next; *pc = c->next;
c->next = c->next->next; c->next = c->next->next;
@ -802,6 +805,7 @@ struct NewGRFWindow : public Window {
break; break;
} }
} }
this->vscroll.ScrollTowards(pos);
this->preset = -1; this->preset = -1;
this->InvalidateData(); this->InvalidateData();
break; break;