Put the previous selected character in the most prominent position of
the new gui. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2140 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
fde307f5e7
commit
a0b5857477
@ -110,9 +110,6 @@ CharSel::CharSel(int whichPlayer)
|
|||||||
widget_manager->breakLine();
|
widget_manager->breakLine();
|
||||||
}
|
}
|
||||||
|
|
||||||
m_offset = 0;
|
|
||||||
updateScrollPosition();
|
|
||||||
|
|
||||||
widget_manager->addEmptyWgt(WTOK_EMPTY_DOWN, computeIndent(m_num_entries), HEIGHT/2);
|
widget_manager->addEmptyWgt(WTOK_EMPTY_DOWN, computeIndent(m_num_entries), HEIGHT/2);
|
||||||
widget_manager->addTextButtonWgt(WTOK_DOWN, 20, HEIGHT/2, "v");
|
widget_manager->addTextButtonWgt(WTOK_DOWN, 20, HEIGHT/2, "v");
|
||||||
widget_manager->breakLine();
|
widget_manager->breakLine();
|
||||||
@ -128,15 +125,17 @@ CharSel::CharSel(int whichPlayer)
|
|||||||
const int LAST_KART = user_config->m_player[m_player_index].getLastKartId();
|
const int LAST_KART = user_config->m_player[m_player_index].getLastKartId();
|
||||||
if( LAST_KART != -1 && kartAvailable(LAST_KART))// is LAST_KART not in vector of selected karts
|
if( LAST_KART != -1 && kartAvailable(LAST_KART))// is LAST_KART not in vector of selected karts
|
||||||
{
|
{
|
||||||
|
m_offset = LAST_KART - m_num_entries/2;
|
||||||
widget_manager->setSelectedWgt(WTOK_RACER0 + LAST_KART);
|
widget_manager->setSelectedWgt(WTOK_RACER0 + LAST_KART);
|
||||||
switchCharacter(LAST_KART);
|
switchCharacter(LAST_KART);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
m_offset = 0;
|
||||||
switchCharacter(0);
|
switchCharacter(0);
|
||||||
}
|
}
|
||||||
|
updateScrollPosition();
|
||||||
|
|
||||||
m_offset = 0;
|
|
||||||
m_clock = 0;
|
m_clock = 0;
|
||||||
//test
|
//test
|
||||||
|
|
||||||
@ -259,7 +258,6 @@ void CharSel::select()
|
|||||||
const KartProperties* KP = kart_properties_manager->getKartById(kart_id);
|
const KartProperties* KP = kart_properties_manager->getKartById(kart_id);
|
||||||
if (KP != NULL)
|
if (KP != NULL)
|
||||||
{
|
{
|
||||||
printf("selecting kart %s\n",KP->getIdent().c_str());
|
|
||||||
race_manager->setPlayerKart(m_player_index, KP->getIdent());
|
race_manager->setPlayerKart(m_player_index, KP->getIdent());
|
||||||
user_config->m_player[m_player_index].setLastKartId(kart_id);
|
user_config->m_player[m_player_index].setLastKartId(kart_id);
|
||||||
// Add selected kart (token) to selected karts vector so it cannot be
|
// Add selected kart (token) to selected karts vector so it cannot be
|
||||||
|
Loading…
Reference in New Issue
Block a user