mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-19 04:29:09 +00:00
Code Issues Activity

(svn r11811) -Fix: make compilation without networking work again (and thus move the debugdumpcommand stuff out of the network 'area').

Browse Source
This commit is contained in:
rubidium
2008-01-11 00:30:32 +00:00
parent e5d33482b4
commit 04f936c2c6
12 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/network/network.cpp
View File

@@ -34,7 +34,7 @@ extern const char _openttd_revision[];
#include "../string_func.h"
#ifdef DEBUG_DUMP_COMMANDS
#include "../core/alloc_func.hpp"
#endif
#endif /* DEBUG_DUMP_COMMANDS */
/* Check whether NETWORK_NUM_LANDSCAPES is still in sync with NUM_LANDSCAPE */
assert_compile((int)NETWORK_NUM_LANDSCAPES == (int)NUM_LANDSCAPE);
@@ -193,9 +193,7 @@ void CDECL NetworkTextMessage(NetworkAction action, uint16 color, bool self_send
break;
}
#ifdef DEBUG_DUMP_COMMANDS
debug_dump_commands("ddc:cmsg:%d;%d;%s\n", _date, _date_fract, message);
#endif /* DUMP_COMMANDS */
DebugDumpCommands("ddc:cmsg:%d;%d;%s\n", _date, _date_fract, message);
IConsolePrintF(color, "%s", message);
AddChatMessage(color, duration, "%s", message);
}
@@ -1236,9 +1234,7 @@ static bool NetworkDoClientLoop()
if (_sync_seed_1 != _random_seeds[0][0]) {
#endif
NetworkError(STR_NETWORK_ERR_DESYNC);
#ifdef DEBUG_DUMP_COMMANDS
debug_dump_commands("ddc:serr:%d;%d\n", _date, _date_fract);
#endif /* DUMP_COMMANDS */
DebugDumpCommands("ddc:serr:%d;%d\n", _date, _date_fract);
DEBUG(net, 0, "Sync error detected!");
NetworkClientError(NETWORK_RECV_STATUS_DESYNC, DEREF_CLIENT(0));
return false;
@@ -1313,7 +1309,7 @@ void NetworkGameLoop()
sscanf(&buff[8], "%d;%d;%d;%d;%d;%d;%d;%s", &next_date, &next_date_fract, &player, &cp->tile, &cp->p1, &cp->p2, &cp->cmd, cp->text);
cp->player = (Owner)player;
}
#endif /* DUMP_COMMANDS */
#endif /* DEBUG_DUMP_COMMANDS */
bool send_frame = false;
@@ -1467,18 +1463,4 @@ bool IsNetworkCompatibleVersion(const char *other)
return strncmp(_openttd_revision, other, NETWORK_REVISION_LENGTH - 1) == 0;
}
#ifdef DEBUG_DUMP_COMMANDS
void CDECL debug_dump_commands(const char *s, ...)
{
static FILE *f = FioFOpenFile("commands-out.log", "wb", AUTOSAVE_DIR);
if (f == NULL) return;
va_list va;
va_start(va, s);
vfprintf(f, s, va);
va_end(va);
fflush(f);
}
#endif /* DEBUG_DUMP_COMMANDS */
#endif /* ENABLE_NETWORK */

11
src/network/network.h
View File

@@ -18,17 +18,6 @@
// nothing will happen.
//#define ENABLE_NETWORK_SYNC_EVERY_FRAME
/*
* Dumps all commands that are sent/received to stderr and saves every month.
* This log can become quite large over time; say in the order of two to three
* times the bandwidth used for network games.
*/
//#define DEBUG_DUMP_COMMANDS
#ifdef DEBUG_DUMP_COMMANDS
void CDECL debug_dump_commands(const char *s, ...);
#endif /* DEBUG_DUMP_COMMANDS */
// In theory sending 1 of the 2 seeds is enough to check for desyncs
// so in theory, this next define can be left off.
//#define NETWORK_SEND_DOUBLE_SEED

7
src/network/network_data.cpp
View File

@@ -10,6 +10,7 @@
#include "../callback_table.h"
#include "../core/alloc_func.hpp"
#include "../string_func.h"
#include "../date_func.h"
// Add a command to the local command queue
void NetworkAddCommandQueue(NetworkTCPSocketHandler *cs, CommandPacket *cp)
@@ -99,11 +100,7 @@ void NetworkExecuteCommand(CommandPacket *cp)
cp->callback = 0;
}
#ifdef DEBUG_DUMP_COMMANDS
extern Date _date;
extern DateFract _date_fract;
debug_dump_commands("ddc:cmd:%d;%d;%d;%d;%d;%d;%d;%s\n", _date, _date_fract, (int)cp->player, cp->tile, cp->p1, cp->p2, cp->cmd, cp->text);
#endif /* DUMP_COMMANDS */
DebugDumpCommands("ddc:cmd:%d;%d;%d;%d;%d;%d;%d;%s\n", _date, _date_fract, (int)cp->player, cp->tile, cp->p1, cp->p2, cp->cmd, cp->text);
DoCommandP(cp->tile, cp->p1, cp->p2, _callback_table[cp->callback], cp->cmd | CMD_NETWORK_COMMAND, cp->my_cmd);
}