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

Always add 1 player when leaving the lobby without splitscreen players added

Browse Source
This commit is contained in:
Benau 2023-06-24 12:42:57 +08:00
parent d5886cf2ef
commit c2840e972b
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -875,6 +875,16 @@ void NetworkingLobby::unloaded()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void NetworkingLobby::tearDown() void NetworkingLobby::tearDown()
{ {
if (m_state == LS_ADD_PLAYERS)
{
UserConfigParams::m_enable_network_splitscreen = false;
NetworkConfig::get()->cleanNetworkPlayers();
NetworkConfig::get()->addNetworkPlayer(
input_manager->getDeviceManager()->getLatestUsedDevice(),
PlayerManager::getCurrentPlayer(), HANDICAP_NONE);
NetworkConfig::get()->doneAddingNetworkPlayers();
}
gui::IGUIStaticText* st = gui::IGUIStaticText* st =
m_text_bubble->getIrrlichtElement<gui::IGUIStaticText>(); m_text_bubble->getIrrlichtElement<gui::IGUIStaticText>();
st->setMouseCallback(nullptr); st->setMouseCallback(nullptr);

3
src/states_screens/online/online_screen.cpp
View File

@ -68,7 +68,6 @@ void OnlineScreen::loadedFromFile()
{ {
m_enable_splitscreen = getWidget<CheckBoxWidget>("enable-splitscreen"); m_enable_splitscreen = getWidget<CheckBoxWidget>("enable-splitscreen");
assert(m_enable_splitscreen); assert(m_enable_splitscreen);
m_enable_splitscreen->setState(UserConfigParams::m_enable_network_splitscreen);
} // loadedFromFile } // loadedFromFile
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -92,6 +91,8 @@ void OnlineScreen::init()
RibbonWidget* r = getWidget<RibbonWidget>("menu_toprow"); RibbonWidget* r = getWidget<RibbonWidget>("menu_toprow");
r->setFocusForPlayer(PLAYER_ID_GAME_MASTER); r->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
m_enable_splitscreen->setState(
UserConfigParams::m_enable_network_splitscreen);
// Pre-add a default single player profile in network // Pre-add a default single player profile in network
if (!m_enable_splitscreen->getState() && if (!m_enable_splitscreen->getState() &&
NetworkConfig::get()->getNetworkPlayers().empty()) NetworkConfig::get()->getNetworkPlayers().empty())