mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20548) -Codechange: rename some variables giving them slightly more meaningful names

release/1.1
rubidium 2010-08-18 21:30:38 +00:00
parent 926594b599
commit e8e22c99fd
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/core/tcp_game.h
View File

@ -122,7 +122,7 @@ public:
ClientStatus status; ///< Status of this client ClientStatus status; ///< Status of this client
CommandQueue command_queue; ///< The command-queue awaiting delivery CommandQueue outgoing_queue; ///< The command-queue awaiting delivery
NetworkRecvStatus CloseConnection(bool error = true); NetworkRecvStatus CloseConnection(bool error = true);

14
src/network/network_command.cpp
View File

@ -97,8 +97,8 @@ void CommandQueue::Free()
} }
/** Local queue of packets */ /** Local queue of packets waiting for execution. */
static CommandQueue _local_command_queue; static CommandQueue _local_execution_queue;
/** /**
* Add a command to the local or client socket command queue, * Add a command to the local or client socket command queue,
@ -110,7 +110,7 @@ void NetworkAddCommandQueue(CommandPacket cp, NetworkClientSocket *cs)
{ {
CommandPacket *new_cp = MallocT<CommandPacket>(1); CommandPacket *new_cp = MallocT<CommandPacket>(1);
*new_cp = cp; *new_cp = cp;
(cs == NULL ? _local_command_queue : cs->command_queue).Append(new_cp); (cs == NULL ? _local_execution_queue : cs->outgoing_queue).Append(new_cp);
} }
/** /**
@ -177,7 +177,7 @@ void NetworkSend_Command(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, Comma
*/ */
void NetworkSyncCommandQueue(NetworkClientSocket *cs) void NetworkSyncCommandQueue(NetworkClientSocket *cs)
{ {
for (CommandPacket *p = _local_command_queue.Peek(); p != NULL; p = p->next) { for (CommandPacket *p = _local_execution_queue.Peek(); p != NULL; p = p->next) {
CommandPacket c = *p; CommandPacket c = *p;
c.callback = 0; c.callback = 0;
c.next = NULL; c.next = NULL;
@ -193,7 +193,7 @@ void NetworkExecuteLocalCommandQueue()
assert(IsLocalCompany()); assert(IsLocalCompany());
CommandPacket *cp; CommandPacket *cp;
while ((cp = _local_command_queue.Peek()) != NULL) { while ((cp = _local_execution_queue.Peek()) != NULL) {
/* The queue is always in order, which means /* The queue is always in order, which means
* that the first element will be executed first. */ * that the first element will be executed first. */
if (_frame_counter < cp->frame) break; if (_frame_counter < cp->frame) break;
@ -209,7 +209,7 @@ void NetworkExecuteLocalCommandQueue()
cp->cmd |= CMD_NETWORK_COMMAND; cp->cmd |= CMD_NETWORK_COMMAND;
DoCommandP(cp, cp->my_cmd); DoCommandP(cp, cp->my_cmd);
_local_command_queue.Pop(); _local_execution_queue.Pop();
free(cp); free(cp);
} }
@ -222,7 +222,7 @@ void NetworkExecuteLocalCommandQueue()
*/ */
void NetworkFreeLocalCommandQueue() void NetworkFreeLocalCommandQueue()
{ {
_local_command_queue.Free(); _local_execution_queue.Free();
} }
/** /**

2
src/network/network_server.cpp
View File

@ -1612,7 +1612,7 @@ void NetworkServer_ReadPackets(NetworkClientSocket *cs)
static void NetworkHandleCommandQueue(NetworkClientSocket *cs) static void NetworkHandleCommandQueue(NetworkClientSocket *cs)
{ {
CommandPacket *cp; CommandPacket *cp;
while ((cp = cs->command_queue.Pop()) != NULL) { while ((cp = cs->outgoing_queue.Pop()) != NULL) {
SEND_COMMAND(PACKET_SERVER_COMMAND)(cs, cp); SEND_COMMAND(PACKET_SERVER_COMMAND)(cs, cp);
free(cp); free(cp);
} }