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

Allow saving selected team in single player soccer mode.

Browse Source
This commit is contained in:
Benau
2016-01-22 11:32:06 +08:00
parent a7aedbe208
commit 95f6f910b8
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/config/user_config.hpp
View File

@@ -335,9 +335,12 @@ namespace UserConfigParams
PARAM_PREFIX IntUserConfigParam m_num_goals
PARAM_DEFAULT( IntUserConfigParam(3, "numgoals",
&m_race_setup_group, "Default number of goals in soccer mode.") );
PARAM_PREFIX IntUserConfigParam m_soccer_default_team
PARAM_DEFAULT( IntUserConfigParam(0, "soccer-default-team",
&m_race_setup_group, "Default team in soccer mode for single player.") );
PARAM_PREFIX IntUserConfigParam m_soccer_time_limit
PARAM_DEFAULT( IntUserConfigParam(3, "soccer-time-limit",
&m_race_setup_group, "Limit in soccer time mode.") );
&m_race_setup_group, "Time limit in soccer mode.") );
PARAM_PREFIX IntUserConfigParam m_difficulty
PARAM_DEFAULT( IntUserConfigParam(0, "difficulty",
&m_race_setup_group,

6
src/states_screens/soccer_setup_screen.cpp
View File

@@ -158,7 +158,9 @@ void SoccerSetupScreen::beforeAddingWidget()
KartViewInfo info;
info.view = kart_view;
info.confirmed = false;
info.team = i&1 ? SOCCER_TEAM_BLUE : SOCCER_TEAM_RED;
int single_team = UserConfigParams::m_soccer_default_team;
info.team = nb_players == 1 ? (SoccerTeam)single_team :
(i&1 ? SOCCER_TEAM_BLUE : SOCCER_TEAM_RED);
m_kart_view_info.push_back(info);
race_manager->setKartSoccerTeam(i, info.team);
}
@@ -327,6 +329,8 @@ GUIEngine::EventPropagation SoccerSetupScreen::filterActions(PlayerAction action
if(team_switch != SOCCER_TEAM_NONE) // A player wants to change his team?
{
if (nb_players == 1)
UserConfigParams::m_soccer_default_team = (int)team_switch;
race_manager->setKartSoccerTeam(playerId, team_switch);
m_kart_view_info[playerId].team = team_switch;
updateKartViewsLayout();