gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 07:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17856) -Codechange: Don't get the selected cargo as a sife effect of drawing.

Browse Source
This commit is contained in:
alberth 2009-10-24 18:37:23 +00:00
parent af60e61b20
commit 64f9ee3a2d
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/vehicle_gui.cpp
View File

@ -243,37 +243,24 @@ static RefitList *BuildRefitList(const Vehicle *v)
* @param rows number of rows(capacity) in caller window * @param rows number of rows(capacity) in caller window
* @param delta step height in caller window * @param delta step height in caller window
* @param right the right most position to draw * @param right the right most position to draw
* @return the refit option that is hightlighted, NULL if none
*/ */
static RefitOption *DrawVehicleRefitWindow(const RefitList *list, int sel, uint pos, uint rows, uint delta, uint right) static void DrawVehicleRefitWindow(const RefitList *list, int sel, uint pos, uint rows, uint delta, uint right)
{ {
RefitOption *selected = NULL;
uint y = 31; uint y = 31;
/* Draw the list, and find the selected cargo (by its position in list) */ /* Draw the list, and find the selected cargo (by its position in list) */
for (uint i = 0; i < list->num_lines; i++) { for (uint i = pos; i < pos + rows && i < list->num_lines; i++) {
TextColour colour = TC_BLACK; TextColour colour = (sel == (int)i) ? TC_WHITE : TC_BLACK;
RefitOption *refit = &list->items[i]; RefitOption *refit = &list->items[i];
if (sel == 0) {
selected = refit; /* Draw the cargo name */
colour = TC_WHITE; int last_x = DrawString(2, right, y, CargoSpec::Get(refit->cargo)->name, colour);
/* If the callback succeeded, draw the cargo suffix */
if (refit->value != CALLBACK_FAILED) {
DrawString(last_x + 1, right, y, GetGRFStringID(GetEngineGRFID(refit->engine), 0xD000 + refit->value), colour);
} }
y += delta;
if (i >= pos && i < pos + rows) {
/* Draw the cargo name */
int last_x = DrawString(2, right, y, CargoSpec::Get(refit->cargo)->name, colour);
/* If the callback succeeded, draw the cargo suffix */
if (refit->value != CALLBACK_FAILED) {
DrawString(last_x + 1, right, y, GetGRFStringID(GetEngineGRFID(refit->engine), 0xD000 + refit->value), colour);
}
y += delta;
}
sel--;
} }
return selected;
} }
/** Widget numbers of the vehicle refit window. */ /** Widget numbers of the vehicle refit window. */
@ -342,7 +329,8 @@ struct RefitWindow : public Window {
SetDParam(0, v->index); SetDParam(0, v->index);
this->DrawWidgets(); this->DrawWidgets();
this->cargo = DrawVehicleRefitWindow(this->list, this->sel, this->vscroll.GetPosition(), this->vscroll.GetCapacity(), this->resize.step_height, this->width - 2); DrawVehicleRefitWindow(this->list, this->sel, this->vscroll.GetPosition(), this->vscroll.GetCapacity(), this->resize.step_height, this->width - 2);
this->cargo = (this->sel >= 0 && this->sel < (int)this->list->num_lines) ? &this->list->items[this->sel] : NULL;
if (this->cargo != NULL) { if (this->cargo != NULL) {
CommandCost cost; CommandCost cost;