diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-19 21:20:14 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-19 21:20:14 +0000 |
| commit | 9f4d64bda06a449e2b1c528e342be5bb12a1623b (patch) | |
| tree | c7ae21e8a883df20254134a0e155ef468c61fef8 /src/network/network_gui.cpp | |
| parent | 00bc2659f24b07851291d56d170174ed27581bc7 (diff) | |
| download | openttd-9f4d64bda06a449e2b1c528e342be5bb12a1623b.tar.xz | |
(svn r16360) -Codechange: don't use _network_playas as a 'second' _local_company, but only as a storage location for the company you want to join in MP.
Diffstat (limited to 'src/network/network_gui.cpp')
| -rw-r--r-- | src/network/network_gui.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 23cdec35d..b60192ef5 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -23,6 +23,7 @@ #include "../querystring_gui.h" #include "../sortlist_type.h" #include "../company_base.h" +#include "../company_func.h" #include "table/strings.h" #include "../table/sprites.h" @@ -1534,18 +1535,15 @@ struct NetworkLobbyWindow : public Window { case NLWW_JOIN: // Join company /* Button can be clicked only when it is enabled */ - _network_playas = this->company; - NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); + NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port), this->company); break; case NLWW_NEW: // New company - _network_playas = COMPANY_NEW_COMPANY; - NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); + NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port), COMPANY_NEW_COMPANY); break; case NLWW_SPECTATE: // Spectate game - _network_playas = COMPANY_SPECTATOR; - NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); + NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port), COMPANY_SPECTATOR); break; case NLWW_REFRESH: // Refresh @@ -1817,7 +1815,7 @@ struct NetworkClientListPopupWindow : Window { if (_network_own_client_id != ci->client_id) { /* We are no spectator and the company we want to give money to is no spectator and money gifts are allowed */ - if (Company::IsValidID(_network_playas) && Company::IsValidID(ci->client_playas) && _settings_game.economy.give_money) { + if (Company::IsValidID(_local_company) && Company::IsValidID(ci->client_playas) && _settings_game.economy.give_money) { GetString(this->action[i], STR_NETWORK_CLIENTLIST_GIVE_MONEY, lastof(this->action[i])); this->proc[i++] = &ClientList_GiveMoney; } |