Merge tag '1.10.2'

This commit is contained in:
pelya
2020-06-02 22:42:26 +03:00
120 changed files with 555 additions and 273 deletions

View File

@@ -26,6 +26,7 @@
#include "zoom_func.h"
#include "guitimer_func.h"
#include "build_confirmation_func.h"
#include "rev.h"
#include "widgets/misc_widget.h"
@@ -406,7 +407,7 @@ static const NWidgetPart _nested_about_widgets[] = {
NWidget(WWT_EMPTY, INVALID_COLOUR, WID_A_SCROLLING_TEXT),
EndContainer(),
NWidget(WWT_LABEL, COLOUR_GREY, WID_A_WEBSITE), SetDataTip(STR_BLACK_RAW_STRING, STR_NULL),
NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_ABOUT_COPYRIGHT_OPENTTD, STR_NULL),
NWidget(WWT_LABEL, COLOUR_GREY, WID_A_COPYRIGHT), SetDataTip(STR_ABOUT_COPYRIGHT_OPENTTD, STR_NULL),
EndContainer(),
};
@@ -502,6 +503,7 @@ struct AboutWindow : public Window {
void SetStringParameters(int widget) const override
{
if (widget == WID_A_WEBSITE) SetDParamStr(0, "Website: http://www.openttd.org");
if (widget == WID_A_COPYRIGHT) SetDParamStr(0, _openttd_revision_year);
}
void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override