rixty
/
bygfoot
mirror of https://github.com/tstellar/bygfoot.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bug with choose_team alternatives 

If the main team was in the user's country and the alternative was not,
the choose team would fail, because there are different paths for
the user's country and other countries.

This patch merges both paths into cup_load_choose_team() so that
function will work for any country.
This commit is contained in:
Tom Stellard 2021-07-17 14:47:19 -07:00 committed by Tom Stellard
parent dd71c31eda
commit f7713e8b96
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cup.c
View File

@ -330,10 +330,7 @@ cup_get_team_pointers(Cup *cup, gint round, gboolean preload)
if(choose_team->preload == preload)
{
if(cup_choose_team_should_generate(choose_team))
cup_load_choose_team_generate(cup, teams, choose_team);
else
cup_load_choose_team(cup, teams, choose_team);
cup_load_choose_team(cup, teams, choose_team);
}
}
@ -371,6 +368,11 @@ cup_load_choose_team(Cup *cup, GPtrArray *teams, const CupChooseTeam *ct)
g_print("cup_load_choose_team: %s, %s, teams %d to %d, random: %d \n", cup->name,
ct->sid, ct->start_idx, ct->end_idx, ct->randomly);
if(cup_choose_team_should_generate(ct)) {
cup_load_choose_team_generate(cup, teams, ct);
return;
}
cup_get_choose_team_league_cup(ct, &league, &cup_temp);
if(cup_temp == NULL)
@ -715,7 +717,7 @@ cup_load_choose_team_generate(Cup *cup, GPtrArray *teams, const CupChooseTeam *c
/* TODO: handle number_of_teams > 0 */
g_ptr_array_free(teams_local, TRUE);
if (ct->next)
return cup_load_choose_team_generate(cup, teams, ct->next);
return cup_load_choose_team(cup, teams, ct->next);
if (ct->optional)
return;
main_exit_program(EXIT_CHOOSE_TEAM_ERROR,