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

Fix first player in kart selection doesn't get focused

Browse Source
This commit is contained in:
Flakebi
2014-11-22 13:35:31 +01:00
parent aecd9c4b80
commit 632efb296c
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/states_screens/kart_selection.cpp
View File

@@ -177,7 +177,7 @@ void KartHoverListener::onSelectionChanged(DynamicRibbonWidget* theWidget,
assert(m_magic_number == 0xCAFEC001);
// Check if this player has a kart
if (m_parent->m_kart_widgets.size() <= playerID)
if (m_parent->m_kart_widgets.size() <= ((unsigned int) playerID))
{
GUIEngine::focusNothingForPlayer(playerID);
return;
@@ -533,17 +533,13 @@ bool KartSelectionScreen::joinPlayer(InputDevice* device)
}
}
// select something (anything) in the ribbon; by default, only the
// game master has something selected. Thus, when a new player joins,
// we need to select something for them
w->setSelection(new_player_id, new_player_id, true);
if (!first_player)
{
// select something (anything) in the ribbon; by default, only the
// game master has something selected. Thus, when a new player joins,
// we need to select something for them
w->setSelection(new_player_id, new_player_id, true);
newPlayerWidget->m_player_ident_spinner
->setFocusForPlayer(new_player_id);
}
newPlayerWidget->m_player_ident_spinner
->setFocusForPlayer(new_player_id);
if (!m_multiplayer)
{
@@ -1036,7 +1032,7 @@ void KartSelectionScreen::eventCallback(Widget* widget,
}
else if (name == "karts")
{
if (m_kart_widgets.size() > playerID)
if (m_kart_widgets.size() > ((unsigned int) playerID))
playerConfirm(playerID);
}
else if (name == "back")