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

Merge branch 'jgrpp' into jgrpp-beta

Browse Source 
# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini
This commit is contained in:
Jonathan G Rennison
2021-10-08 18:12:04 +01:00
parent fd605e3cf3 32571a0ccd
commit 4042480806
66 changed files with 1239 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/os/windows/crashlog_win.cpp
View File

@@ -758,6 +758,12 @@ static void CDECL CustomAbort(int signal)
log.MakeDesyncCrashLog(log_in, log_out, info);
}
/* static */ void CrashLog::InconsistencyLog(const InconsistencyExtraInfo &info)
{
CrashLogWindows log(nullptr);
log.MakeInconsistencyLog(info);
}
/* static */ void CrashLog::VersionInfoLog()
{
CrashLogWindows log(nullptr);