mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-06 22:28:56 +00:00
(svn r1747) - Fix: [network] ottd should compile when networking is disabled.
- Change: change strgen project file to get rid of warning.
This commit is contained in:
parent
f4ffba1a6e
commit
4cc0952736
18
console.c
18
console.c
@ -232,7 +232,6 @@ extern const char _openttd_revision[];
|
||||
|
||||
void IConsoleInit(void)
|
||||
{
|
||||
uint i;
|
||||
_iconsole_output_file = NULL;
|
||||
_iconsole_color_default = 1;
|
||||
_iconsole_color_error = 3;
|
||||
@ -247,12 +246,15 @@ void IConsoleInit(void)
|
||||
_icursor_state = false;
|
||||
_icursor_rate = 5;
|
||||
_icursor_counter = 0;
|
||||
for (i = 0; i < lengthof(_iconsole_cmdbuffer); i++)
|
||||
_iconsole_cmdbuffer[i] = NULL;
|
||||
for (i = 0; i <= ICON_BUFFER; i++) {
|
||||
_iconsole_buffer[i] = NULL;
|
||||
_iconsole_cbuffer[i] = 0;
|
||||
}
|
||||
|
||||
#ifdef ENABLE_NETWORK /* Initialize network only variables */
|
||||
_redirect_console_to_client = 0;
|
||||
#endif
|
||||
|
||||
memset(_iconsole_cmdbuffer, 0, sizeof(_iconsole_cmdbuffer));
|
||||
memset(_iconsole_buffer, 0, sizeof(_iconsole_buffer));
|
||||
memset(_iconsole_cbuffer, 0, sizeof(_iconsole_cbuffer));
|
||||
|
||||
IConsoleStdLibRegister();
|
||||
IConsolePrintF(13, "OpenTTD Game Console Revision 6 - %s", _openttd_revision);
|
||||
IConsolePrint(12, "---------------------------------");
|
||||
@ -393,11 +395,13 @@ void IConsolePrint(uint16 color_code, const char* string)
|
||||
char* i;
|
||||
int j;
|
||||
|
||||
#ifdef ENABLE_NETWORK
|
||||
if (_redirect_console_to_client != 0) {
|
||||
/* Redirect the string to the client */
|
||||
SEND_COMMAND(PACKET_SERVER_RCON)(NetworkFindClientStateFromIndex(_redirect_console_to_client), color_code, string);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (_network_dedicated) {
|
||||
printf("%s\n", string);
|
||||
|
@ -87,8 +87,9 @@
|
||||
ObjectFile=".\Debug/"
|
||||
ProgramDataBaseFileName=".\Debug/"
|
||||
WarningLevel="3"
|
||||
WarnAsError="TRUE"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="4"/>
|
||||
DebugInformationFormat="3"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
|
2
ttd.c
2
ttd.c
@ -583,8 +583,6 @@ int ttd_main(int argc, char* argv[])
|
||||
_dedicated_forks = false;
|
||||
_dedicated_enabled = false;
|
||||
|
||||
_redirect_console_to_client = 0;
|
||||
|
||||
// The last param of the following function means this:
|
||||
// a letter means: it accepts that param (e.g.: -h)
|
||||
// a ':' behind it means: it need a param (e.g.: -m<driver>)
|
||||
|
Loading…
Reference in New Issue
Block a user