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

Code cleanup.

Browse Source
This commit is contained in:
hiker 2015-11-05 07:55:59 +11:00
parent bdf34edc00
commit f2aa1ddea6
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/states_screens/online_screen.cpp
View File

@ -256,7 +256,6 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name,
{ {
STKHost::setIsLAN(); STKHost::setIsLAN();
ServerSelection::getInstance()->push(); ServerSelection::getInstance()->push();
// TODO: find lan server;
} }
else if (selection == m_manage_user->m_properties[PROP_ID]) else if (selection == m_manage_user->m_properties[PROP_ID])
{ {

10
src/states_screens/server_selection.cpp
View File

@ -79,8 +79,6 @@ void ServerSelection::refresh()
*/ */
void ServerSelection::loadedFromFile() void ServerSelection::loadedFromFile()
{ {
m_back_widget = getWidget<GUIEngine::IconButtonWidget>("back");
assert(m_back_widget != NULL);
m_reload_widget = getWidget<GUIEngine::IconButtonWidget>("reload"); m_reload_widget = getWidget<GUIEngine::IconButtonWidget>("reload");
assert(m_reload_widget != NULL); assert(m_reload_widget != NULL);
m_server_list_widget = getWidget<GUIEngine::ListWidget>("server_list"); m_server_list_widget = getWidget<GUIEngine::ListWidget>("server_list");
@ -172,10 +170,12 @@ void ServerSelection::eventCallback( GUIEngine::Widget* widget,
else if (name == m_server_list_widget->m_properties[GUIEngine::PROP_ID]) else if (name == m_server_list_widget->m_properties[GUIEngine::PROP_ID])
{ {
int selected_index = m_server_list_widget->getSelectionID(); int selected_index = m_server_list_widget->getSelectionID();
uint32_t server_id = ServersManager::get()->getServerBySort(selected_index)->getServerId(); const Server *server =
uint32_t host_id = ServersManager::get()->getServerBySort(selected_index)->getHostId(); ServersManager::get()->getServerBySort(selected_index);
uint32_t server_id = server->getServerId();
uint32_t host_id = server->getHostId();
new ServerInfoDialog(server_id, host_id); new ServerInfoDialog(server_id, host_id);
} } // click on server
} // eventCallback } // eventCallback

1
src/states_screens/server_selection.hpp
View File

@ -38,7 +38,6 @@ private:
ServerSelection(); ServerSelection();
~ServerSelection(); ~ServerSelection();
GUIEngine::IconButtonWidget * m_back_widget;
GUIEngine::IconButtonWidget * m_reload_widget; GUIEngine::IconButtonWidget * m_reload_widget;
GUIEngine::LabelWidget * m_update_status; GUIEngine::LabelWidget * m_update_status;
GUIEngine::ListWidget * m_server_list_widget; GUIEngine::ListWidget * m_server_list_widget;