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

Merge branch 'crashlog_improvements' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-06-22 19:33:52 +01:00
parent f3dde49ff8 3271d69bda
commit 38b446ee0f
5 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/crashlog.cpp
View File

@@ -352,6 +352,14 @@ char *CrashLog::FillCrashLog(char *buffer, const char *last) const
{
time_t cur_time = time(NULL);
buffer += seprintf(buffer, last, "*** OpenTTD Crash Report ***\n\n");
if (GamelogTestEmergency()) {
buffer += seprintf(buffer, last, "-=-=- As you loaded an emergency savegame no crash information would ordinarily be generated. -=-=-\n\n");
}
if (SaveloadCrashWithMissingNewGRFs()) {
buffer += seprintf(buffer, last, "-=-=- As you loaded a savegame for which you do not have the required NewGRFs no crash information would ordinarily be generated. -=-=-\n\n");
}
buffer += seprintf(buffer, last, "Crash at: %s", asctime(gmtime(&cur_time)));
YearMonthDay ymd;
@@ -536,6 +544,22 @@ bool CrashLog::MakeCrashLog() const
if (VideoDriver::GetInstance() != NULL) VideoDriver::GetInstance()->Stop();
}
/* static */ const char *CrashLog::GetAbortCrashlogReason()
{
if (_settings_client.gui.developer > 0) return NULL;
if (GamelogTestEmergency()) {
return "As you loaded an emergency savegame no crash information will be generated.\n";
}
if (SaveloadCrashWithMissingNewGRFs()) {
return "As you loaded an savegame for which you do not have the required NewGRFs\n" \
"no crash information will be generated.\n";
}
return NULL;
}
#if defined(WITH_BFD)
sym_info_bfd::sym_info_bfd(bfd_vma addr_) : addr(addr_), abfd(NULL), syms(NULL), sym_count(0),
file_name(NULL), function_name(NULL), function_addr(0), line(0), found(false) {}