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

Put color change code in a better location

Browse Source
This commit is contained in:
Benau 2016-06-30 16:08:59 +08:00
parent 4c4b4782e0
commit bfd66ebbac
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/states_screens/soccer_setup_screen.cpp
View File

@ -287,6 +287,10 @@ GUIEngine::EventPropagation SoccerSetupScreen::filterActions(PlayerAction action
{ {
team_switch = SOCCER_TEAM_RED; team_switch = SOCCER_TEAM_RED;
// Change the kart color
m_kart_view_info[playerId].view->getRenderInfo()
.setKartModelRenderInfo(RenderInfo::KRT_RED);
for(int i=0 ; i < nb_players ; i++) for(int i=0 ; i < nb_players ; i++)
{ {
m_kart_view_info[i].view->unsetBadge(BAD_BADGE); m_kart_view_info[i].view->unsetBadge(BAD_BADGE);
@ -300,6 +304,10 @@ GUIEngine::EventPropagation SoccerSetupScreen::filterActions(PlayerAction action
{ {
team_switch = SOCCER_TEAM_BLUE; team_switch = SOCCER_TEAM_BLUE;
// Change the kart color
m_kart_view_info[playerId].view->getRenderInfo()
.setKartModelRenderInfo(RenderInfo::KRT_BLUE);
for(int i=0 ; i < nb_players ; i++) for(int i=0 ; i < nb_players ; i++)
{ {
m_kart_view_info[i].view->unsetBadge(BAD_BADGE); m_kart_view_info[i].view->unsetBadge(BAD_BADGE);
@ -454,11 +462,6 @@ void SoccerSetupScreen::updateKartViewsLayout()
const KartViewInfo& view_info = m_kart_view_info[i]; const KartViewInfo& view_info = m_kart_view_info[i];
const SoccerTeam team = view_info.team; const SoccerTeam team = view_info.team;
// Change the kart color
m_kart_view_info[i].view->getRenderInfo().setKartModelRenderInfo
(view_info.team == SOCCER_TEAM_BLUE ?
RenderInfo::KRT_BLUE : RenderInfo::KRT_RED);
// Compute the position // Compute the position
const int cur_row = cur_kart_per_team[team] / nb_columns; const int cur_row = cur_kart_per_team[team] / nb_columns;
const int pos_y = start_y[team] + cur_row*kart_view_size; const int pos_y = start_y[team] + cur_row*kart_view_size;