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

Merge branch 'save_ext' into jgrpp

Browse Source 
# Conflicts:
#	src/debug.cpp
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2018-06-01 23:32:33 +01:00
parent 4007338280 decd749d30
commit 03b0931c57
16 changed files with 1227 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/debug.cpp
View File

@@ -17,6 +17,10 @@
#include "fileio_func.h"
#include "settings_type.h"
#if defined(WIN32) || defined(WIN64)
#include "os/windows/win32.h"
#endif
#include <time.h>
#if defined(ENABLE_NETWORK)
@@ -176,7 +180,11 @@ static void debug_print(const char *dbg, const char *buf)
* not seem able to handle text direction change characters in a console without
* crashing, and NetworkTextMessage includes these */
#if defined(WIN32) || defined(WIN64)
if (strcmp(dbg, "desync") != 0) _fputts(OTTD2FS(buffer, true), stderr);
if (strcmp(dbg, "desync") != 0) {
TCHAR system_buf[512];
convert_to_fs(buffer, system_buf, lengthof(system_buf), true);
_fputts(system_buf, stderr);
}
#else
fputs(buffer, stderr);
#endif