diff options
author | rubidium <rubidium@openttd.org> | 2008-12-22 21:26:26 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-12-22 21:26:26 +0000 |
commit | dbb2950e831c1c2dca33eba1f600ef7c68a69fcd (patch) | |
tree | b491caf9bf4a134ae72e13337a00c518804cd8b6 | |
parent | 8e8174987230eb298b1b86a225f3c6a175b86751 (diff) | |
download | openttd-dbb2950e831c1c2dca33eba1f600ef7c68a69fcd.tar.xz |
(svn r14716) -Codechange: move more network core querying to the network files.
-rw-r--r-- | src/console_cmds.cpp | 9 | ||||
-rw-r--r-- | src/network/network_client.cpp | 15 | ||||
-rw-r--r-- | src/network/network_func.h | 1 |
3 files changed, 17 insertions, 8 deletions
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index 6c362d51f..33bc681d4 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -638,19 +638,12 @@ DEF_CONSOLE_CMD(ConResetCompany) DEF_CONSOLE_CMD(ConNetworkClients) { - NetworkClientInfo *ci; - if (argc == 0) { IConsoleHelp("Get a list of connected clients including their ID, name, company-id, and IP. Usage: 'clients'"); return true; } - FOR_ALL_ACTIVE_CLIENT_INFOS(ci) { - IConsolePrintF(CC_INFO, "Client #%1d name: '%s' company: %1d IP: %s", - ci->client_id, ci->client_name, - ci->client_playas + (IsValidCompanyID(ci->client_playas) ? 1 : 0), - GetClientIP(ci)); - } + NetworkPrintClients(); return true; } diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 1ef35508b..6f14efd80 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -974,4 +974,19 @@ bool NetworkClientPreferTeamChat(const NetworkClientInfo *cio) return false; } +/** + * Print all the clients to the console + */ +void NetworkPrintClients() +{ + NetworkClientInfo *ci; + FOR_ALL_ACTIVE_CLIENT_INFOS(ci) { + IConsolePrintF(CC_INFO, "Client #%1d name: '%s' company: %1d IP: %s", + ci->client_id, + ci->client_name, + ci->client_playas + (IsValidCompanyID(ci->client_playas) ? 1 : 0), + GetClientIP(ci)); + } +} + #endif /* ENABLE_NETWORK */ diff --git a/src/network/network_func.h b/src/network/network_func.h index 9d45035b7..e79d7926f 100644 --- a/src/network/network_func.h +++ b/src/network/network_func.h @@ -42,6 +42,7 @@ void NetworkClientSendRcon(const char *password, const char *command); void NetworkClientSendChat(NetworkAction action, DestType type, int dest, const char *msg); void NetworkClientSetPassword(const char *password); bool NetworkClientPreferTeamChat(const NetworkClientInfo *cio); +void NetworkPrintClients(); /*** Commands ran by the server ***/ void NetworkServerMonthlyLoop(); |