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

(svn r14722) -Codechange: s/DEREF_CLIENT/GetNetworkClientSocket/

release/0.7
rubidium 2008-12-23 10:42:06 +00:00
parent ae96ca635c
commit d501a20065
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/network.cpp
View File

@ -318,7 +318,7 @@ static void NetworkClientError(NetworkRecvStatus res, NetworkClientSocket* cs)
SEND_COMMAND(PACKET_CLIENT_ERROR)(errorno); SEND_COMMAND(PACKET_CLIENT_ERROR)(errorno);
// Dequeue all commands before closing the socket // Dequeue all commands before closing the socket
DEREF_CLIENT(0)->Send_Packets(); GetNetworkClientSocket(0)->Send_Packets();
} }
_switch_mode = SM_MENU; _switch_mode = SM_MENU;
@ -431,7 +431,7 @@ static NetworkClientSocket *NetworkAllocClient(SOCKET s)
client_no = _network_clients_connected++; client_no = _network_clients_connected++;
} }
cs = DEREF_CLIENT(client_no); cs = GetNetworkClientSocket(client_no);
cs->Initialize(); cs->Initialize();
cs->sock = s; cs->sock = s;
cs->last_frame = _frame_counter; cs->last_frame = _frame_counter;
@ -501,7 +501,7 @@ void NetworkCloseClient(NetworkClientSocket *cs)
if (cs->status >= STATUS_AUTH) _network_game_info.clients_on--; if (cs->status >= STATUS_AUTH) _network_game_info.clients_on--;
_network_clients_connected--; _network_clients_connected--;
while ((cs + 1) != DEREF_CLIENT(MAX_CLIENTS) && (cs + 1)->sock != INVALID_SOCKET) { while ((cs + 1) != GetNetworkClientSocket(MAX_CLIENTS) && (cs + 1)->sock != INVALID_SOCKET) {
*cs = *(cs + 1); *cs = *(cs + 1);
*ci = *(ci + 1); *ci = *(ci + 1);
cs++; cs++;
@ -1043,7 +1043,7 @@ static bool NetworkDoClientLoop()
NetworkError(STR_NETWORK_ERR_DESYNC); NetworkError(STR_NETWORK_ERR_DESYNC);
DebugDumpCommands("ddc:serr:%d;%d\n", _date, _date_fract); DebugDumpCommands("ddc:serr:%d;%d\n", _date, _date_fract);
DEBUG(net, 0, "Sync error detected!"); DEBUG(net, 0, "Sync error detected!");
NetworkClientError(NETWORK_RECV_STATUS_DESYNC, DEREF_CLIENT(0)); NetworkClientError(NETWORK_RECV_STATUS_DESYNC, GetNetworkClientSocket(0));
return false; return false;
} }

2
src/network/network_client.cpp
View File

@ -34,7 +34,7 @@
// So we don't make too much typos ;) // So we don't make too much typos ;)
#define MY_CLIENT DEREF_CLIENT(0) #define MY_CLIENT GetNetworkClientSocket(0)
static uint32 last_ack_frame; static uint32 last_ack_frame;

4
src/network/network_gui.cpp
View File

@ -1431,7 +1431,7 @@ static const NetworkClientInfo *NetworkFindClientInfo(byte client_no)
static void ClientList_Kick(byte client_no) static void ClientList_Kick(byte client_no)
{ {
if (client_no < MAX_CLIENTS) { if (client_no < MAX_CLIENTS) {
SEND_COMMAND(PACKET_SERVER_ERROR)(DEREF_CLIENT(client_no), NETWORK_ERROR_KICKED); SEND_COMMAND(PACKET_SERVER_ERROR)(GetNetworkClientSocket(client_no), NETWORK_ERROR_KICKED);
} }
} }
@ -1447,7 +1447,7 @@ static void ClientList_Ban(byte client_no)
} }
if (client_no < MAX_CLIENTS) { if (client_no < MAX_CLIENTS) {
SEND_COMMAND(PACKET_SERVER_ERROR)(DEREF_CLIENT(client_no), NETWORK_ERROR_KICKED); SEND_COMMAND(PACKET_SERVER_ERROR)(GetNetworkClientSocket(client_no), NETWORK_ERROR_KICKED);
} }
} }

2
src/network/network_internal.h
View File

@ -148,7 +148,7 @@ NetworkClientSocket *NetworkFindClientStateFromClientID(ClientID client_id);
char* GetNetworkErrorMsg(char* buf, NetworkErrorCode err, const char* last); char* GetNetworkErrorMsg(char* buf, NetworkErrorCode err, const char* last);
bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH]); bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH]);
#define DEREF_CLIENT(i) (&_clients[i]) #define GetNetworkClientSocket(i) (&_clients[i])
// Macros to make life a bit more easier // Macros to make life a bit more easier
#define DEF_CLIENT_RECEIVE_COMMAND(type) NetworkRecvStatus NetworkPacketReceive_ ## type ## _command(Packet *p) #define DEF_CLIENT_RECEIVE_COMMAND(type) NetworkRecvStatus NetworkPacketReceive_ ## type ## _command(Packet *p)