diff options
author | rubidium <rubidium@openttd.org> | 2007-02-02 21:04:50 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-02-02 21:04:50 +0000 |
commit | 6a820a30d1eaa1be688e392ec42f074859ccc10b (patch) | |
tree | 6afcca18aefaacfe113a8dc1b2d985a26e852f12 /src/network/network.cpp | |
parent | 07b9d95c3c35a2df32aae161d819c24035454956 (diff) | |
download | openttd-6a820a30d1eaa1be688e392ec42f074859ccc10b.tar.xz |
(svn r8543) -Codechange: make a real difference between querying the server via UDP and TCP.
Diffstat (limited to 'src/network/network.cpp')
-rw-r--r-- | src/network/network.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/network/network.cpp b/src/network/network.cpp index cfeef9ed1..76a29f3af 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -851,14 +851,12 @@ static void NetworkInitialize(void) // Query a server to fetch his game-info // If game_info is true, only the gameinfo is fetched, // else only the client_info is fetched -NetworkGameList *NetworkQueryServer(const char* host, unsigned short port, bool game_info) +void NetworkTCPQueryServer(const char* host, unsigned short port) { - if (!_network_available) return NULL; + if (!_network_available) return; NetworkDisconnect(); - if (game_info) return NetworkUDPQueryServer(host, port); - NetworkInitialize(); _network_server = false; @@ -872,8 +870,6 @@ NetworkGameList *NetworkQueryServer(const char* host, unsigned short port, bool } else { // No networking, close everything down again NetworkDisconnect(); } - - return NULL; } /* Validates an address entered as a string and adds the server to @@ -882,7 +878,6 @@ NetworkGameList *NetworkQueryServer(const char* host, unsigned short port, bool void NetworkAddServer(const char *b) { if (*b != '\0') { - NetworkGameList *item; const char *port = NULL; const char *player = NULL; char host[NETWORK_HOSTNAME_LENGTH]; @@ -896,8 +891,7 @@ void NetworkAddServer(const char *b) ParseConnectionString(&player, &port, host); if (port != NULL) rport = atoi(port); - item = NetworkQueryServer(host, rport, true); - item->manually = true; + NetworkUDPQueryServer(host, rport, true); } } |