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

Players quitting is now a bit better handled (selections shouldnt be messed up anymore) but hard to test since I only have a keyboard + a gamepad. Folks with lots of gamepads, testing please\!

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4176 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2009-10-31 00:45:59 +00:00
parent e169cdce88
commit 27c5a59a25
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/states_screens/kart_selection.cpp
View File

@ -303,6 +303,12 @@ FocusDispatcher* g_dispatcher = NULL;
~PlayerKartWidget() ~PlayerKartWidget()
{ {
if (GUIEngine::g_focus_for_player[m_playerID] == this)
{
unsetFocusForPlayer(m_playerID);
GUIEngine::g_focus_for_player[m_playerID] = NULL;
}
if (playerIDLabel->getIrrlichtElement() != NULL) if (playerIDLabel->getIrrlichtElement() != NULL)
playerIDLabel->getIrrlichtElement()->remove(); playerIDLabel->getIrrlichtElement()->remove();
@ -328,8 +334,14 @@ FocusDispatcher* g_dispatcher = NULL;
assert(false); assert(false);
} }
Widget* focus = GUIEngine::g_focus_for_player[m_playerID];
if (focus != NULL) focus->unsetFocusForPlayer(m_playerID);
GUIEngine::g_focus_for_player[m_playerID] = NULL;
m_playerID = newPlayerID; m_playerID = newPlayerID;
if (focus != NULL) focus->setFocusForPlayer(m_playerID);
//I18N: In kart selection screen (Will read like 'Player 1 (foobartech gamepad)') //I18N: In kart selection screen (Will read like 'Player 1 (foobartech gamepad)')
irr::core::stringw newLabel = StringUtils::insertValues(_("Player %i (%s)"), m_playerID + 1, deviceName.c_str()); irr::core::stringw newLabel = StringUtils::insertValues(_("Player %i (%s)"), m_playerID + 1, deviceName.c_str());
playerIDLabel->setText( newLabel ); playerIDLabel->setText( newLabel );
@ -788,7 +800,7 @@ bool KartSelectionScreen::playerQuit(ActivePlayer* player)
StateManager::get()->removeActivePlayer(playerID); StateManager::get()->removeActivePlayer(playerID);
// Karts count changed, maybe order too, so renumber them // Karts count changed, maybe order too, so renumber them
renumberKarts(); renumberKarts();
// Tell the removed widget to perform the shrinking animation (which will be updated in onUpdate, // Tell the removed widget to perform the shrinking animation (which will be updated in onUpdate,
// and will stop when the widget has disappeared) // and will stop when the widget has disappeared)