Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/release-macos.yml
#	src/company_gui.cpp
#	src/linkgraph/linkgraph.cpp
#	src/newgrf_debug_gui.cpp
#	src/strgen/strgen_base.cpp
#	src/timetable_gui.cpp
This commit is contained in:
Jonathan G Rennison
2023-05-28 10:20:03 +01:00
146 changed files with 393 additions and 363 deletions

View File

@@ -9,6 +9,7 @@
#include "stdafx.h"
#include "fileio_func.h"
#include "debug.h"
#include <string>
std::string _log_file; ///< File to reroute output of a forked OpenTTD to
@@ -59,8 +60,8 @@ void DedicatedFork()
default:
/* We're the parent */
printf("Loading dedicated server...\n");
printf(" - Forked to background with pid " PRINTF_PID_T "\n", pid);
DEBUG(net, 0, "Loading dedicated server...\n");
DEBUG(net, 0, " - Forked to background with pid " PRINTF_PID_T "\n", pid);
exit(0);
}
}