From 9aca7ed2b4bc78092b5b61278405166b9653f9b1 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 2 Jun 2024 16:30:00 +0100 Subject: [PATCH] Fix logging of game load times in crash and desync logs --- src/crashlog.cpp | 4 ++-- src/event_logs.cpp | 3 ++- src/event_logs.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/crashlog.cpp b/src/crashlog.cpp index 0f94abc858..f553dd56ba 100644 --- a/src/crashlog.cpp +++ b/src/crashlog.cpp @@ -580,7 +580,7 @@ char *CrashLog::FillCrashLog(char *buffer, const char *last) buffer += seprintf(buffer, last, "In game date: %i-%02i-%02i (%i, %i) (DL: %u)\n", EconTime::CurYear().base(), EconTime::CurMonth() + 1, EconTime::CurDay(), EconTime::CurDateFract(), TickSkipCounter(), DayLengthFactor()); buffer += seprintf(buffer, last, "Calendar date: %i-%02i-%02i (%i, %i)\n", CalTime::CurYear().base(), CalTime::CurMonth() + 1, CalTime::CurDay(), CalTime::CurDateFract(), CalTime::CurSubDateFract()); - LogGameLoadDateTimes(buffer, last); + buffer = LogGameLoadDateTimes(buffer, last); return buffer; }); @@ -683,7 +683,7 @@ static char *LogDesyncDateHeader(char *buffer, const char *last) buffer += seprintf(buffer, last, "In game date: %i-%02i-%02i (%i, %i) (DL: %u), %08X\n", EconTime::CurYear().base(), EconTime::CurMonth() + 1, EconTime::CurDay(), EconTime::CurDateFract(), TickSkipCounter(), DayLengthFactor(), _frame_counter); buffer += seprintf(buffer, last, "Calendar date: %i-%02i-%02i (%i, %i)\n", CalTime::CurYear().base(), CalTime::CurMonth() + 1, CalTime::CurDay(), CalTime::CurDateFract(), CalTime::CurSubDateFract()); - LogGameLoadDateTimes(buffer, last); + buffer = LogGameLoadDateTimes(buffer, last); if (_networking && !_network_server) { extern EconTime::Date _last_sync_date; extern EconTime::DateFract _last_sync_date_fract; diff --git a/src/event_logs.cpp b/src/event_logs.cpp index d52bd9cd6e..24f7afb183 100644 --- a/src/event_logs.cpp +++ b/src/event_logs.cpp @@ -108,7 +108,7 @@ void ClearSpecialEventsLog() _special_event_log.Reset(); } -void LogGameLoadDateTimes(char *buffer, const char *last) +char *LogGameLoadDateTimes(char *buffer, const char *last) { if (_game_load_time != 0) { buffer += seprintf(buffer, last, "Game loaded at: %i-%02i-%02i (%i, %i), (" OTTD_PRINTF64 " state ticks ago), ", @@ -117,4 +117,5 @@ void LogGameLoadDateTimes(char *buffer, const char *last) buffer += UTCTime::Format(buffer, last, _game_load_time, "%Y-%m-%d %H:%M:%S"); buffer += seprintf(buffer, last, "\n"); } + return buffer; } diff --git a/src/event_logs.h b/src/event_logs.h index c8ccac1ccf..1b6cfafe5b 100644 --- a/src/event_logs.h +++ b/src/event_logs.h @@ -49,6 +49,6 @@ void AppendSpecialEventsLogEntry(std::string message); char *DumpSpecialEventsLog(char *buffer, const char *last); void ClearSpecialEventsLog(); -void LogGameLoadDateTimes(char *buffer, const char *last); +char *LogGameLoadDateTimes(char *buffer, const char *last); #endif /* EVENT_LOGS_H */