gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-08 07:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r13313) -Fix-ish (r13306): List was copied in another place the autoreplace gui...

Browse Source
This commit is contained in:
peter1138 2008-05-28 17:08:45 +00:00
parent 6e334d10bb
commit f44a2c38f8
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/autoreplace_gui.cpp
View File

@ -254,8 +254,6 @@ public:
ReplaceVehicleWindow(const WindowDesc *desc, VehicleType vehicletype, GroupID id_g) : Window(desc, vehicletype) ReplaceVehicleWindow(const WindowDesc *desc, VehicleType vehicletype, GroupID id_g) : Window(desc, vehicletype)
{ {
this->wagon_btnstate = true; // start with locomotives (all other vehicles will not read this bool) this->wagon_btnstate = true; // start with locomotives (all other vehicles will not read this bool)
new (&this->list[0]) EngineList();
new (&this->list[1]) EngineList();
this->update_left = true; this->update_left = true;
this->update_right = true; this->update_right = true;
this->init_lists = true; this->init_lists = true;
@ -381,12 +379,12 @@ public:
/* Draw the lists */ /* Draw the lists */
for (byte i = 0; i < 2; i++) { for (byte i = 0; i < 2; i++) {
uint widget = (i == 0) ? RVW_WIDGET_LEFT_MATRIX : RVW_WIDGET_RIGHT_MATRIX; uint widget = (i == 0) ? RVW_WIDGET_LEFT_MATRIX : RVW_WIDGET_RIGHT_MATRIX;
EngineList list = this->list[i]; // which list to draw EngineList *list = &this->list[i]; // which list to draw
EngineID start = i == 0 ? this->vscroll.pos : this->vscroll2.pos; // what is the offset for the start (scrolling) EngineID start = i == 0 ? this->vscroll.pos : this->vscroll2.pos; // what is the offset for the start (scrolling)
EngineID end = min((i == 0 ? this->vscroll.cap : this->vscroll2.cap) + start, list.size()); EngineID end = min((i == 0 ? this->vscroll.cap : this->vscroll2.cap) + start, list->size());
/* Do the actual drawing */ /* Do the actual drawing */
DrawEngineList((VehicleType)this->window_number, this->widget[widget].left + 2, this->widget[widget].top + 1, &list, start, end, this->sel_engine[i], i == 0 ? this->widget[RVW_WIDGET_LEFT_MATRIX].right - 2 : 0, selected_group); DrawEngineList((VehicleType)this->window_number, this->widget[widget].left + 2, this->widget[widget].top + 1, list, start, end, this->sel_engine[i], i == 0 ? this->widget[RVW_WIDGET_LEFT_MATRIX].right - 2 : 0, selected_group);
/* Also draw the details if an engine is selected */ /* Also draw the details if an engine is selected */
if (this->sel_engine[i] != INVALID_ENGINE) { if (this->sel_engine[i] != INVALID_ENGINE) {