diff --git a/Makefile.am b/Makefile.am index 751b9490..40a12ac4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,9 +13,9 @@ EXTRA_DIST = \ dist_man6_MANS = man/bygfoot.6 -SUPPORT_DIRS = support_files support_files/names support_files/pixmaps support_files/pixmaps/history support_files/pixmaps/live_game support_files/pixmaps/flags support_files/definitions support_files/definitions/brazil support_files/definitions/short_leagues support_files/definitions/europe support_files/definitions/misc support_files/definitions/belgium support_files/definitions/england support_files/definitions/romania support_files/definitions/france support_files/definitions/germany support_files/definitions/scotland support_files/definitions/short_leagues_south_america support_files/definitions/italy +SUPPORT_DIRS = support_files support_files/names support_files/pixmaps support_files/pixmaps/history support_files/pixmaps/live_game support_files/pixmaps/flags support_files/definitions support_files/definitions/brazil support_files/definitions/short_leagues support_files/definitions/europe support_files/definitions/misc support_files/definitions/belgium support_files/definitions/england support_files/definitions/romania support_files/definitions/france support_files/definitions/usa support_files/definitions/germany support_files/definitions/scotland support_files/definitions/short_leagues_south_america support_files/definitions/italy -SUPPORT_FILES = support_files/names/player_names.xml support_files/bygfoot.conf support_files/pixmaps/history/champion.png support_files/pixmaps/history/start_game.png support_files/pixmaps/history/fire_finance.png support_files/pixmaps/history/fire_failure.png support_files/pixmaps/history/job_offer.png support_files/pixmaps/history/end_season.png support_files/pixmaps/history/promoted.png support_files/pixmaps/history/relegated.png support_files/pixmaps/history/win_final.png support_files/pixmaps/history/lose_final.png support_files/pixmaps/history/reach_cup_round.png support_files/pixmaps/bygfoot_icon.png support_files/pixmaps/new_week.png support_files/pixmaps/preview.png support_files/pixmaps/transfers.png support_files/pixmaps/live_game/sub.png support_files/pixmaps/live_game/red.png support_files/pixmaps/live_game/save.png support_files/pixmaps/live_game/goal.png support_files/pixmaps/live_game/yellow.png support_files/pixmaps/live_game/scoring_chance.png support_files/pixmaps/live_game/injury_temp.png support_files/pixmaps/live_game/injury.png support_files/pixmaps/live_game/structure_change.png support_files/pixmaps/live_game/whistle.png support_files/pixmaps/live_game/miss.png support_files/pixmaps/live_game/foul.png support_files/pixmaps/live_game/cross_bar.png support_files/pixmaps/live_game/post.png support_files/pixmaps/live_game/penalty.png support_files/pixmaps/live_game/stadium_brkn.png support_files/pixmaps/live_game/stadium_fire.png support_files/pixmaps/live_game/stadium_riot.png support_files/pixmaps/live_game/header.png support_files/pixmaps/live_game/goal_own.png support_files/pixmaps/live_game/lost_possession.png support_files/pixmaps/boost_anti.png support_files/pixmaps/boost_off.png support_files/pixmaps/boost_on.png support_files/pixmaps/style_def.png support_files/pixmaps/style_atk.png support_files/pixmaps/style_bal.png support_files/pixmaps/style_all_atk.png support_files/pixmaps/style_all_def.png support_files/pixmaps/table_up.png support_files/pixmaps/table_down.png support_files/pixmaps/table_stay.png support_files/pixmaps/flags/flag_germany.png support_files/pixmaps/flags/flag_ch.png support_files/pixmaps/flags/flag_cz.png support_files/pixmaps/flags/flag_dk.png support_files/pixmaps/flags/flag_es.png support_files/pixmaps/flags/flag_eu.png support_files/pixmaps/flags/flag_gr.png support_files/pixmaps/flags/flag_hu.png support_files/pixmaps/flags/flag_nl.png support_files/pixmaps/flags/flag_pl.png support_files/pixmaps/flags/flag_pt.png support_files/pixmaps/flags/flag_ru.png support_files/pixmaps/flags/flag_tr.png support_files/pixmaps/flags/flag_uk.png support_files/pixmaps/flags/flag_belgium.png support_files/pixmaps/flags/flag_england.png support_files/pixmaps/flags/flag_france.png support_files/pixmaps/flags/flag_romania.png support_files/pixmaps/flags/flag_brazil.png support_files/pixmaps/flags/flag_scotland.png support_files/pixmaps/flags/flag_ecuador.png support_files/pixmaps/flags/flag_argentina.png support_files/pixmaps/flags/flag_bolivia.png support_files/pixmaps/flags/flag_chile.png support_files/pixmaps/flags/flag_colombia.png support_files/pixmaps/flags/flag_peru.png support_files/pixmaps/flags/flag_paraguay.png support_files/pixmaps/flags/flag_uruguay.png support_files/pixmaps/flags/flag_venezuela.png support_files/pixmaps/flags/flag_mexico.png support_files/pixmaps/flags/flag_italy.png support_files/definitions/brazil/country_brazil.xml support_files/definitions/brazil/cup_brazil_prom_games2.xml support_files/definitions/brazil/cup_brazil_prom_games3.xml support_files/definitions/brazil/cup_brazil_prom_games4.xml support_files/definitions/brazil/cup_brazil_prom_games5.xml support_files/definitions/brazil/cup_brazil_prom_games6.xml support_files/definitions/brazil/league_brazil1.xml support_files/definitions/brazil/league_brazil2.xml support_files/definitions/brazil/league_brazil3.xml support_files/definitions/brazil/league_brazil4.xml support_files/definitions/brazil/league_brazil5.xml support_files/definitions/brazil/league_brazil6.xml support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml support_files/definitions/brazil/cup_brazil_copa_do_brasil.xml support_files/definitions/brazil/cup_brazil_sul_am_br2.xml support_files/definitions/brazil/cup_brazil_sul_am_br1.xml support_files/definitions/brazil/cup_brazil_sul_am_br3.xml support_files/definitions/brazil/cup_brazil_sul_am_ar.xml support_files/definitions/brazil/cup_brazil_sul_am_br4.xml support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml support_files/definitions/brazil/cup_brazil_sul_am_knockout.xml support_files/definitions/short_leagues/league_czech1_short.xml support_files/definitions/short_leagues/league_denmark1_short.xml support_files/definitions/short_leagues/league_greece1_short.xml support_files/definitions/short_leagues/league_netherlands1_short.xml support_files/definitions/short_leagues/league_portugal1_short.xml support_files/definitions/short_leagues/league_russia1_short.xml support_files/definitions/short_leagues/league_spain1_short.xml support_files/definitions/short_leagues/league_switzerland1_short.xml support_files/definitions/short_leagues/league_turkey1_short.xml support_files/definitions/short_leagues/league_ukraine1_short.xml support_files/definitions/europe/cup_europe_champ_league.xml support_files/definitions/europe/cup_europe_cwc.xml support_files/definitions/europe/league_europe_div.xml support_files/definitions/europe/cup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_uefa.xml support_files/definitions/misc/cup_supercup_league_vs_cup.xml support_files/definitions/belgium/country_belgium.xml support_files/definitions/belgium/cup_belgium.xml support_files/definitions/belgium/league_belgium2.xml support_files/definitions/belgium/league_belgium1.xml support_files/definitions/belgium/league_belgium3a.xml support_files/definitions/belgium/league_belgium3b.xml support_files/definitions/belgium/league_belgium4a.xml support_files/definitions/belgium/league_belgium4b.xml support_files/definitions/belgium/league_belgium4c.xml support_files/definitions/belgium/league_belgium4d.xml support_files/definitions/belgium/cup_belgium_eindronde2.xml support_files/definitions/england/country_england.xml support_files/definitions/england/league_england1.xml support_files/definitions/england/league_england2.xml support_files/definitions/england/league_england3.xml support_files/definitions/england/league_england4.xml support_files/definitions/england/league_england5.xml support_files/definitions/england/cup_england_fa.xml support_files/definitions/england/cup_england_prom_games2.xml support_files/definitions/england/cup_england_league.xml support_files/definitions/england/cup_england_prom_games3.xml support_files/definitions/england/cup_england_prom_games4.xml support_files/definitions/romania/country_romania.xml support_files/definitions/romania/cup_romania_cupa.xml support_files/definitions/romania/cup_supercup_romania.xml support_files/definitions/romania/league_romania1.xml support_files/definitions/romania/league_romania2.xml support_files/definitions/romania/league_romania3.xml support_files/definitions/france/country_france.xml support_files/definitions/france/cup_france_coupe.xml support_files/definitions/france/league_france1.xml support_files/definitions/france/league_france2.xml support_files/definitions/france/league_france3.xml support_files/definitions/france/league_france4.xml support_files/definitions/france/league_france5.xml support_files/definitions/france/cup_france_ligue.xml support_files/definitions/germany/cup_germany_dfb.xml support_files/definitions/germany/league_germany1.xml support_files/definitions/germany/league_germany3a.xml support_files/definitions/germany/league_germany2.xml support_files/definitions/germany/league_germany3b.xml support_files/definitions/germany/country_germany.xml support_files/definitions/scotland/league_scotland1.xml support_files/definitions/scotland/country_scotland.xml support_files/definitions/scotland/league_scotland2.xml support_files/definitions/scotland/league_scotland3.xml support_files/definitions/scotland/league_scotland4.xml support_files/definitions/scotland/cup_scotland_fa.xml support_files/definitions/short_leagues_south_america/league_argentina1_short.xml support_files/definitions/short_leagues_south_america/league_bolivia1_short.xml support_files/definitions/short_leagues_south_america/league_chile1_short.xml support_files/definitions/short_leagues_south_america/league_colombia1_short.xml support_files/definitions/short_leagues_south_america/league_ecuador1_short.xml support_files/definitions/short_leagues_south_america/league_mexico1_short.xml support_files/definitions/short_leagues_south_america/league_paraguay1_short.xml support_files/definitions/short_leagues_south_america/league_peru1_short.xml support_files/definitions/short_leagues_south_america/league_uruguay1_short.xml support_files/definitions/short_leagues_south_america/league_venezuela1_short.xml support_files/definitions/italy/league_italy1.xml support_files/definitions/italy/cup_italy_coppa.xml support_files/definitions/italy/league_italy2.xml support_files/definitions/italy/league_italy3a.xml support_files/definitions/italy/league_italy3b.xml support_files/definitions/italy/country_italy.xml support_files/bygfoot_constants support_files/bygfoot_user.conf support_files/bygfoot_app support_files/bygfoot_help +SUPPORT_FILES = support_files/names/player_names.xml support_files/bygfoot.conf support_files/pixmaps/history/champion.png support_files/pixmaps/history/start_game.png support_files/pixmaps/history/fire_finance.png support_files/pixmaps/history/fire_failure.png support_files/pixmaps/history/job_offer.png support_files/pixmaps/history/end_season.png support_files/pixmaps/history/promoted.png support_files/pixmaps/history/relegated.png support_files/pixmaps/history/win_final.png support_files/pixmaps/history/lose_final.png support_files/pixmaps/history/reach_cup_round.png support_files/pixmaps/bygfoot_icon.png support_files/pixmaps/new_week.png support_files/pixmaps/preview.png support_files/pixmaps/transfers.png support_files/pixmaps/live_game/sub.png support_files/pixmaps/live_game/red.png support_files/pixmaps/live_game/save.png support_files/pixmaps/live_game/goal.png support_files/pixmaps/live_game/yellow.png support_files/pixmaps/live_game/scoring_chance.png support_files/pixmaps/live_game/injury_temp.png support_files/pixmaps/live_game/injury.png support_files/pixmaps/live_game/structure_change.png support_files/pixmaps/live_game/whistle.png support_files/pixmaps/live_game/miss.png support_files/pixmaps/live_game/foul.png support_files/pixmaps/live_game/cross_bar.png support_files/pixmaps/live_game/post.png support_files/pixmaps/live_game/penalty.png support_files/pixmaps/live_game/stadium_brkn.png support_files/pixmaps/live_game/stadium_fire.png support_files/pixmaps/live_game/stadium_riot.png support_files/pixmaps/live_game/header.png support_files/pixmaps/live_game/goal_own.png support_files/pixmaps/live_game/lost_possession.png support_files/pixmaps/boost_anti.png support_files/pixmaps/boost_off.png support_files/pixmaps/boost_on.png support_files/pixmaps/style_def.png support_files/pixmaps/style_atk.png support_files/pixmaps/style_bal.png support_files/pixmaps/style_all_atk.png support_files/pixmaps/style_all_def.png support_files/pixmaps/table_up.png support_files/pixmaps/table_down.png support_files/pixmaps/table_stay.png support_files/pixmaps/flags/flag_germany.png support_files/pixmaps/flags/flag_ch.png support_files/pixmaps/flags/flag_cz.png support_files/pixmaps/flags/flag_usa.png support_files/pixmaps/flags/flag_dk.png support_files/pixmaps/flags/flag_es.png support_files/pixmaps/flags/flag_eu.png support_files/pixmaps/flags/flag_gr.png support_files/pixmaps/flags/flag_hu.png support_files/pixmaps/flags/flag_nl.png support_files/pixmaps/flags/flag_pl.png support_files/pixmaps/flags/flag_pt.png support_files/pixmaps/flags/flag_ru.png support_files/pixmaps/flags/flag_tr.png support_files/pixmaps/flags/flag_uk.png support_files/pixmaps/flags/flag_belgium.png support_files/pixmaps/flags/flag_england.png support_files/pixmaps/flags/flag_france.png support_files/pixmaps/flags/flag_romania.png support_files/pixmaps/flags/flag_brazil.png support_files/pixmaps/flags/flag_scotland.png support_files/pixmaps/flags/flag_ecuador.png support_files/pixmaps/flags/flag_argentina.png support_files/pixmaps/flags/flag_bolivia.png support_files/pixmaps/flags/flag_chile.png support_files/pixmaps/flags/flag_colombia.png support_files/pixmaps/flags/flag_peru.png support_files/pixmaps/flags/flag_paraguay.png support_files/pixmaps/flags/flag_uruguay.png support_files/pixmaps/flags/flag_venezuela.png support_files/pixmaps/flags/flag_mexico.png support_files/pixmaps/flags/flag_italy.png support_files/definitions/brazil/country_brazil.xml support_files/definitions/brazil/cup_brazil_prom_games2.xml support_files/definitions/brazil/cup_brazil_prom_games3.xml support_files/definitions/brazil/cup_brazil_prom_games4.xml support_files/definitions/brazil/cup_brazil_prom_games5.xml support_files/definitions/brazil/cup_brazil_prom_games6.xml support_files/definitions/brazil/league_brazil1.xml support_files/definitions/brazil/league_brazil2.xml support_files/definitions/brazil/league_brazil3.xml support_files/definitions/brazil/league_brazil4.xml support_files/definitions/brazil/league_brazil5.xml support_files/definitions/brazil/league_brazil6.xml support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml support_files/definitions/brazil/cup_brazil_copa_do_brasil.xml support_files/definitions/brazil/cup_brazil_sul_am_br2.xml support_files/definitions/brazil/cup_brazil_sul_am_br1.xml support_files/definitions/brazil/cup_brazil_sul_am_br3.xml support_files/definitions/brazil/cup_brazil_sul_am_ar.xml support_files/definitions/brazil/cup_brazil_sul_am_br4.xml support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml support_files/definitions/brazil/cup_brazil_sul_am_knockout.xml support_files/definitions/short_leagues/league_czech1_short.xml support_files/definitions/short_leagues/league_denmark1_short.xml support_files/definitions/short_leagues/league_greece1_short.xml support_files/definitions/short_leagues/league_netherlands1_short.xml support_files/definitions/short_leagues/league_portugal1_short.xml support_files/definitions/short_leagues/league_russia1_short.xml support_files/definitions/short_leagues/league_spain1_short.xml support_files/definitions/short_leagues/league_switzerland1_short.xml support_files/definitions/short_leagues/league_turkey1_short.xml support_files/definitions/short_leagues/league_ukraine1_short.xml support_files/definitions/europe/cup_europe_champ_league.xml support_files/definitions/europe/cup_europe_cwc.xml support_files/definitions/europe/league_europe_div.xml support_files/definitions/europe/cup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_uefa.xml support_files/definitions/misc/cup_supercup_league_vs_cup.xml support_files/definitions/belgium/country_belgium.xml support_files/definitions/belgium/cup_belgium.xml support_files/definitions/belgium/league_belgium2.xml support_files/definitions/belgium/league_belgium1.xml support_files/definitions/belgium/league_belgium3a.xml support_files/definitions/belgium/league_belgium3b.xml support_files/definitions/belgium/league_belgium4a.xml support_files/definitions/belgium/league_belgium4b.xml support_files/definitions/belgium/league_belgium4c.xml support_files/definitions/belgium/league_belgium4d.xml support_files/definitions/belgium/cup_belgium_eindronde2.xml support_files/definitions/england/country_england.xml support_files/definitions/england/league_england1.xml support_files/definitions/england/league_england2.xml support_files/definitions/england/league_england3.xml support_files/definitions/england/league_england4.xml support_files/definitions/england/league_england5.xml support_files/definitions/england/cup_england_fa.xml support_files/definitions/england/cup_england_prom_games2.xml support_files/definitions/england/cup_england_league.xml support_files/definitions/england/cup_england_prom_games3.xml support_files/definitions/england/cup_england_prom_games4.xml support_files/definitions/romania/country_romania.xml support_files/definitions/romania/cup_romania_cupa.xml support_files/definitions/romania/cup_supercup_romania.xml support_files/definitions/romania/league_romania1.xml support_files/definitions/romania/league_romania2.xml support_files/definitions/romania/league_romania3.xml support_files/definitions/france/country_france.xml support_files/definitions/france/cup_france_coupe.xml support_files/definitions/france/league_france1.xml support_files/definitions/france/league_france2.xml support_files/definitions/france/league_france3.xml support_files/definitions/france/league_france4.xml support_files/definitions/france/league_france5.xml support_files/definitions/france/cup_france_ligue.xml support_files/definitions/usa/league_usa_econf.xml support_files/definitions/usa/country_usa.xml support_files/definitions/usa/league_usa_wconf.xml support_files/definitions/usa/cup_usa_eplayoff.xml support_files/definitions/usa/cup_usa_wplayoff.xml support_files/definitions/usa/cup_usa_mls_cup.xml support_files/definitions/germany/cup_germany_dfb.xml support_files/definitions/germany/league_germany1.xml support_files/definitions/germany/league_germany3a.xml support_files/definitions/germany/league_germany2.xml support_files/definitions/germany/league_germany3b.xml support_files/definitions/germany/country_germany.xml support_files/definitions/scotland/league_scotland1.xml support_files/definitions/scotland/country_scotland.xml support_files/definitions/scotland/league_scotland2.xml support_files/definitions/scotland/league_scotland3.xml support_files/definitions/scotland/league_scotland4.xml support_files/definitions/scotland/cup_scotland_fa.xml support_files/definitions/short_leagues_south_america/league_argentina1_short.xml support_files/definitions/short_leagues_south_america/league_bolivia1_short.xml support_files/definitions/short_leagues_south_america/league_chile1_short.xml support_files/definitions/short_leagues_south_america/league_colombia1_short.xml support_files/definitions/short_leagues_south_america/league_ecuador1_short.xml support_files/definitions/short_leagues_south_america/league_mexico1_short.xml support_files/definitions/short_leagues_south_america/league_paraguay1_short.xml support_files/definitions/short_leagues_south_america/league_peru1_short.xml support_files/definitions/short_leagues_south_america/league_uruguay1_short.xml support_files/definitions/short_leagues_south_america/league_venezuela1_short.xml support_files/definitions/italy/league_italy1.xml support_files/definitions/italy/cup_italy_coppa.xml support_files/definitions/italy/league_italy2.xml support_files/definitions/italy/league_italy3a.xml support_files/definitions/italy/league_italy3b.xml support_files/definitions/italy/country_italy.xml support_files/bygfoot_constants support_files/bygfoot_user.conf support_files/bygfoot_app support_files/bygfoot_help install-data-local: @$(NORMAL_INSTALL) diff --git a/src/Makefile.am b/src/Makefile.am index 6cea2aee..f392761e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ bygfoot_SOURCES = \ interface.c callbacks.h interface.h support.h \ lg_commentary.c free.h lg_commentary.h live_game.h misc.h option.h player.h variables.h \ league.c cup.h league.h maths.h misc.h option.h player.h stat.h table.h team.h user.h variables.h \ - live_game.c fixture.h free.h game.h game_gui.h lg_commentary.h live_game.h maths.h misc_callback_func.h option.h player.h support.h team.h treeview.h user.h variables.h window.h \ + live_game.c callbacks.h fixture.h free.h game.h game_gui.h lg_commentary.h live_game.h maths.h misc_callback_func.h option.h player.h support.h team.h treeview.h user.h variables.h window.h \ load_save.c callbacks.h file.h game_gui.h gui.h load_save.h option.h support.h user.h variables.h xml_loadsave_misc.h xml_loadsave_cup.h xml_loadsave_league.h xml_loadsave_season_stats.h xml_loadsave_transfers.h xml_loadsave_users.h xml.h \ main.c cup_struct.h misc_callbacks.h file.h free.h league_struct.h live_game.h main.h stat_struct.h transfer_struct.h variables.h window.h \ maths.c maths.h misc.h \ diff --git a/src/cup.c b/src/cup.c index 39eb238c..9bf48fda 100644 --- a/src/cup.c +++ b/src/cup.c @@ -804,10 +804,11 @@ query_cup_begins(const Cup *cup) g_array_index(league->fixtures, Fixture, league->fixtures->len - 1).week_round_number == week_round) || (league == NULL && - g_array_index(cup_temp->fixtures, Fixture, - cup_temp->fixtures->len - 1).week_number == week && - g_array_index(cup_temp->fixtures, Fixture, - cup_temp->fixtures->len - 1).week_round_number == week_round)) + (cup_temp->fixtures->len > 0 && + g_array_index(cup_temp->fixtures, Fixture, + cup_temp->fixtures->len - 1).week_number == week && + g_array_index(cup_temp->fixtures, Fixture, + cup_temp->fixtures->len - 1).week_round_number == week_round))) proceed = TRUE; } @@ -823,8 +824,9 @@ query_cup_begins(const Cup *cup) g_array_index(league->fixtures, Fixture, league->fixtures->len - 1).attendance == -1) || (league == NULL && - g_array_index(cup_temp->fixtures, Fixture, - cup_temp->fixtures->len - 1).attendance == -1)) + (cup_temp->fixtures->len > 0 && + g_array_index(cup_temp->fixtures, Fixture, + cup_temp->fixtures->len - 1).attendance == -1))) return FALSE; } @@ -843,3 +845,22 @@ cup_count_international(void) return return_value; } + +/** Find out whether the cup has a highlight property + and return the highlight colour. */ +gchar* +cup_get_highlight_colour(const Cup *cup) +{ + gint i; + gchar buf[SMALL]; + + for(i=0;iproperties->len;i++) + if(g_str_has_prefix(((GString*)g_ptr_array_index(cup->properties, i))->str, "highlight")) + { + sprintf(buf, "string_cup_%s", + ((GString*)g_ptr_array_index(cup->properties, i))->str); + return const_app(buf); + } + + return NULL; +} diff --git a/src/cup.h b/src/cup.h index 14a4c7a5..26bb1e61 100644 --- a/src/cup.h +++ b/src/cup.h @@ -14,7 +14,6 @@ #define query_cup_is_international(clid) query_cup_has_property(clid, "international") #define query_cup_is_national(clid) query_cup_has_property(clid, "national") #define query_cup_is_supercup(clid) query_cup_has_property(clid, "supercup") -#define query_cup_is_promotion(clid) query_cup_has_property(clid, "promotion") #define query_cup_hide(clid) query_cup_has_property(clid, "hide") Cup @@ -96,4 +95,7 @@ cup_get_winner(const Cup *cup); gint cup_count_international(void); +gchar* +cup_get_highlight_colour(const Cup *cup); + #endif diff --git a/src/fixture.c b/src/fixture.c index 951b5428..fd513e0d 100644 --- a/src/fixture.c +++ b/src/fixture.c @@ -570,11 +570,24 @@ gint fixture_get_free_round(gint week_number, gint clid) { gint i, j; - gint max_round = 1; + gint max_round = 0; - if(clid < ID_CUP_START || query_cup_is_promotion(clid)) + if(clid < ID_CUP_START) return 1; + for(i=0;ilen;i++) + { + for(j=0;jlen;j++) + if(g_array_index(lig(i).fixtures, Fixture, j).week_number == week_number) + { + max_round = 1; + break; + } + + if(max_round == 1) + break; + } + for(i=0;ilen;i++) { if(acp(i)->id != clid && diff --git a/src/live_game.c b/src/live_game.c index 9abd1134..2693dcd4 100644 --- a/src/live_game.c +++ b/src/live_game.c @@ -1,3 +1,4 @@ +#include "callbacks.h" #include "fixture.h" #include "free.h" #include "game.h" @@ -47,8 +48,16 @@ live_game_calculate_fixture(Fixture *fix) stat2 = fixture_user_team_involved(fix); statp = match; - if(show && window.live == NULL) - window.live = window_create(WINDOW_LIVE); + if(show) + { + cur_user = stat2; + on_button_back_to_main_clicked(NULL, NULL); + + if(window.live == NULL) + window.live = window_create(WINDOW_LIVE); + else + window_live_set_spinbuttons(); + } live_game_reset(match, fix, TRUE); game_initialize(fix); diff --git a/src/start_end.c b/src/start_end.c index f26fac5e..57ff50ad 100644 --- a/src/start_end.c +++ b/src/start_end.c @@ -332,9 +332,7 @@ start_week_round(void) cur_user = 0; game_gui_show_main(); - /*d ??*/ -/* if(week_round == 1) */ - user_event_show_next(); + user_event_show_next(); } } diff --git a/src/team.c b/src/team.c index 23634574..8dc4bc5c 100644 --- a/src/team.c +++ b/src/team.c @@ -966,26 +966,21 @@ query_team_plays(const Team *tm, gint week_number, gint week_round_number) { gint i, j; - if(week_round_number == 1) - { - for(i=0;ilen;i++) - for(j=0;jlen;j++) - if(g_array_index(lig(i).fixtures, Fixture, j).week_number == week_number && - g_array_index(lig(i).fixtures, Fixture, j).week_round_number == week_round_number && - (g_array_index(lig(i).fixtures, Fixture, j).teams[0] == tm || - g_array_index(lig(i).fixtures, Fixture, j).teams[1] == tm)) - return TRUE; - } - else - { - for(i=0;ilen;i++) - for(j=0;jfixtures->len;j++) - if(g_array_index(acp(i)->fixtures, Fixture, j).week_number == week_number && - g_array_index(acp(i)->fixtures, Fixture, j).week_round_number == week_round_number && - (g_array_index(acp(i)->fixtures, Fixture, j).teams[0] == tm || - g_array_index(acp(i)->fixtures, Fixture, j).teams[1] == tm)) - return TRUE; - } + for(i=0;ilen;i++) + for(j=0;jlen;j++) + if(g_array_index(lig(i).fixtures, Fixture, j).week_number == week_number && + g_array_index(lig(i).fixtures, Fixture, j).week_round_number == week_round_number && + (g_array_index(lig(i).fixtures, Fixture, j).teams[0] == tm || + g_array_index(lig(i).fixtures, Fixture, j).teams[1] == tm)) + return TRUE; + + for(i=0;ilen;i++) + for(j=0;jfixtures->len;j++) + if(g_array_index(acp(i)->fixtures, Fixture, j).week_number == week_number && + g_array_index(acp(i)->fixtures, Fixture, j).week_round_number == week_round_number && + (g_array_index(acp(i)->fixtures, Fixture, j).teams[0] == tm || + g_array_index(acp(i)->fixtures, Fixture, j).teams[1] == tm)) + return TRUE; return FALSE; } diff --git a/src/treeview.c b/src/treeview.c index bf9d6319..3fe7b2fb 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -1040,7 +1040,7 @@ treeview_create_single_table(GtkListStore *ls, const Table *table, gint number) GtkTreeIter iter; TableElement *elem = NULL; gchar buf[10][SMALL]; - gchar colour_bg[SMALL], colour_fg[SMALL]; + gchar *colour_bg = NULL, *colour_fg = NULL; treeview_table_write_header(ls, table, number); @@ -1063,11 +1063,11 @@ treeview_create_single_table(GtkListStore *ls, const Table *table, gint number) treeview_helper_insert_icon(ls, &iter, 2, const_app("string_treeview_table_stay_icon")); - treeview_helper_get_table_element_colours(table, i, colour_fg, colour_bg, FALSE); + treeview_helper_get_table_element_colours(table, i, &colour_fg, &colour_bg, FALSE); sprintf(buf[0], "%d", colour_bg, colour_fg, i + 1); - treeview_helper_get_table_element_colours(table, i, colour_fg, colour_bg, TRUE); + treeview_helper_get_table_element_colours(table, i, &colour_fg, &colour_bg, TRUE); sprintf(buf[1], "%s", colour_bg, colour_fg, elem->team->name->str); diff --git a/src/treeview_helper.c b/src/treeview_helper.c index c2bf2239..9428104a 100644 --- a/src/treeview_helper.c +++ b/src/treeview_helper.c @@ -413,38 +413,43 @@ treeview_helper_player_compare(GtkTreeModel *model, table would participate in an international cup and set the colours accordingly. */ gboolean -treeview_helper_get_table_element_colour_cups(const League *league, gint idx, gchar *colour_bg) +treeview_helper_get_table_element_colour_cups(const League *league, gint idx, gchar **colour_bg) { gint i, j, k; const CupRound *cup_round = NULL; gint league_idx = league_cup_get_index_from_clid(league->id) + 1; gchar buf[SMALL]; + gchar *cup_highlight_colour = NULL; sprintf(buf, "LEAGUE%d", league_idx); for(i=0;ilen;i++) - for(k=0;klen;k++) - { - cup_round = &g_array_index(cp(i).rounds, CupRound, k); - for(j=0;jchoose_teams->len;j++) - if(query_cup_is_international(cp(i).id) && - (strcmp(g_array_index(cup_round->choose_teams, CupChooseTeam, j).sid->str, buf) == 0 || - strcmp(g_array_index(cup_round->choose_teams, CupChooseTeam, j).sid->str, league->sid->str) == 0)) - { - if((idx + 1 >= g_array_index(cup_round->choose_teams, CupChooseTeam, j).start_idx && - idx + 1 <= g_array_index(cup_round->choose_teams, CupChooseTeam, j).end_idx && - g_array_index(cup_round->choose_teams, CupChooseTeam, j).randomly) || - (idx + 1 >= g_array_index(cup_round->choose_teams, CupChooseTeam, j).start_idx && - idx + 1 < g_array_index(cup_round->choose_teams, CupChooseTeam, j).start_idx + - g_array_index(cup_round->choose_teams, CupChooseTeam, j).number_of_teams && - !g_array_index(cup_round->choose_teams, CupChooseTeam, j).randomly)) - { - strcpy(colour_bg, const_app("string_treeview_table_cup")); - return TRUE; - } - } - } + { + cup_highlight_colour = cup_get_highlight_colour(&cp(i)); + if(cup_highlight_colour != NULL) + for(k=0;klen;k++) + { + cup_round = &g_array_index(cp(i).rounds, CupRound, k); + for(j=0;jchoose_teams->len;j++) + if(strcmp(g_array_index(cup_round->choose_teams, CupChooseTeam, j).sid->str, buf) == 0 || + strcmp(g_array_index(cup_round->choose_teams, CupChooseTeam, j).sid->str, league->sid->str) == 0) + { + if((idx + 1 >= g_array_index(cup_round->choose_teams, CupChooseTeam, j).start_idx && + idx + 1 <= g_array_index(cup_round->choose_teams, CupChooseTeam, j).end_idx && + g_array_index(cup_round->choose_teams, CupChooseTeam, j).randomly) || + (idx + 1 >= g_array_index(cup_round->choose_teams, CupChooseTeam, j).start_idx && + idx + 1 < g_array_index(cup_round->choose_teams, CupChooseTeam, j).start_idx + + g_array_index(cup_round->choose_teams, CupChooseTeam, j).number_of_teams && + !g_array_index(cup_round->choose_teams, CupChooseTeam, j).randomly)) + { + *colour_bg = cup_highlight_colour; + return TRUE; + } + } + } + } + return FALSE; } @@ -453,8 +458,8 @@ treeview_helper_get_table_element_colour_cups(const League *league, gint idx, gc @param idx The index of the element we're looking at. @param user Whether to take into account user colours. */ void -treeview_helper_get_table_element_colours(const Table *table, gint idx, gchar *colour_fg, - gchar *colour_bg, gboolean user) +treeview_helper_get_table_element_colours(const Table *table, gint idx, gchar **colour_fg, + gchar **colour_bg, gboolean user) { gint i; const TableElement *elem = &g_array_index(table->elements, TableElement, idx); @@ -462,25 +467,25 @@ treeview_helper_get_table_element_colours(const Table *table, gint idx, gchar *c const League *league = NULL; GPtrArray *cup_advance = NULL; - strcpy(colour_fg, const_app("string_treeview_helper_color_default_foreground")); - strcpy(colour_bg, const_app("string_treeview_helper_color_default_background")); + *colour_fg = const_app("string_treeview_helper_color_default_foreground"); + *colour_bg = const_app("string_treeview_helper_color_default_background"); if(user && elem->team == current_user.tm) { - strcpy(colour_fg, const_app("string_treeview_current_user_fg")); - strcpy(colour_bg, const_app("string_treeview_current_user_bg")); + *colour_fg = const_app("string_treeview_current_user_fg"); + *colour_bg = const_app("string_treeview_current_user_bg"); } else if(user && team_is_user(elem->team) != -1) { - strcpy(colour_fg, const_app("string_treeview_user_fg")); - strcpy(colour_bg, const_app("string_treeview_user_bg")); + *colour_fg = const_app("string_treeview_user_fg"); + *colour_bg = const_app("string_treeview_user_bg"); } else if(table->clid < ID_CUP_START) { league = league_from_clid(table->clid); if(idx + 1 == 1) - strcpy(colour_bg, const_app("string_treeview_table_first")); + *colour_bg = const_app("string_treeview_table_first"); else { if(!treeview_helper_get_table_element_colour_cups(league, idx, colour_bg)) @@ -491,14 +496,11 @@ treeview_helper_get_table_element_colours(const Table *table, gint idx, gchar *c if(pelem->ranks[0] <= idx + 1 && idx + 1 <= pelem->ranks[1]) { if(pelem->type == PROM_REL_PROMOTION) - strcpy(colour_bg, const_app("string_treeview_table_promotion")); + *colour_bg = const_app("string_treeview_table_promotion"); else if(pelem->type == PROM_REL_RELEGATION) - strcpy(colour_bg, const_app("string_treeview_table_relegation")); + *colour_bg = const_app("string_treeview_table_relegation"); } } - - if(query_league_rank_in_prom_games(league, idx + 1)) - strcpy(colour_bg, const_app("string_treeview_table_promgames")); } } } @@ -508,7 +510,7 @@ treeview_helper_get_table_element_colours(const Table *table, gint idx, gchar *c fixture_get_round_robin_advance(cup_from_clid(table->clid), table->round); for(i=0;ilen;i++) if((Team*)g_ptr_array_index(cup_advance, i) == elem->team) - strcpy(colour_bg, const_app("string_treeview_table_promotion")); + *colour_bg = const_app("string_treeview_table_promotion"); free_g_ptr_array(&cup_advance); } diff --git a/src/treeview_helper.h b/src/treeview_helper.h index d6aaa412..91e403b5 100644 --- a/src/treeview_helper.h +++ b/src/treeview_helper.h @@ -38,15 +38,15 @@ gint treeview_helper_get_col_number_column (GtkTreeViewColumn *col); void -treeview_helper_get_table_element_colours(const Table *table, gint idx, gchar *colour_fg, - gchar *colour_bg, gboolean user); +treeview_helper_get_table_element_colours(const Table *table, gint idx, gchar **colour_fg, + gchar **colour_bg, gboolean user); + +gboolean +treeview_helper_get_table_element_colour_cups(const League *league, gint idx, gchar **colour_bg); void treeview_helper_set_user_colours(const Team *tm, gchar **colour_bg, gchar **colour_fg); -gboolean -treeview_helper_get_table_element_colour_cups(const League *league, gint idx, gchar *colour_bg); - PlayerListAttribute treeview_helper_get_attributes_from_scout(gint scout); diff --git a/src/window.c b/src/window.c index e7d4e120..d941b9d5 100644 --- a/src/window.c +++ b/src/window.c @@ -242,6 +242,19 @@ window_show_yesno(gchar *text) gtk_label_set_text(GTK_LABEL(lookup_widget(window.yesno, "label_yesno")), text); } +/** Set the spinbuttons in the live window + to the correct values. */ +void +window_live_set_spinbuttons(void) +{ + gtk_spin_button_set_value( + GTK_SPIN_BUTTON(lookup_widget(window.live, "spinbutton_speed")), + (gfloat)option_int("int_opt_user_live_game_speed", &usr(stat2).options)); + gtk_spin_button_set_value( + GTK_SPIN_BUTTON(lookup_widget(window.live, "spinbutton_verbosity")), + (gfloat)option_int("int_opt_user_live_game_verbosity", &usr(stat2).options)); +} + /** Create and show a window. Which one depends on the argument. @param window_type An integer telling us which window to create. @@ -295,12 +308,7 @@ window_create(gint window_type) } strcpy(buf, "Bygfoot Live game"); wind = window.live; - gtk_spin_button_set_value( - GTK_SPIN_BUTTON(lookup_widget(wind, "spinbutton_speed")), - (gfloat)option_int("int_opt_user_live_game_speed", &usr(stat2).options)); - gtk_spin_button_set_value( - GTK_SPIN_BUTTON(lookup_widget(wind, "spinbutton_verbosity")), - (gfloat)option_int("int_opt_user_live_game_verbosity", &usr(stat2).options)); + window_live_set_spinbuttons(); break; case WINDOW_WARNING: if(window.warning != NULL) diff --git a/src/window.h b/src/window.h index 880c230e..740cd0ef 100644 --- a/src/window.h +++ b/src/window.h @@ -56,4 +56,7 @@ window_show_options(void); void window_show_menu_player(GdkEvent *event); +void +window_live_set_spinbuttons(void); + #endif diff --git a/support_files/bygfoot_app b/support_files/bygfoot_app index 034389bc..bc95176e 100644 --- a/support_files/bygfoot_app +++ b/support_files/bygfoot_app @@ -86,9 +86,9 @@ string_treeview_symbol_bg lightgrey string_treeview_table_first tomato string_treeview_table_promotion lightblue string_treeview_table_relegation lightgreen -string_treeview_table_promgames khaki -string_treeview_table_best_advance khaki -string_treeview_table_cup lightblue +string_cup_highlight1 lightblue +string_cup_highlight2 khaki +string_cup_highlight3 gold # colour for expenses in the finances string_treeview_finances_expenses_fg red diff --git a/support_files/definitions/belgium/cup_belgium_eindronde2.xml b/support_files/definitions/belgium/cup_belgium_eindronde2.xml index 38961671..69b496ca 100644 --- a/support_files/definitions/belgium/cup_belgium_eindronde2.xml +++ b/support_files/definitions/belgium/cup_belgium_eindronde2.xml @@ -5,7 +5,7 @@ belgium_eindronde2 1000 national - promotion + highlight2 3 diff --git a/support_files/definitions/brazil/cup_brazil_prom_games2.xml b/support_files/definitions/brazil/cup_brazil_prom_games2.xml index 4a1902dc..7f524337 100644 --- a/support_files/definitions/brazil/cup_brazil_prom_games2.xml +++ b/support_files/definitions/brazil/cup_brazil_prom_games2.xml @@ -6,7 +6,7 @@ brazil_prom_games2 1000 national - promotion + highlight2 diff --git a/support_files/definitions/brazil/cup_brazil_prom_games3.xml b/support_files/definitions/brazil/cup_brazil_prom_games3.xml index 3c6fc3ea..f3585634 100644 --- a/support_files/definitions/brazil/cup_brazil_prom_games3.xml +++ b/support_files/definitions/brazil/cup_brazil_prom_games3.xml @@ -6,7 +6,7 @@ brazil_prom_games3 1000 national - promotion + highlight2 diff --git a/support_files/definitions/brazil/cup_brazil_prom_games4.xml b/support_files/definitions/brazil/cup_brazil_prom_games4.xml index 5712f8bc..3413e6e5 100644 --- a/support_files/definitions/brazil/cup_brazil_prom_games4.xml +++ b/support_files/definitions/brazil/cup_brazil_prom_games4.xml @@ -6,7 +6,7 @@ brazil_prom_games4 1000 national - promotion + highlight2 diff --git a/support_files/definitions/brazil/cup_brazil_prom_games5.xml b/support_files/definitions/brazil/cup_brazil_prom_games5.xml index 0e68aa58..8f209647 100644 --- a/support_files/definitions/brazil/cup_brazil_prom_games5.xml +++ b/support_files/definitions/brazil/cup_brazil_prom_games5.xml @@ -6,7 +6,7 @@ brazil_prom_games5 1000 national - promotion + highlight2 diff --git a/support_files/definitions/brazil/cup_brazil_prom_games6.xml b/support_files/definitions/brazil/cup_brazil_prom_games6.xml index 43a67c77..db13639e 100644 --- a/support_files/definitions/brazil/cup_brazil_prom_games6.xml +++ b/support_files/definitions/brazil/cup_brazil_prom_games6.xml @@ -6,7 +6,7 @@ brazil_prom_games6 1000 national - promotion + highlight2 diff --git a/support_files/definitions/brazil/cup_brazil_sul_am_ar.xml b/support_files/definitions/brazil/cup_brazil_sul_am_ar.xml index 1b52b94e..ef67c518 100644 --- a/support_files/definitions/brazil/cup_brazil_sul_am_ar.xml +++ b/support_files/definitions/brazil/cup_brazil_sul_am_ar.xml @@ -7,7 +7,9 @@ 500 15 1 + 1005 international + hide diff --git a/support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml b/support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml index e93ce287..eb7d8e3a 100644 --- a/support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml +++ b/support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml @@ -7,7 +7,9 @@ 500 15 1 + 1005 international + hide diff --git a/support_files/definitions/brazil/cup_brazil_sul_am_br1.xml b/support_files/definitions/brazil/cup_brazil_sul_am_br1.xml index 6a89e2b9..d82bb3c0 100644 --- a/support_files/definitions/brazil/cup_brazil_sul_am_br1.xml +++ b/support_files/definitions/brazil/cup_brazil_sul_am_br1.xml @@ -8,6 +8,8 @@ 15 2 international + hide + highlight1 @@ -19,10 +21,23 @@ brazil1 - 3 + 1 1 - 12 - 1 + 1 + + + + brazil1 + 1 + 5 + 5 + + + + brazil1 + 1 + 9 + 9 diff --git a/support_files/definitions/brazil/cup_brazil_sul_am_br2.xml b/support_files/definitions/brazil/cup_brazil_sul_am_br2.xml index 912f0196..f9ade887 100644 --- a/support_files/definitions/brazil/cup_brazil_sul_am_br2.xml +++ b/support_files/definitions/brazil/cup_brazil_sul_am_br2.xml @@ -7,7 +7,10 @@ 1005 15 2 + 1005 international + hide + highlight1 @@ -19,12 +22,25 @@ brazil1 - 3 - 1 - 12 - 1 + 1 + 2 + 2 - + + + brazil1 + 1 + 6 + 6 + + + + brazil1 + 1 + 10 + 10 + + diff --git a/support_files/definitions/brazil/cup_brazil_sul_am_br3.xml b/support_files/definitions/brazil/cup_brazil_sul_am_br3.xml index 420d46dc..f34c0ae8 100644 --- a/support_files/definitions/brazil/cup_brazil_sul_am_br3.xml +++ b/support_files/definitions/brazil/cup_brazil_sul_am_br3.xml @@ -7,7 +7,10 @@ 1005 15 2 + 1005 international + hide + highlight1 @@ -19,12 +22,25 @@ brazil1 - 3 - 1 - 12 - 1 + 1 + 3 + 3 - + + + brazil1 + 1 + 7 + 7 + + + + brazil1 + 1 + 11 + 11 + + diff --git a/support_files/definitions/brazil/cup_brazil_sul_am_br4.xml b/support_files/definitions/brazil/cup_brazil_sul_am_br4.xml index bf45cc54..60ca07de 100644 --- a/support_files/definitions/brazil/cup_brazil_sul_am_br4.xml +++ b/support_files/definitions/brazil/cup_brazil_sul_am_br4.xml @@ -7,7 +7,10 @@ 1005 15 2 + 1005 international + hide + highlight1 @@ -19,12 +22,25 @@ brazil1 - 3 - 1 - 12 - 1 + 1 + 4 + 4 - + + + brazil1 + 1 + 8 + 8 + + + + brazil1 + 1 + 12 + 12 + + diff --git a/support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml b/support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml index 990843ed..546769a9 100644 --- a/support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml +++ b/support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml @@ -7,7 +7,9 @@ 500 15 1 + 1005 international + hide diff --git a/support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml b/support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml index d8446d43..232a5633 100644 --- a/support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml +++ b/support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml @@ -7,7 +7,9 @@ 500 15 1 + 1005 international + hide diff --git a/support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml b/support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml index 93404319..b12e17af 100644 --- a/support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml +++ b/support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml @@ -7,7 +7,9 @@ 500 15 1 + 1005 international + hide diff --git a/support_files/definitions/england/cup_england_prom_games2.xml b/support_files/definitions/england/cup_england_prom_games2.xml index b267f391..37de010f 100644 --- a/support_files/definitions/england/cup_england_prom_games2.xml +++ b/support_files/definitions/england/cup_england_prom_games2.xml @@ -6,7 +6,7 @@ england_prom_games2 1000 national - promotion + highlight2 diff --git a/support_files/definitions/england/cup_england_prom_games3.xml b/support_files/definitions/england/cup_england_prom_games3.xml index 8245f41f..bbccf451 100644 --- a/support_files/definitions/england/cup_england_prom_games3.xml +++ b/support_files/definitions/england/cup_england_prom_games3.xml @@ -6,7 +6,7 @@ england_prom_games3 1000 national - promotion + highlight2 diff --git a/support_files/definitions/england/cup_england_prom_games4.xml b/support_files/definitions/england/cup_england_prom_games4.xml index efb01686..77f109f2 100644 --- a/support_files/definitions/england/cup_england_prom_games4.xml +++ b/support_files/definitions/england/cup_england_prom_games4.xml @@ -6,7 +6,7 @@ england_prom_games4 1000 national - promotion + highlight2 diff --git a/support_files/definitions/europe/cup_europe_champ_league.xml b/support_files/definitions/europe/cup_europe_champ_league.xml index 1783698f..ab46d616 100644 --- a/support_files/definitions/europe/cup_europe_champ_league.xml +++ b/support_files/definitions/europe/cup_europe_champ_league.xml @@ -11,6 +11,7 @@ 0 4 international + highlight1 diff --git a/support_files/definitions/europe/cup_europe_cwc.xml b/support_files/definitions/europe/cup_europe_cwc.xml index 49d7e64c..1e794eaa 100644 --- a/support_files/definitions/europe/cup_europe_cwc.xml +++ b/support_files/definitions/europe/cup_europe_cwc.xml @@ -11,6 +11,7 @@ 0 4 international + highlight1 diff --git a/support_files/definitions/europe/cup_europe_uefa.xml b/support_files/definitions/europe/cup_europe_uefa.xml index d1e442c4..0a684b9a 100644 --- a/support_files/definitions/europe/cup_europe_uefa.xml +++ b/support_files/definitions/europe/cup_europe_uefa.xml @@ -11,6 +11,7 @@ 44 0 international + highlight1