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

Fixed updating labels at kart selection screen

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3938 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2009-08-28 15:57:07 +00:00
parent d3dddc901b
commit 0f0cff5842
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/guiengine/widgets/label_widget.cpp
View File

@ -49,4 +49,6 @@ void LabelWidget::setText(stringw newText)
{
IGUIStaticText* irrwidget = Widget::getIrrlichtElement<IGUIStaticText>();
irrwidget->setText(newText.c_str());
m_properties[PROP_TEXT] = stringc(newText.c_str()).c_str();
}

23
src/states_screens/kart_selection.cpp
View File

@ -78,6 +78,7 @@ namespace KartSelectionScreen
int target_x, target_y, target_w, target_h;
LabelWidget *getPlayerIDLabel() {return playerIDLabel;}
std::string deviceName;
PlayerKartWidget(ActivePlayer* associatedPlayer, Widget* area, const int playerID, const int irrlichtWidgetID=-1) : Widget()
{
@ -100,7 +101,6 @@ namespace KartSelectionScreen
target_w = w;
target_h = h;
std::string deviceName;
if(associatedPlayer->getDevice()->getType() == DT_KEYBOARD)
{
deviceName += "keyboard";
@ -197,7 +197,12 @@ namespace KartSelectionScreen
std::cerr << "Internal inconsistency, PlayerKartWidget has IDs and pointers that do not correspond to one player\n";
assert(false);
}
playerID = newPlayerID;
std::string newLabel = StringUtils::insertValues(_("Player %i ("), playerID + 1) + deviceName + ")";
playerIDLabel->setText( newLabel.c_str() );
playerIDLabel->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_label", playerID);
}
virtual void add()
@ -483,7 +488,8 @@ bool playerJoin(InputDevice* device, bool firstPlayer)
}
PlayerKartWidget* removedWidget = NULL;
// -----------------------------------------------------------------------------
// Return true if event was handled succesfully
bool playerQuit(ActivePlayer* player)
{
@ -527,6 +533,8 @@ bool playerQuit(ActivePlayer* player)
return true;
}
// -----------------------------------------------------------------------------
void kartSelectionUpdate(float delta)
{
const int amount = g_player_karts.size();
@ -548,7 +556,8 @@ void kartSelectionUpdate(float delta)
}
}
}
// -----------------------------------------------------------------------------
/**
* Callback handling events from the kart selection menu
*/
@ -675,6 +684,8 @@ void menuEventKarts(Widget* widget, const std::string& name)
}
}
// -----------------------------------------------------------------------------
void renumberKarts()
{
RibbonGridWidget* w = getCurrentScreen()->getWidget<RibbonGridWidget>("karts");
@ -687,12 +698,6 @@ void renumberKarts()
{
g_player_karts[n].setPlayerID(n);
g_player_karts[n].move( fullarea->x + splitWidth*n, fullarea->y, splitWidth, fullarea->h );
// FIXME: Not sure why this isn't updating the labels properly ??
g_player_karts[n].getPlayerIDLabel()->m_properties[PROP_TEXT] =
StringUtils::insertValues(_("Player %i ("), n + 1) + ")";
g_player_karts[n].getPlayerIDLabel()->m_properties[PROP_ID] =
StringUtils::insertValues("@p%i_label", n);
}
w->updateItemDisplay();