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

Improve the way to enable/disable the networking menu, use the --online switch that previously existed

Browse Source
This commit is contained in:
auria.mg 2017-11-26 21:54:48 -05:00
parent 4f528c258d
commit 579a4aa3cc
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/states_screens/main_menu_screen.cpp
View File

@ -70,7 +70,7 @@ using namespace Online;
DEFINE_SCREEN_SINGLETON( MainMenuScreen );
bool MainMenuScreen::m_enable_online = true;
bool MainMenuScreen::m_enable_online = false;
// ----------------------------------------------------------------------------
@ -151,9 +151,6 @@ void MainMenuScreen::init()
IconButtonWidget* online = getWidget<IconButtonWidget>("online");
if (!m_enable_online)
online->setActive(false);
LabelWidget* w = getWidget<LabelWidget>("info_addons");
const core::stringw &news_text = NewsManager::get()->getNextNewsMessage();
w->setText(news_text, true);
@ -497,25 +494,30 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
}
else if (selection == "online")
{
//OnlineScreen::getInstance()->push();
if (UserConfigParams::m_internet_status != RequestManager::IPERM_ALLOWED)
if (MainMenuScreen::m_enable_online)
{
new MessageDialog(_("You can not play online without internet access. "
"If you want to play online, go to options, select "
" tab 'User Interface', and edit "
"\"Connect to the Internet\"."));
return;
}
if (PlayerManager::getCurrentOnlineId())
{
ProfileManager::get()->setVisiting(PlayerManager::getCurrentOnlineId());
TabOnlineProfileAchievements::getInstance()->push();
OnlineScreen::getInstance()->push();
}
else
{
UserScreen::getInstance()->push();
if (UserConfigParams::m_internet_status != RequestManager::IPERM_ALLOWED)
{
new MessageDialog(_("You can not play online without internet access. "
"If you want to play online, go to options, select "
" tab 'User Interface', and edit "
"\"Connect to the Internet\"."));
return;
}
if (PlayerManager::getCurrentOnlineId())
{
ProfileManager::get()->setVisiting(PlayerManager::getCurrentOnlineId());
TabOnlineProfileAchievements::getInstance()->push();
}
else
{
UserScreen::getInstance()->push();
}
}
}
else if (selection == "addons")

4
src/states_screens/online_screen.cpp
View File

@ -51,8 +51,6 @@ using namespace Online;
DEFINE_SCREEN_SINGLETON( OnlineScreen );
bool OnlineScreen::m_enable_online = true;
// ----------------------------------------------------------------------------
OnlineScreen::OnlineScreen() : Screen("online/online.stkgui")
@ -93,7 +91,7 @@ void OnlineScreen::init()
m_online = getWidget<IconButtonWidget>("online");
if (!m_enable_online)
if (!MainMenuScreen::m_enable_online)
m_online->setActive(false);
m_user_id = getWidget<ButtonWidget>("user-id");

2
src/states_screens/online_screen.hpp
View File

@ -45,8 +45,6 @@ private:
OnlineScreen();
public:
/** Temporary disable the online menu while it is being worked at. */
static bool m_enable_online;
virtual void onUpdate(float delta) OVERRIDE;