mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13980) -Codechange: Turn small map legend while loop into a for-loop.

release/0.7
peter1138 2008-08-03 18:18:36 +00:00
parent 29ba35df7b
commit e1451e1124
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/smallmap_gui.cpp
View File

@ -840,7 +840,6 @@ public:
virtual void OnPaint() virtual void OnPaint()
{ {
const LegendAndColour *tbl;
int x, y, y_org; int x, y, y_org;
uint diff; uint diff;
DrawPixelInfo new_dpi; DrawPixelInfo new_dpi;
@ -853,8 +852,6 @@ public:
SetDParam(0, STR_00E5_CONTOURS + this->map_type); SetDParam(0, STR_00E5_CONTOURS + this->map_type);
this->DrawWidgets(); this->DrawWidgets();
tbl = _legend_table[this->map_type];
/* difference in window size */ /* difference in window size */
diff = (_industries_per_column > BASE_NB_PER_COLUMN) ? ((_industries_per_column - BASE_NB_PER_COLUMN) * BASE_NB_PER_COLUMN) + 1 : 0; diff = (_industries_per_column > BASE_NB_PER_COLUMN) ? ((_industries_per_column - BASE_NB_PER_COLUMN) * BASE_NB_PER_COLUMN) + 1 : 0;
@ -862,7 +859,14 @@ public:
y_org = this->height - 44 - 11 - diff; y_org = this->height - 44 - 11 - diff;
y = y_org; y = y_org;
for (;;) { for (const LegendAndColour *tbl = _legend_table[this->map_type]; !tbl->end; ++tbl) {
if (tbl->col_break) {
/* Column break needed, continue at top, 123 pixels (one "row")
* to the right. */
x += 123;
y = y_org;
}
if (this->map_type == SMT_INDUSTRY) { if (this->map_type == SMT_INDUSTRY) {
/* Industry name must be formated, since it's not in tiny font in the specs. /* Industry name must be formated, since it's not in tiny font in the specs.
* So, draw with a parameter and use the STR_SMALLMAP_INDUSTRY string, which is tiny font.*/ * So, draw with a parameter and use the STR_SMALLMAP_INDUSTRY string, which is tiny font.*/
@ -884,16 +888,7 @@ public:
} }
GfxFillRect(x + 1, y + 2, x + 7, y + 4, tbl->colour); // legend color GfxFillRect(x + 1, y + 2, x + 7, y + 4, tbl->colour); // legend color
tbl += 1;
y += 6; y += 6;
if (tbl->end) { // end of the list
break;
} else if (tbl->col_break) {
/* break asked, continue at top, 123 pixels (one "row") to the right */
x += 123;
y = y_org;
}
} }
const Widget *wi = &this->widget[SM_WIDGET_MAP]; const Widget *wi = &this->widget[SM_WIDGET_MAP];