ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into transparent_kart

Browse Source
This commit is contained in:
Benau 2016-04-04 09:02:45 +08:00
commit 9fb7f5617b
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/states_screens/server_selection.cpp
View File

@ -127,7 +127,7 @@ void ServerSelection::init()
*/
void ServerSelection::loadList()
{
m_server_list_widget->clear();
m_server_list_widget->clear();
ServersManager *manager = ServersManager::get();
manager->sort(m_sort_desc);
for(int i=0; i < manager->getNumServers(); i++)
@ -215,7 +215,14 @@ void ServerSelection::onUpdate(float dt)
{
if (m_refresh_request->isSuccess())
{
int selection = m_server_list_widget->getSelectionID();
std::string selection_str = m_server_list_widget->getSelectionInternalName();
loadList();
// restore previous selection
if (selection != -1 && selection_str != "spacer" && selection_str != "loading")
m_server_list_widget->setSelectionID(selection);
}
else
{
@ -227,9 +234,21 @@ void ServerSelection::onUpdate(float dt)
m_refresh_request = NULL;
m_reload_widget->setActive(true);
}
else
{
m_server_list_widget->renameItem("loading",
StringUtils::loadingDots(_("Fetching servers")));
else
{
int selection = m_server_list_widget->getSelectionID();
std::string selection_str = m_server_list_widget->getSelectionInternalName();
m_server_list_widget->clear();
ServersManager *manager = ServersManager::get();
loadList();
m_server_list_widget->addItem("spacer", L"");
m_server_list_widget->addItem("loading",
StringUtils::loadingDots(_("Fetching servers")));
// restore previous selection
if (selection != -1 && selection_str != "spacer" && selection_str != "loading")
m_server_list_widget->setSelectionID(selection);
}
} // onUpdate

3
src/states_screens/tracks_screen.cpp
View File

@ -216,12 +216,13 @@ void TracksScreen::buildTrackList()
tracks.push_back(curr);
} // for n<track_amount
bool is_network = (STKHost::existHost());
tracks.insertionSort();
for (unsigned int i = 0; i < tracks.size(); i++)
{
Track *curr = tracks.get(i);
if (PlayerManager::getCurrentPlayer()->isLocked(curr->getIdent()) &&
race_manager->getNumLocalPlayers() == 1)
race_manager->getNumLocalPlayers() == 1 && !is_network)
{
tracks_widget->addItem(
_("Locked: solve active challenges to gain access to more!"),