Merge branch 'master' into jgrpp
# Conflicts: # src/build_vehicle_gui.cpp # src/cheat_gui.cpp # src/console_cmds.cpp # src/crashlog.cpp # src/date_gui.cpp # src/engine.cpp # src/group_cmd.cpp # src/landscape.cpp # src/network/network_gui.cpp # src/newgrf.cpp # src/saveload/afterload.cpp # src/script/api/script_date.cpp # src/sl/oldloader_sl.cpp # src/station_cmd.cpp # src/station_cmd.h # src/strings.cpp # src/subsidy_gui.cpp # src/survey.cpp # src/timer/timer_game_calendar.cpp # src/timer/timer_game_calendar.h
This commit is contained in:
@@ -665,8 +665,7 @@ static void DumpSubCommandLogEntry(char *&buffer, const char *last, const Comman
|
||||
return (entry.log_flags & CLEF_SCRIPT_ASYNC) ? 'A' : 'a';
|
||||
};
|
||||
|
||||
YearMonthDay ymd;
|
||||
ConvertDateToYMD(entry.date, &ymd);
|
||||
YearMonthDay ymd = ConvertDateToYMD(entry.date);
|
||||
buffer += seprintf(buffer, last, "%4i-%02i-%02i, %2i, %3i", ymd.year, ymd.month + 1, ymd.day, entry.date_fract, entry.tick_skip_counter);
|
||||
if (_networking) {
|
||||
buffer += seprintf(buffer, last, ", %08X", entry.frame_counter);
|
||||
|
Reference in New Issue
Block a user