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

Minor cleanup in kart selection screen

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4052 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2009-09-27 19:48:10 +00:00
parent 8b9d4bd2e7
commit 893c430cfc
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/states_screens/kart_selection.cpp
View File

@@ -499,12 +499,13 @@ bool playerJoin(InputDevice* device, bool firstPlayer)
ActivePlayer *aplayer = StateManager::get()->getActivePlayer(id);
// ---- Create player/kart widget
// FIXME : player ID needs to be synced with active player list
PlayerKartWidget* newPlayer;
if (firstPlayer)
newPlayer = new PlayerKartWidget(aplayer, &rightarea, g_player_karts.size(), rightarea.m_reserved_id);
else
newPlayer = new PlayerKartWidget(aplayer, &rightarea, g_player_karts.size(), rightarea.m_reserved_id);
//if (firstPlayer)
// newPlayer = new PlayerKartWidget(aplayer, &rightarea, g_player_karts.size(), rightarea.m_reserved_id);
//else
// newPlayer = new PlayerKartWidget(aplayer, &rightarea, g_player_karts.size());
newPlayer = new PlayerKartWidget(aplayer, &rightarea, g_player_karts.size(), rightarea.m_reserved_id);
getCurrentScreen()->manualAddWidget(newPlayer);
newPlayer->add();
@@ -819,7 +820,7 @@ void renumberKarts()
// FIXME : clean this mess, this file should not contain so many classes
GUIEngine::EventPropagation PlayerNameSpinner::focused(const int playerID)
{
std::cout << "Player name spinner " << this->playerID << " focused by " << playerID << std::endl;
//std::cout << "Player name spinner " << this->playerID << " focused by " << playerID << std::endl;
// since this screen is multiplayer, redirect focus to the right widget
if (this->playerID != playerID)
@@ -829,17 +830,15 @@ GUIEngine::EventPropagation PlayerNameSpinner::focused(const int playerID)
{
if (g_player_karts[n].playerID == playerID)
{
std::cout << "--> Redirecting focus for player " << playerID << " from spinner " << this->playerID <<
" (ID " << m_element->getID() <<
") to spinner " << n << " (ID " << g_player_karts[n].playerName->m_element->getID() << ")" << std::endl;
int IDbefore = GUIEngine::getGUIEnv()->getFocus()->getID();
//std::cout << "--> Redirecting focus for player " << playerID << " from spinner " << this->playerID <<
// " (ID " << m_element->getID() <<
// ") to spinner " << n << " (ID " << g_player_karts[n].playerName->m_element->getID() << ")" << std::endl;
//int IDbefore = GUIEngine::getGUIEnv()->getFocus()->getID();
g_player_karts[n].playerName->setFocusForPlayer(playerID);
int IDafter = GUIEngine::getGUIEnv()->getFocus()->getID();
std::cout << "--> ID before : " << IDbefore << "; ID after : " << IDafter << std::endl;
//int IDafter = GUIEngine::getGUIEnv()->getFocus()->getID();
//std::cout << "--> ID before : " << IDbefore << "; ID after : " << IDafter << std::endl;
return GUIEngine::EVENT_BLOCK;
}
@@ -848,7 +847,7 @@ GUIEngine::EventPropagation PlayerNameSpinner::focused(const int playerID)
}
else
{
std::cout << "--> right spinner nothing to do\n";
//std::cout << "--> right spinner nothing to do\n";
return GUIEngine::EVENT_LET;
}
}