diff options
author | rubidium <rubidium@openttd.org> | 2009-01-20 01:32:06 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-01-20 01:32:06 +0000 |
commit | 5f3772a42c322a99d2ea57b6c97b76fceccbb781 (patch) | |
tree | f14ce239c04d4b6e3d7f4dbe6723e777a42cc03f /src/network/network_gui.cpp | |
parent | 6e1af6a051b5129c0703dd654794427094d672c8 (diff) | |
download | openttd-5f3772a42c322a99d2ea57b6c97b76fceccbb781.tar.xz |
(svn r15157) -Codechange: wrap the hostname/ip and port into a single structure so we can pass either one of them and not convert an ip to a string and then back again.
Diffstat (limited to 'src/network/network_gui.cpp')
-rw-r--r-- | src/network/network_gui.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index f9b0b7cc9..7209e8145 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -558,7 +558,7 @@ public: break; case NGWW_REFRESH: // Refresh - if (this->server != NULL) NetworkUDPQueryServer(this->server->info.hostname, this->server->port); + if (this->server != NULL) NetworkUDPQueryServer(NetworkAddress(this->server->info.hostname, this->server->port)); break; case NGWW_NEWGRF: // NewGRF Settings @@ -1313,22 +1313,22 @@ struct NetworkLobbyWindow : public Window { case NLWW_JOIN: // Join company /* Button can be clicked only when it is enabled */ _network_playas = this->company; - NetworkClientConnectGame(_settings_client.network.last_host, _settings_client.network.last_port); + NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); break; case NLWW_NEW: // New company _network_playas = COMPANY_NEW_COMPANY; - NetworkClientConnectGame(_settings_client.network.last_host, _settings_client.network.last_port); + NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); break; case NLWW_SPECTATE: // Spectate game _network_playas = COMPANY_SPECTATOR; - NetworkClientConnectGame(_settings_client.network.last_host, _settings_client.network.last_port); + NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); break; case NLWW_REFRESH: // Refresh - NetworkTCPQueryServer(_settings_client.network.last_host, _settings_client.network.last_port); // company info - NetworkUDPQueryServer(_settings_client.network.last_host, _settings_client.network.last_port); // general data + NetworkTCPQueryServer(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); // company info + NetworkUDPQueryServer(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); // general data /* Clear the information so removed companies don't remain */ memset(this->company_info, 0, sizeof(company_info)); break; @@ -1381,8 +1381,8 @@ static void ShowNetworkLobbyWindow(NetworkGameList *ngl) { DeleteWindowById(WC_NETWORK_WINDOW, 0); - NetworkTCPQueryServer(_settings_client.network.last_host, _settings_client.network.last_port); // company info - NetworkUDPQueryServer(_settings_client.network.last_host, _settings_client.network.last_port); // general data + NetworkTCPQueryServer(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); // company info + NetworkUDPQueryServer(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); // general data new NetworkLobbyWindow(&_network_lobby_window_desc, ngl); } |