miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 6e10584b91: Keep custom news from game scripts in encoded form. (#13741)

Browse Source 
This allows the news message to translated as appropriate.
This commit is contained in:
Peter Nelson
2025-03-04 23:15:50 +00:00
committed by GitHub
parent b979f0414c
commit 51fd2853cb
5 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/news_gui.cpp
View File

@@ -424,6 +424,7 @@ struct NewsWindow : Window {
void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
{
FontSize fontsize = FS_NORMAL;
std::string str;
switch (widget) {
case WID_N_CAPTION: {
@@ -441,6 +442,7 @@ struct NewsWindow : Window {
case WID_N_MESSAGE:
case WID_N_COMPANY_MSG:
fontsize = FS_LARGE;
str = this->ni->headline.GetDecodedString();
break;
@@ -481,7 +483,7 @@ struct NewsWindow : Window {
Dimension d = size;
d.width = (d.width >= padding.width) ? d.width - padding.width : 0;
d.height = (d.height >= padding.height) ? d.height - padding.height : 0;
d = GetStringMultiLineBoundingBox(str, d);
d = GetStringMultiLineBoundingBox(str, d, fontsize);
d.width += padding.width;
d.height += padding.height;
size = maxdim(size, d);
@@ -513,7 +515,7 @@ struct NewsWindow : Window {
case WID_N_MESSAGE:
case WID_N_COMPANY_MSG:
DrawStringMultiLine(r, this->ni->headline.GetDecodedString(), TC_FROMSTRING, SA_CENTER);
DrawStringMultiLine(r, this->ni->headline.GetDecodedString(), TC_BLACK, SA_CENTER, false, FS_LARGE);
break;
case WID_N_MGR_FACE: {
@@ -957,7 +959,7 @@ CommandCost CmdCustomNewsItem(DoCommandFlags flags, NewsType type, CompanyID com
if (company != INVALID_OWNER && company != _local_company) return CommandCost();
if (flags.Test(DoCommandFlag::Execute)) {
AddNewsItem(GetEncodedString(STR_NEWS_CUSTOM_ITEM, text.GetDecodedString()), type, NewsStyle::Normal, {}, reference, {});
AddNewsItem(EncodedString{text}, type, NewsStyle::Normal, {}, reference, {});
}
return CommandCost();