Fix compiler warnings

This commit is contained in:
Benau 2018-07-27 22:40:03 +08:00
parent d9cebc3991
commit 5d3304b1c0
2 changed files with 5 additions and 8 deletions

0
src/config/stk_config.cpp Executable file → Normal file
View File

View File

@ -1198,7 +1198,7 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget,
} // end if mark_focused
//Handle drawing for everyone else
for (int i = 1; i < MAX_PLAYER_COUNT; i++)
for (unsigned i = 1; i < MAX_PLAYER_COUNT; i++)
{
// ---- Draw selection for other players than player 1
if (parentRibbon->isFocusedForPlayer(i) &&
@ -1210,7 +1210,7 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget,
short blue_previous = parentRibbonWidget->m_skin_b;
SColorf color_rgb = getPlayerColor(i);
parentRibbonWidget->m_skin_r = short(color_rgb.r * 255.0f);
parentRibbonWidget->m_skin_g = short(color_rgb.g * 255.0f);
parentRibbonWidget->m_skin_b = short(color_rgb.b * 255.0f);
@ -1324,23 +1324,20 @@ void Skin::drawSpinnerBody(const core::recti &rect, Widget* widget,
widget->m_skin_g = short(color_rgb.g * 255.0f);
widget->m_skin_b = short(color_rgb.b * 255.0f);
for (int i = 1; i < MAX_PLAYER_COUNT + 1; i++)
for (unsigned i = 1; i < MAX_PLAYER_COUNT + 1; i++)
{
if (widget->isFocusedForPlayer(i - 1)) {
if (widget->isFocusedForPlayer(i - 1))
{
core::recti rect2 = rect;
rect2.UpperLeftCorner.X += 2;
rect2.UpperLeftCorner.Y -= 3;
rect2.LowerRightCorner.X -= 2;
rect2.LowerRightCorner.Y += 5;
drawBoxFromStretchableTexture(widget, rect2,
SkinConfig::m_render_params[texture]);
//TODO add squarefocushalo0
}
}
core::recti sized_rect = rect;
if (m_dialog && m_dialog_size < 1.0f && widget->m_parent != NULL &&