diff --git a/src/news_gui.cpp b/src/news_gui.cpp index 1bb110caa7..475f3f2c5e 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -449,7 +449,7 @@ struct NewsWindow : Window { case WID_N_VEH_NAME: case WID_N_VEH_TITLE: - str = GetString(this->GetNewVehicleMessageString(widget)); + str = this->GetNewVehicleMessageString(widget); break; case WID_N_VEH_INFO: { @@ -524,8 +524,7 @@ struct NewsWindow : Window { } case WID_N_MGR_NAME: { const CompanyNewsInformation *cni = static_cast(this->ni->data.get()); - SetDParamStr(0, cni->president_name); - DrawStringMultiLine(r, STR_JUST_RAW_STRING, TC_FROMSTRING, SA_CENTER); + DrawStringMultiLine(r, GetString(STR_JUST_RAW_STRING, cni->president_name), TC_FROMSTRING, SA_CENTER); break; } @@ -612,8 +611,7 @@ struct NewsWindow : Window { NWidgetResizeBase *wid = this->GetWidget(WID_N_MGR_NAME); if (wid != nullptr) { - SetDParamStr(0, static_cast(this->ni->data.get())->president_name); - int y = GetStringHeight(STR_JUST_RAW_STRING, wid->current_x); + int y = GetStringHeight(GetString(STR_JUST_RAW_STRING, static_cast(this->ni->data.get())->president_name), wid->current_x); if (wid->UpdateVerticalSize(y)) this->ReInit(0, 0); } } @@ -666,19 +664,17 @@ private: AddDirtyBlock(this->left, mintop, this->left + this->width, maxtop + this->height); } - StringID GetNewVehicleMessageString(WidgetID widget) const + std::string GetNewVehicleMessageString(WidgetID widget) const { assert(std::holds_alternative(ni->ref1)); EngineID engine = std::get(this->ni->ref1); switch (widget) { case WID_N_VEH_TITLE: - SetDParam(0, GetEngineCategoryName(engine)); - return STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE; + return GetString(STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE, GetEngineCategoryName(engine)); case WID_N_VEH_NAME: - SetDParam(0, PackEngineNameDParam(engine, EngineNameContext::PreviewNews)); - return STR_NEWS_NEW_VEHICLE_TYPE; + return GetString(STR_NEWS_NEW_VEHICLE_TYPE, PackEngineNameDParam(engine, EngineNameContext::PreviewNews)); default: NOT_REACHED(); @@ -1212,8 +1208,7 @@ struct MessageHistoryWindow : Window { /* Months are off-by-one, so it's actually 8. Not using * month 12 because the 1 is usually less wide. */ - SetDParam(0, TimerGameCalendar::ConvertYMDToDate(CalendarTime::ORIGINAL_MAX_YEAR, 7, 30)); - this->date_width = GetStringBoundingBox(STR_JUST_DATE_TINY).width + WidgetDimensions::scaled.hsep_wide; + this->date_width = GetStringBoundingBox(GetString(STR_JUST_DATE_TINY, TimerGameCalendar::ConvertYMDToDate(CalendarTime::ORIGINAL_MAX_YEAR, 7, 30))).width + WidgetDimensions::scaled.hsep_wide; size.height = 4 * resize.height + WidgetDimensions::scaled.framerect.Vertical(); // At least 4 lines are visible. size.width = std::max(200u, size.width); // At least 200 pixels wide. @@ -1232,8 +1227,7 @@ struct MessageHistoryWindow : Window { auto [first, last] = this->vscroll->GetVisibleRangeIterators(_news); for (auto ni = first; ni != last; ++ni) { - SetDParam(0, ni->date); - DrawString(date.left, date.right, y, STR_JUST_DATE_TINY, TC_WHITE); + DrawString(date.left, date.right, y, GetString(STR_JUST_DATE_TINY, ni->date), TC_WHITE); DrawNewsString(news.left, news.right, y, TC_WHITE, &*ni); y += this->line_height;