diff options
Diffstat (limited to 'src/industry_gui.cpp')
| -rw-r--r-- | src/industry_gui.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 21a43b03b..b04a85736 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -189,6 +189,7 @@ public: int y_str = this->widget[DPIW_INFOPANEL].top + 3; const Widget *wi = &this->widget[DPIW_INFOPANEL]; int max_width = wi->right - wi->left - 4; + int right = wi->right - 1; /* Raw industries might be prospected. Show this fact by changing the string * In Editor, you just build, while ingame, or you fund or you prospect */ @@ -213,13 +214,13 @@ public: bool selected = this->selected_index == i + this->vscroll.pos; if (this->index[i + this->vscroll.pos] == INVALID_INDUSTRYTYPE) { - DrawStringTruncated(20, y + offset, STR_MANY_RANDOM_INDUSTRIES, selected ? TC_WHITE : TC_ORANGE, max_width - 25); + DrawString(20, right, y + offset, STR_MANY_RANDOM_INDUSTRIES, selected ? TC_WHITE : TC_ORANGE); continue; } const IndustrySpec *indsp = GetIndustrySpec(this->index[i + this->vscroll.pos]); /* Draw the name of the industry in white is selected, otherwise, in orange */ - DrawStringTruncated(20, y + offset, indsp->name, selected ? TC_WHITE : TC_ORANGE, max_width - 25); + DrawString(20, right, y + offset, indsp->name, selected ? TC_WHITE : TC_ORANGE); GfxFillRect(x, y + 1 + offset, x + 10, y + 7 + offset, selected ? 15 : 0); GfxFillRect(x + 1, y + 2 + offset, x + 9, y + 6 + offset, indsp->map_colour); } @@ -231,7 +232,7 @@ public: if (_game_mode != GM_EDITOR) { SetDParam(0, indsp->GetConstructionCost()); - DrawStringTruncated(x_str, y_str, STR_482F_COST, TC_FROMSTRING, max_width); + DrawString(x_str, right, y_str, STR_482F_COST, TC_FROMSTRING); y_str += 11; } @@ -246,7 +247,7 @@ public: SetDParam(p++, GetCargo(indsp->accepts_cargo[j])->name); SetDParam(p++, GetCargoSuffix(j, CST_FUND, NULL, this->selected_type, indsp)); } - DrawStringTruncated(x_str, y_str, str, TC_FROMSTRING, max_width); + DrawString(x_str, right, y_str, str, TC_FROMSTRING); y_str += 11; /* Draw the produced cargos, if any. Otherwhise, will print "Nothing" */ @@ -260,7 +261,7 @@ public: SetDParam(p++, GetCargo(indsp->produced_cargo[j])->name); SetDParam(p++, GetCargoSuffix(j + 3, CST_FUND, NULL, this->selected_type, indsp)); } - DrawStringTruncated(x_str, y_str, str, TC_FROMSTRING, max_width); + DrawString(x_str, right, y_str, str, TC_FROMSTRING); y_str += 11; /* Get the additional purchase info text, if it has not already been */ @@ -487,14 +488,14 @@ public: if (i->accepts_cargo[j] == CT_INVALID) continue; has_accept = true; if (first) { - DrawStringTruncated(2, y, STR_INDUSTRY_WINDOW_WAITING_FOR_PROCESSING, TC_FROMSTRING, this->widget[IVW_INFO].right - 2); + DrawString(2, this->widget[IVW_INFO].right, y, STR_INDUSTRY_WINDOW_WAITING_FOR_PROCESSING, TC_FROMSTRING); y += 10; first = false; } SetDParam(0, i->accepts_cargo[j]); SetDParam(1, i->incoming_cargo_waiting[j]); SetDParam(2, GetCargoSuffix(j, CST_VIEW, i, i->type, ind)); - DrawStringTruncated(4, y, STR_INDUSTRY_WINDOW_WAITING_STOCKPILE_CARGO, TC_FROMSTRING, this->widget[IVW_INFO].right - 4); + DrawString(4, this->widget[IVW_INFO].right, y, STR_INDUSTRY_WINDOW_WAITING_STOCKPILE_CARGO, TC_FROMSTRING); y += 10; } } else { @@ -508,7 +509,7 @@ public: SetDParam(p++, GetCargoSuffix(j, CST_VIEW, i, i->type, ind)); } if (has_accept) { - DrawStringTruncated(2, y, str, TC_FROMSTRING, this->widget[IVW_INFO].right - 2); + DrawString(2, this->widget[IVW_INFO].right, y, str, TC_FROMSTRING); y += 10; } } @@ -518,7 +519,7 @@ public: if (i->produced_cargo[j] == CT_INVALID) continue; if (first) { if (has_accept) y += 10; - DrawStringTruncated(2, y, STR_482A_PRODUCTION_LAST_MONTH, TC_FROMSTRING, this->widget[IVW_INFO].right - 2); + DrawString(2, this->widget[IVW_INFO].right, y, STR_482A_PRODUCTION_LAST_MONTH, TC_FROMSTRING); y += 10; this->production_offset_y = y; first = false; @@ -530,7 +531,7 @@ public: SetDParam(3, i->last_month_pct_transported[j] * 100 >> 8); uint x = 4 + (IsProductionAlterable(i) ? 30 : 0); - DrawStringTruncated(x, y, STR_482B_TRANSPORTED, TC_FROMSTRING, this->widget[IVW_INFO].right - x); + DrawString(x, this->widget[IVW_INFO].right, y, STR_482B_TRANSPORTED, TC_FROMSTRING); /* Let's put out those buttons.. */ if (IsProductionAlterable(i)) { DrawArrowButtons(5, y, COLOUR_YELLOW, (this->clicked_line == j + 1) ? this->clicked_button : 0, @@ -903,7 +904,7 @@ public: /* Drawing the right string */ StringID str = STR_INDUSTRYDIR_ITEM_NOPROD; if (p != 1) str = (p == 5) ? STR_INDUSTRYDIR_ITEM : STR_INDUSTRYDIR_ITEM_TWO; - DrawStringTruncated(4, y, str, TC_FROMSTRING, this->widget[IDW_INDUSTRY_LIST].right - 4); + DrawString(4, this->widget[IDW_INDUSTRY_LIST].right, y, str, TC_FROMSTRING); y += 10; } |