Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/command.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/economy.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/misc_gui.cpp
#	src/newgrf_config.cpp
#	src/openttd.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/table/settings/gui_settings.ini
This commit is contained in:
Jonathan G Rennison
2022-05-15 13:54:13 +01:00
121 changed files with 2287 additions and 1592 deletions

View File

@@ -68,6 +68,10 @@ const char *VideoDriver_SDL_OpenGL::Start(const StringList &param)
return error;
}
this->driver_info += " (";
this->driver_info += OpenGLBackend::Get()->GetDriverName();
this->driver_info += ")";
/* Now we have a OpenGL context, force a client-size-changed event,
* so all buffers are allocated correctly. */
int w, h;