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

Removed unused code.

Browse Source
This commit is contained in:
hiker
2015-12-01 18:10:06 +11:00
parent 76ddaeaef7
commit 109288e0f5
2 changed files with 2 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/states_screens/dialogs/server_info_dialog.cpp
View File

@@ -53,7 +53,6 @@ ServerInfoDialog::ServerInfoDialog(uint32_t server_id, uint32_t host_id,
m_self_destroy = false;
m_enter_lobby = false;
m_from_server_creation = from_server_creation;
m_server_join_request = NULL;
loadFromFile("online/server_info_dialog.stkgui");
@@ -79,22 +78,16 @@ ServerInfoDialog::ServerInfoDialog(uint32_t server_id, uint32_t host_id,
ServerInfoDialog::~ServerInfoDialog()
{
if (m_server_join_request)
delete m_server_join_request;
m_server_join_request = NULL;
} // ~ServerInfoDialog
// -----------------------------------------------------------------------------
void ServerInfoDialog::requestJoin()
{
// FIXME - without this next line, it appears that m_server_join is completely unused.
//m_server_join_request = Online::CurrentUser::get()->requestServerJoin(m_server_id);
ServersManager::get()->setJoinedServer(m_server_id);
STKHost::create();
ModalDialog::dismiss();
NetworkingLobby::getInstance()->push();
//Online::CurrentUser::release();
} // requestJoin
// -----------------------------------------------------------------------------
@@ -142,34 +135,8 @@ bool ServerInfoDialog::onEscapePressed()
} // onEscapePressed
// -----------------------------------------------------------------------------
void ServerInfoDialog::onUpdate(float dt)
{
if(m_server_join_request != NULL)
{
if(m_server_join_request->isDone())
{
if(m_server_join_request->isSuccess())
{
m_enter_lobby = true;
}
else
{
SFXManager::get()->quickSound( "anvil" );
m_info_widget->setErrorColor();
m_info_widget->setText(m_server_join_request->getInfo(), false);
}
delete m_server_join_request;
m_server_join_request = NULL;
}
else
{
m_info_widget->setDefaultColor();
m_info_widget->setText(StringUtils::loadingDots(_("Joining server")),
false);
}
}
//If we want to open the registration dialog, we need to close this one first
if (m_enter_lobby) m_self_destroy = true;
@@ -179,7 +146,7 @@ void ServerInfoDialog::onUpdate(float dt)
ModalDialog::dismiss();
if (m_from_server_creation)
StateManager::get()->popMenu();
if (m_enter_lobby)
else if (m_enter_lobby)
NetworkingLobby::getInstance()->push();
return;
}

8
src/states_screens/dialogs/server_info_dialog.hpp
View File

@@ -28,10 +28,7 @@
#include <irrString.h>
namespace Online { class XMLRequest; }
/**
* \brief Dialog that allows a user to sign in
/** \brief Dialog that allows a user to sign in
* \ingroup states_screens
*/
class ServerInfoDialog : public GUIEngine::ModalDialog
@@ -43,9 +40,6 @@ private:
bool m_enter_lobby;
bool m_from_server_creation;
/** Pointer to the server join request. */
Online::XMLRequest *m_server_join_request;
const uint32_t m_server_id;
uint32_t m_host_id;