dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
This commit is contained in:
Jonathan G Rennison
2021-02-19 15:38:34 +00:00
parent bebe3acaa8 cb8e1706b2
commit e95216b59d
176 changed files with 4275 additions and 3826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc_gui.cpp
View File

@@ -552,7 +552,7 @@ struct AboutWindow : public Window {
void SetStringParameters(int widget) const override
{
if (widget == WID_A_WEBSITE) SetDParamStr(0, "Main project website: http://www.openttd.org");
if (widget == WID_A_WEBSITE) SetDParamStr(0, "Main project website: https://www.openttd.org");
if (widget == WID_A_WEBSITE1) SetDParamStr(0, "Patchpack thread: https://www.tt-forums.net/viewtopic.php?f=33&t=73469");
if (widget == WID_A_WEBSITE2) SetDParamStr(0, "Patchpack Github: https://github.com/JGRennison/OpenTTD-patches");
if (widget == WID_A_COPYRIGHT) SetDParamStr(0, _openttd_revision_year);