Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Serverinfo map dvars.

Browse Source
This commit is contained in:
momo5502 2016-01-08 18:31:23 +01:00
parent 9e13cbc0ac
commit 5db2a0b435
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Components/Modules/ServerList.cpp
View File

@ -55,7 +55,14 @@ namespace Components
const char* ServerList::GetServerText(int index, int column) const char* ServerList::GetServerText(int index, int column)
{ {
return ServerList::GetServerText(ServerList::GetServer(index), column); ServerList::ServerInfo* info = ServerList::GetServer(index);
if (info)
{
return ServerList::GetServerText(info, column);
}
return "";
} }
const char* ServerList::GetServerText(ServerList::ServerInfo* server, int column) const char* ServerList::GetServerText(ServerList::ServerInfo* server, int column)
@ -116,10 +123,24 @@ namespace Components
void ServerList::SelectServer(int index) void ServerList::SelectServer(int index)
{ {
ServerList::CurrentServer = (unsigned int)index; ServerList::CurrentServer = (unsigned int)index;
ServerList::ServerInfo* info = ServerList::GetCurrentServer();
if (info)
{
Dvar::Var("ui_serverSelected").Set(true);
Dvar::Var("ui_serverSelectedMap").Set(info->Mapname);
}
else
{
Dvar::Var("ui_serverSelected").Set(false);
}
} }
void ServerList::RefreshVisibleList() void ServerList::RefreshVisibleList()
{ {
Dvar::Var("ui_serverSelected").Set(false);
ServerList::VisibleList.clear(); ServerList::VisibleList.clear();
auto list = ServerList::GetList(); auto list = ServerList::GetList();
@ -168,6 +189,7 @@ namespace Components
void ServerList::Refresh() void ServerList::Refresh()
{ {
Dvar::Var("ui_serverSelected").Set(false);
Localization::Set("MPUI_SERVERQUERIED", "Sent requests: 0/0"); Localization::Set("MPUI_SERVERQUERIED", "Sent requests: 0/0");
// ServerList::OnlineList.clear(); // ServerList::OnlineList.clear();
@ -175,7 +197,6 @@ namespace Components
// ServerList::FavouriteList.clear(); // ServerList::FavouriteList.clear();
ServerList::GetList().clear(); ServerList::GetList().clear();
ServerList::VisibleList.clear(); ServerList::VisibleList.clear();
ServerList::RefreshContainer.Mutex.lock(); ServerList::RefreshContainer.Mutex.lock();
ServerList::RefreshContainer.Servers.clear(); ServerList::RefreshContainer.Servers.clear();
ServerList::RefreshContainer.Mutex.unlock(); ServerList::RefreshContainer.Mutex.unlock();
@ -500,6 +521,9 @@ namespace Components
ServerList::OnlineList.clear(); ServerList::OnlineList.clear();
ServerList::VisibleList.clear(); ServerList::VisibleList.clear();
Dvar::Register<bool>("ui_serverSelected", false, Game::dvar_flag::DVAR_FLAG_NONE, "Wether a server has been selected in the serverlist");
Dvar::Register<bool>("ui_serverSelectedMap", "mp_afghan", Game::dvar_flag::DVAR_FLAG_NONE, "Map of the selected server");
Localization::Set("MPUI_SERVERQUERIED", "Sent requests: 0/0"); Localization::Set("MPUI_SERVERQUERIED", "Sent requests: 0/0");
Network::Handle("getServersResponse", [] (Network::Address address, std::string data) Network::Handle("getServersResponse", [] (Network::Address address, std::string data)
@ -551,9 +575,11 @@ namespace Components
UIScript::Add("RefreshServers", ServerList::Refresh); UIScript::Add("RefreshServers", ServerList::Refresh);
UIScript::Add("JoinServer", [] () UIScript::Add("JoinServer", [] ()
{ {
if (ServerList::GetServer(ServerList::CurrentServer)) ServerList::ServerInfo* info = ServerList::GetServer(ServerList::CurrentServer);
if (info)
{ {
Party::Connect(ServerList::GetServer(ServerList::CurrentServer)->Addr); Party::Connect(info->Addr);
} }
}); });
UIScript::Add("ServerSort", [] (UIScript::Token token) UIScript::Add("ServerSort", [] (UIScript::Token token)
@ -576,7 +602,11 @@ namespace Components
UIScript::Add("CreateListFavorite", [] () UIScript::Add("CreateListFavorite", [] ()
{ {
ServerList::ServerInfo* info = ServerList::GetCurrentServer(); ServerList::ServerInfo* info = ServerList::GetCurrentServer();
ServerList::StoreFavourite(info->Addr.GetString());
if (info)
{
ServerList::StoreFavourite(info->Addr.GetString());
}
}); });
UIScript::Add("CreateFavorite", [] () UIScript::Add("CreateFavorite", [] ()
{ {