1195 Multiplayer Kart Selection commit 19

This commit is contained in:
Dk 2014-03-05 23:22:41 +05:30
parent c5d23f7154
commit 7d87d79d20
6 changed files with 12 additions and 25 deletions

View File

@ -1270,8 +1270,6 @@ void Skin::drawSpinnerBody(const core::recti &rect, Widget* widget,
rect2.LowerRightCorner.Y += 5;
drawBoxFromStretchableTexture(widget, rect2,
SkinConfig::m_render_params["squareFocusHalo2::neutral"]);
}
else if (widget->isFocusedForPlayer(2))
{

View File

@ -111,7 +111,6 @@ void SpinnerWidget::add()
m_element->setTabOrder( m_element->getID() );
// left arrow
rect<s32> subsize_left_arrow = rect<s32>(0 ,0, m_h, m_h);
IGUIButton * left_arrow = GUIEngine::getGUIEnv()->addButton(subsize_left_arrow, btn, getNewNoFocusID(), L" ");
@ -180,6 +179,7 @@ void SpinnerWidget::add()
setValue(m_value);
}
// -----------------------------------------------------------------------------
ITexture* SpinnerWidget::getTexture()
{
@ -368,8 +368,6 @@ stringw SpinnerWidget::getStringValue() const
return "";
}
// -----------------------------------------------------------------------------
void SpinnerWidget::setValue(irr::core::stringw new_value)

View File

@ -97,8 +97,6 @@ namespace GUIEngine
/** Call only if this spinner is graphical. Returns the current texture to display */
irr::video::ITexture* getTexture();
// to set the background image
// irr::video::ITexture* getBackgroundColor();
public:
@ -179,7 +177,6 @@ namespace GUIEngine
/** Display custom text in spinner */
void setCustomText(const core::stringw& text);
};
}

View File

@ -138,7 +138,7 @@ PlayerNameSpinner::PlayerNameSpinner(KartSelectionScreen* parent,
setUseBackgroundColor();//except for multiplayer kart selection, this is false
setSpinnerWidgetPlayerID(m_player_id);
}
} // PlayerNameSpinner
// ------------------------------------------------------------------------
void PlayerNameSpinner::setID(const int m_player_id)
{
@ -234,7 +234,6 @@ PlayerKartWidget::PlayerKartWidget(KartSelectionScreen* parent,
m_player_ident_spinner->m_w = player_name_w;
m_player_ident_spinner->m_h = player_name_h;
if (parent->m_multiplayer && associated_player)
{
if (associated_player->getDevice()->getType() == DT_KEYBOARD)
@ -489,7 +488,6 @@ void PlayerKartWidget::add()
for (int n=0; n<player_amount; n++)
{
core::stringw name = PlayerManager::get()->getPlayer(n)->getName();
m_player_ident_spinner->addLabel( translations->fribidize(name) );
}
@ -1837,7 +1835,6 @@ bool KartSelectionScreen::validateIdentChoices()
// perform actual checking
for (int n=0; n<amount; n++)
{
// skip players that took a guest account, they can be many on the
// same identity in this case
if (m_kart_widgets[n].getAssociatedPlayer()->getProfile()
@ -2099,8 +2096,6 @@ EventPropagation FocusDispatcher::focused(const int playerID)
const int amount = m_parent->m_kart_widgets.size();
for (int n=0; n<amount; n++)
{
if (m_parent->m_kart_widgets[n].getPlayerID() == playerID)
{
// If player is done, don't do anything with focus

View File

@ -217,7 +217,6 @@ public:
// ------------------------------------------------------------------------
/** Remove any red mark set with 'markAsIncorrect' */
void markAsCorrect();
};
/** A widget representing the kart selection for a player (i.e. the player's