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

(svn r24070) -Fix [FS#5098]: the 'last joined' server was not properly selected anymore (adf88)

release/1.3
rubidium 2012-03-25 19:46:59 +00:00
parent f2f939906e
commit 1adb9a5c85
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/network_gamelist.cpp
View File

@ -62,7 +62,7 @@ static void NetworkGameListHandleDelayedInsert()
} }
item->manually |= ins_item->manually; item->manually |= ins_item->manually;
if (item->manually) NetworkRebuildHostList(); if (item->manually) NetworkRebuildHostList();
UpdateNetworkGameWindow(false); UpdateNetworkGameWindow();
} }
free(ins_item); free(ins_item);
} }
@ -105,7 +105,7 @@ NetworkGameList *NetworkGameListAddItem(NetworkAddress address)
} }
DEBUG(net, 4, "[gamelist] added server to list"); DEBUG(net, 4, "[gamelist] added server to list");
UpdateNetworkGameWindow(false); UpdateNetworkGameWindow();
return item; return item;
} }
@ -132,7 +132,7 @@ void NetworkGameListRemoveItem(NetworkGameList *remove)
DEBUG(net, 4, "[gamelist] removed server from list"); DEBUG(net, 4, "[gamelist] removed server from list");
NetworkRebuildHostList(); NetworkRebuildHostList();
UpdateNetworkGameWindow(false); UpdateNetworkGameWindow();
return; return;
} }
prev_item = item; prev_item = item;

13
src/network/network_gui.cpp
View File

@ -72,9 +72,9 @@ void SortNetworkLanguages()
* found on the network. * found on the network.
* @param unselect unselect the currently selected item * @param unselect unselect the currently selected item
*/ */
void UpdateNetworkGameWindow(bool unselect) void UpdateNetworkGameWindow()
{ {
InvalidateWindowData(WC_NETWORK_WINDOW, WN_NETWORK_WINDOW_GAME, unselect ? 1 : 0); InvalidateWindowData(WC_NETWORK_WINDOW, WN_NETWORK_WINDOW_GAME, 0);
} }
typedef GUIList<NetworkGameList*> GUIGameServerList; typedef GUIList<NetworkGameList*> GUIGameServerList;
@ -438,6 +438,9 @@ protected:
public: public:
NetworkGameWindow(const WindowDesc *desc) : QueryStringBaseWindow(NETWORK_CLIENT_NAME_LENGTH) NetworkGameWindow(const WindowDesc *desc) : QueryStringBaseWindow(NETWORK_CLIENT_NAME_LENGTH)
{ {
this->list_pos = SLP_INVALID;
this->server = NULL;
this->CreateNestedTree(desc); this->CreateNestedTree(desc);
this->vscroll = this->GetScrollbar(WID_NG_SCROLLBAR); this->vscroll = this->GetScrollbar(WID_NG_SCROLLBAR);
this->FinishInitNested(desc, WN_NETWORK_WINDOW_GAME); this->FinishInitNested(desc, WN_NETWORK_WINDOW_GAME);
@ -447,8 +450,6 @@ public:
InitializeTextBuffer(&this->text, this->edit_str_buf, this->edit_str_size, 120); InitializeTextBuffer(&this->text, this->edit_str_buf, this->edit_str_size, 120);
this->SetFocusedWidget(WID_NG_CLIENT); this->SetFocusedWidget(WID_NG_CLIENT);
UpdateNetworkGameWindow(true);
this->field = WID_NG_CLIENT; this->field = WID_NG_CLIENT;
this->last_joined = NetworkGameListAddItem(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); this->last_joined = NetworkGameListAddItem(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port));
this->server = this->last_joined; this->server = this->last_joined;
@ -791,10 +792,6 @@ public:
*/ */
virtual void OnInvalidateData(int data = 0, bool gui_scope = true) virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
{ {
if (data == 1) {
this->server = NULL;
this->list_pos = SLP_INVALID;
}
this->servers.ForceRebuild(); this->servers.ForceRebuild();
this->SetDirty(); this->SetDirty();
} }

2
src/network/network_internal.h
View File

@ -145,7 +145,7 @@ void NetworkTCPQueryServer(NetworkAddress address);
void GetBindAddresses(NetworkAddressList *addresses, uint16 port); void GetBindAddresses(NetworkAddressList *addresses, uint16 port);
void NetworkAddServer(const char *b); void NetworkAddServer(const char *b);
void NetworkRebuildHostList(); void NetworkRebuildHostList();
void UpdateNetworkGameWindow(bool unselect); void UpdateNetworkGameWindow();
bool IsNetworkCompatibleVersion(const char *version); bool IsNetworkCompatibleVersion(const char *version);

2
src/network/network_udp.cpp
View File

@ -395,7 +395,7 @@ void ClientNetworkUDPSocketHandler::Receive_SERVER_RESPONSE(Packet *p, NetworkAd
item->online = true; item->online = true;
UpdateNetworkGameWindow(false); UpdateNetworkGameWindow();
} }
void ClientNetworkUDPSocketHandler::Receive_MASTER_RESPONSE_LIST(Packet *p, NetworkAddress *client_addr) void ClientNetworkUDPSocketHandler::Receive_MASTER_RESPONSE_LIST(Packet *p, NetworkAddress *client_addr)