mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r17784) -Codechange: Replace 'i' with 'side' when side is intended in the autoreplace window.

This commit is contained in:
alberth 2009-10-17 08:18:55 +00:00
parent 13c1694158
commit 0c766b913c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/autoreplace_gui.cpp
View File

@ -136,9 +136,9 @@ class ReplaceVehicleWindow : public Window {
{ {
EngineID selected_engine = INVALID_ENGINE; EngineID selected_engine = INVALID_ENGINE;
VehicleType type = (VehicleType)this->window_number; VehicleType type = (VehicleType)this->window_number;
byte i = draw_left ? 0 : 1; byte side = draw_left ? 0 : 1;
GUIEngineList *list = &this->engines[i]; GUIEngineList *list = &this->engines[side];
list->Clear(); list->Clear();
const Engine *e; const Engine *e;
@ -156,9 +156,9 @@ class ReplaceVehicleWindow : public Window {
} }
*list->Append() = eid; *list->Append() = eid;
if (eid == this->sel_engine[i]) selected_engine = eid; // The selected engine is still in the list if (eid == this->sel_engine[side]) selected_engine = eid; // The selected engine is still in the list
} }
this->sel_engine[i] = selected_engine; // update which engine we selected (the same or none, if it's not in the list anymore) this->sel_engine[side] = selected_engine; // update which engine we selected (the same or none, if it's not in the list anymore)
EngList_Sort(list, &EngineNumberSorter); EngList_Sort(list, &EngineNumberSorter);
} }
@ -296,24 +296,24 @@ public:
DrawString(this->widget[RVW_WIDGET_INFO_TAB].left + 6, this->widget[RVW_WIDGET_INFO_TAB].right - 6, this->widget[RVW_WIDGET_INFO_TAB].top + 1, STR_BLACK_STRING); DrawString(this->widget[RVW_WIDGET_INFO_TAB].left + 6, this->widget[RVW_WIDGET_INFO_TAB].right - 6, this->widget[RVW_WIDGET_INFO_TAB].top + 1, STR_BLACK_STRING);
/* Draw the lists */ /* Draw the lists */
for (byte i = 0; i < 2; i++) { for (byte side = 0; side < 2; side++) {
uint widget = (i == 0) ? RVW_WIDGET_LEFT_MATRIX : RVW_WIDGET_RIGHT_MATRIX; uint widget = (side == 0) ? RVW_WIDGET_LEFT_MATRIX : RVW_WIDGET_RIGHT_MATRIX;
GUIEngineList *list = &this->engines[i]; // which engines list to draw GUIEngineList *list = &this->engines[side]; // which engines list to draw
EngineID start = i == 0 ? this->vscroll.GetPosition() : this->vscroll2.GetPosition(); // what is the offset for the start (scrolling) EngineID start = side == 0 ? this->vscroll.GetPosition() : this->vscroll2.GetPosition(); // what is the offset for the start (scrolling)
EngineID end = min((i == 0 ? this->vscroll.GetCapacity() : this->vscroll2.GetCapacity()) + start, list->Length()); EngineID end = min((side == 0 ? this->vscroll.GetCapacity() : this->vscroll2.GetCapacity()) + start, list->Length());
/* Do the actual drawing */ /* Do the actual drawing */
DrawEngineList((VehicleType)this->window_number, this->widget[widget].left + 2, this->widget[widget].right, this->widget[widget].top + 1, DrawEngineList((VehicleType)this->window_number, this->widget[widget].left + 2, this->widget[widget].right, this->widget[widget].top + 1,
list, start, end, this->sel_engine[i], i == 0 ? this->widget[RVW_WIDGET_LEFT_MATRIX].right - 2 : 0, this->sel_group); list, start, end, this->sel_engine[side], side == 0 ? this->widget[RVW_WIDGET_LEFT_MATRIX].right - 2 : 0, this->sel_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[side] != INVALID_ENGINE) {
const Widget *wi = &this->widget[i == 0 ? RVW_WIDGET_LEFT_DETAILS : RVW_WIDGET_RIGHT_DETAILS]; const Widget *wi = &this->widget[side == 0 ? RVW_WIDGET_LEFT_DETAILS : RVW_WIDGET_RIGHT_DETAILS];
int text_end = DrawVehiclePurchaseInfo(wi->left + 2, wi->right - 2, wi->top + 1, this->sel_engine[i]); int text_end = DrawVehiclePurchaseInfo(wi->left + 2, wi->right - 2, wi->top + 1, this->sel_engine[side]);
if (text_end > wi->bottom) { if (text_end > wi->bottom) {
this->SetDirty(); this->SetDirty();
ResizeWindowForWidget(this, i == 0 ? RVW_WIDGET_LEFT_DETAILS : RVW_WIDGET_RIGHT_DETAILS, 0, text_end - wi->bottom); ResizeWindowForWidget(this, side == 0 ? RVW_WIDGET_LEFT_DETAILS : RVW_WIDGET_RIGHT_DETAILS, 0, text_end - wi->bottom);
this->SetDirty(); this->SetDirty();
} }
} }