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

Fix #3554

Browse Source
This commit is contained in:
Benau 2018-11-13 14:15:34 +08:00
parent 9de7376b0a
commit 1cb1923239
4 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/guiengine/widgets/icon_button_widget.cpp
View File

@ -426,7 +426,6 @@ void IconButtonWidget::setLabelFont()
}
// -----------------------------------------------------------------------------
void IconButtonWidget::setVisible(bool visible)
{
Widget::setVisible(visible);
@ -434,3 +433,9 @@ void IconButtonWidget::setVisible(bool visible)
if (m_label != NULL)
m_label->setVisible(visible);
}
// -----------------------------------------------------------------------------
void IconButtonWidget::setText(const wchar_t *s)
{
m_label->setText(s);
}

2
src/guiengine/widgets/icon_button_widget.hpp
View File

@ -170,6 +170,8 @@ namespace GUIEngine
Widget::elementRemoved();
m_label = NULL;
}
// --------------------------------------------------------------------
virtual void setText(const wchar_t *s) OVERRIDE;
};
}

12
src/network/protocols/server_lobby.cpp
View File

@ -446,6 +446,7 @@ void ServerLobby::asynchronousUpdate()
{
if (ServerConfig::m_owner_less)
{
m_game_setup->update(true/*remove_disconnected_players*/);
int player_size = m_game_setup->getPlayerCount();
if ((player_size >= ServerConfig::m_min_start_game_players ||
m_game_setup->isGrandPrixStarted()) &&
@ -458,10 +459,14 @@ void ServerLobby::asynchronousUpdate()
else if (player_size < ServerConfig::m_min_start_game_players &&
!m_game_setup->isGrandPrixStarted())
{
resetPeersReady();
m_timeout.store(std::numeric_limits<int64_t>::max());
}
if (m_timeout.load() < (int64_t)StkTime::getRealTimeMs())
if (m_timeout.load() < (int64_t)StkTime::getRealTimeMs() ||
(checkPeersReady() &&
player_size >= ServerConfig::m_min_start_game_players))
{
resetPeersReady();
startSelection();
return;
}
@ -826,6 +831,11 @@ void ServerLobby::startSelection(const Event *event)
m_state.load());
return;
}
if (ServerConfig::m_owner_less)
{
m_peers_ready.at(event->getPeerSP()) = true;
return;
}
if (event->getPeerSP() != m_server_owner.lock())
{
Log::warn("ServerLobby",

16
src/states_screens/online/networking_lobby.cpp
View File

@ -152,6 +152,7 @@ void NetworkingLobby::init()
//I18N: In the networking lobby
m_header->setText(_("Lobby"), false);
m_server_info_height = GUIEngine::getFont()->getDimension(L"X").Height;
m_start_button->setText(_("Start race"));
m_start_button->setVisible(false);
m_state = LS_CONNECTING;
getWidget("chat")->setVisible(false);
@ -290,9 +291,11 @@ void NetworkingLobby::onUpdate(float delta)
if (remain < 0)
remain = 0;
//I18N: In the networking lobby, display the starting timeout
//for owner-less server
core::stringw msg = _P("Game will start after %d second.",
"Game will start after %d seconds.", (int)remain);
//for owner-less server to begin a game
core::stringw msg = _P("Starting after %d second "
"or everyone pressed 'Ready' button.",
"Starting after %d seconds "
"or everyone pressed 'Ready' button.", (int)remain);
m_timeout_message->setText(msg, true);
}
}
@ -344,7 +347,9 @@ void NetworkingLobby::onUpdate(float delta)
m_text_bubble->setText(total_msg, true);
}
if (STKHost::get()->isAuthorisedToControl())
if (STKHost::get()->isAuthorisedToControl() ||
(m_has_auto_start_in_server &&
m_cur_starting_timer != std::numeric_limits<int64_t>::max()))
{
m_start_button->setVisible(true);
}
@ -571,6 +576,9 @@ void NetworkingLobby::initAutoStartTimer(bool grand_prix_started,
if (min_players == 0 || start_timeout == 0.0f)
return;
//I18N: In the networking lobby, ready button is to allow player to tell
//server that he is ready for next game for owner less server
m_start_button->setText(_("Ready"));
m_has_auto_start_in_server = true;
m_min_start_game_players = grand_prix_started ? 0 : min_players;
m_start_timeout = start_timeout;