Fix logging of game load times in crash and desync logs

pull/702/head
Jonathan G Rennison 2 weeks ago
parent 05915b2129
commit 9aca7ed2b4

@ -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;

@ -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;
}

@ -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 */

Loading…
Cancel
Save