Merge branch 'master' into jgrpp

# Conflicts:
#	src/debug.cpp
#	src/lang/russian.txt
#	src/misc_gui.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/rail_cmd.cpp
#	src/window_gui.h
This commit is contained in:
Jonathan G Rennison
2021-04-11 03:05:08 +01:00
52 changed files with 439 additions and 267 deletions

View File

@@ -183,8 +183,8 @@ static void debug_print(const char *dbg, const char *buf)
#if defined(_WIN32)
if (strcmp(dbg, "desync") != 0) {
wchar_t system_buf[512];
convert_to_fs(buffer, system_buf, lengthof(system_buf), true);
_fputts(system_buf, stderr);
convert_to_fs(buffer, system_buf, lengthof(system_buf));
fputws(system_buf, stderr);
}
#else
fputs(buffer, stderr);