diff --git a/Makefile.am b/Makefile.am index 0e358aed..66c883f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ EXTRA_DIST = \ SUPPORT_DIRS = support_files support_files/names support_files/pixmaps support_files/pixmaps/history support_files/pixmaps/symbols support_files/pixmaps/live_game 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/definitions/argentina support_files/definitions/wales support_files/definitions/ireland support_files/definitions/scg support_files/lg_commentary -SUPPORT_FILES = support_files/names/player_names_brazil.xml support_files/names/player_names_england.xml support_files/names/player_names_belgium.xml support_files/names/player_names_usa.xml support_files/names/player_names_general.xml support_files/names/player_names_germany.xml support_files/names/player_names_romania.xml support_files/names/player_names_scotland.xml support_files/names/player_names_france.xml support_files/names/player_names_scg.xml support_files/names/player_names_italy.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/menu_history.png support_files/pixmaps/bygfoot_icon.png support_files/pixmaps/menu_league_stats.png support_files/pixmaps/new_week.png support_files/pixmaps/preview.png support_files/pixmaps/symbols/flag_germany.png support_files/pixmaps/symbols/flag_ch.png support_files/pixmaps/symbols/flag_cz.png support_files/pixmaps/symbols/flag_usa.png support_files/pixmaps/symbols/flag_dk.png support_files/pixmaps/symbols/flag_scg.png support_files/pixmaps/symbols/flag_es.png support_files/pixmaps/symbols/flag_eu.png support_files/pixmaps/symbols/flag_gr.png support_files/pixmaps/symbols/flag_hu.png support_files/pixmaps/symbols/flag_wales.png support_files/pixmaps/symbols/flag_nl.png support_files/pixmaps/symbols/flag_pt.png support_files/pixmaps/symbols/flag_ru.png support_files/pixmaps/symbols/flag_tr.png support_files/pixmaps/symbols/flag_uk.png support_files/pixmaps/symbols/flag_belgium.png support_files/pixmaps/symbols/flag_england.png support_files/pixmaps/symbols/flag_france.png support_files/pixmaps/symbols/flag_romania.png support_files/pixmaps/symbols/flag_brazil.png support_files/pixmaps/symbols/flag_scotland.png support_files/pixmaps/symbols/flag_ecuador.png support_files/pixmaps/symbols/flag_argentina.png support_files/pixmaps/symbols/flag_bolivia.png support_files/pixmaps/symbols/flag_chile.png support_files/pixmaps/symbols/flag_colombia.png support_files/pixmaps/symbols/flag_peru.png support_files/pixmaps/symbols/flag_paraguay.png support_files/pixmaps/symbols/flag_uruguay.png support_files/pixmaps/symbols/flag_venezuela.png support_files/pixmaps/symbols/flag_mexico.png support_files/pixmaps/symbols/flag_italy.png support_files/pixmaps/symbols/flag_ireland.png support_files/pixmaps/symbols/flag_n_ireland.png support_files/pixmaps/symbols/map_ireland.png support_files/pixmaps/symbols/flag_poland.png support_files/pixmaps/transfers.png support_files/pixmaps/menu_league_results.png support_files/pixmaps/menu_table.png support_files/pixmaps/menu_fixtures_comp.png support_files/pixmaps/menu_fixtures.png support_files/pixmaps/menu_boost.png support_files/pixmaps/menu_browse_tms.png support_files/pixmaps/menu_finances.png support_files/pixmaps/menu_last_match.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/menu_match_stats.png support_files/pixmaps/menu_physio.png support_files/pixmaps/boost_anti.png support_files/pixmaps/boost_off.png support_files/pixmaps/boost_on.png support_files/pixmaps/menu_player_browse.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/menu_player_contract.png support_files/pixmaps/menu_player_fire.png support_files/pixmaps/menu_player_info.png support_files/pixmaps/menu_player_put_transfer.png support_files/pixmaps/menu_player_remove_transfer.png support_files/pixmaps/table_up.png support_files/pixmaps/table_down.png support_files/pixmaps/table_stay.png support_files/pixmaps/menu_player_shoots.png support_files/pixmaps/menu_rearrange.png support_files/pixmaps/menu_scout.png support_files/pixmaps/menu_stadium.png support_files/pixmaps/menu_structure.png support_files/pixmaps/menu_style.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_libertadores.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/brazil/cup_supercup_brazil_intercontinental.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/europe/cup_supercup_europe_intercontinental.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/england/cup_england_prom_games5.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/romania/cup_romania_cupa2.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/cup_france_ligue.xml support_files/definitions/france/league_france4a.xml support_files/definitions/france/league_france4b.xml support_files/definitions/france/league_france4c.xml support_files/definitions/france/league_france4d.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/scotland/cup_scotland_league.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/definitions/argentina/league_argentina1.xml support_files/definitions/wales/league_wales1.xml support_files/definitions/wales/league_wales2a.xml support_files/definitions/wales/league_wales2b.xml support_files/definitions/wales/country_wales.xml support_files/definitions/wales/cup_wales_welsh.xml support_files/definitions/wales/cup_wales_challenge.xml support_files/definitions/wales/cup_wales_premier.xml support_files/definitions/wales/league_wales_english.xml support_files/definitions/wales/cup_wales_uefa_q.xml support_files/definitions/wales/cup_wales_uefa.xml support_files/definitions/wales/cup_wales_cl.xml support_files/definitions/wales/cup_wales_cl_q.xml support_files/definitions/ireland/country_ireland.xml support_files/definitions/ireland/cup_ireland_league.xml support_files/definitions/ireland/cup_ireland_senior.xml support_files/definitions/ireland/league_ireland1.xml support_files/definitions/ireland/league_n_ireland1.xml support_files/definitions/ireland/league_ireland2.xml support_files/definitions/ireland/cup_ireland_prom_games.xml support_files/definitions/ireland/cup_ireland_setanta.xml support_files/definitions/ireland/cup_ireland_cl.xml support_files/definitions/ireland/cup_ireland_cl_q.xml support_files/definitions/ireland/cup_ireland_uefa.xml support_files/definitions/ireland/cup_ireland_uefa_q.xml support_files/definitions/scg/country_scg.xml support_files/definitions/scg/cup_scg.xml support_files/definitions/scg/league_scg2a.xml support_files/definitions/scg/league_scg2b.xml support_files/definitions/scg/league_scg1.xml support_files/bygfoot_constants support_files/bygfoot_user.conf support_files/lg_commentary/lg_commentary_de.xml support_files/lg_commentary/lg_commentary_en.xml support_files/bygfoot_app support_files/bygfoot_help support_files/bygfoot.conf.sav +SUPPORT_FILES = support_files/names/player_names_brazil.xml support_files/names/player_names_england.xml support_files/names/player_names_belgium.xml support_files/names/player_names_usa.xml support_files/names/player_names_general.xml support_files/names/player_names_germany.xml support_files/names/player_names_romania.xml support_files/names/player_names_scotland.xml support_files/names/player_names_france.xml support_files/names/player_names_scg.xml support_files/names/player_names_italy.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/menu_history.png support_files/pixmaps/bygfoot_icon.png support_files/pixmaps/menu_league_stats.png support_files/pixmaps/new_week.png support_files/pixmaps/preview.png support_files/pixmaps/symbols/flag_germany.png support_files/pixmaps/symbols/flag_ch.png support_files/pixmaps/symbols/flag_cz.png support_files/pixmaps/symbols/flag_usa.png support_files/pixmaps/symbols/flag_dk.png support_files/pixmaps/symbols/flag_scg.png support_files/pixmaps/symbols/flag_es.png support_files/pixmaps/symbols/flag_eu.png support_files/pixmaps/symbols/flag_gr.png support_files/pixmaps/symbols/flag_hu.png support_files/pixmaps/symbols/flag_wales.png support_files/pixmaps/symbols/flag_nl.png support_files/pixmaps/symbols/flag_pt.png support_files/pixmaps/symbols/flag_ru.png support_files/pixmaps/symbols/flag_tr.png support_files/pixmaps/symbols/flag_uk.png support_files/pixmaps/symbols/flag_belgium.png support_files/pixmaps/symbols/flag_england.png support_files/pixmaps/symbols/flag_france.png support_files/pixmaps/symbols/flag_romania.png support_files/pixmaps/symbols/flag_brazil.png support_files/pixmaps/symbols/flag_scotland.png support_files/pixmaps/symbols/flag_ecuador.png support_files/pixmaps/symbols/flag_argentina.png support_files/pixmaps/symbols/flag_bolivia.png support_files/pixmaps/symbols/flag_chile.png support_files/pixmaps/symbols/flag_colombia.png support_files/pixmaps/symbols/flag_peru.png support_files/pixmaps/symbols/flag_paraguay.png support_files/pixmaps/symbols/flag_uruguay.png support_files/pixmaps/symbols/flag_venezuela.png support_files/pixmaps/symbols/flag_mexico.png support_files/pixmaps/symbols/flag_italy.png support_files/pixmaps/symbols/flag_ireland.png support_files/pixmaps/symbols/flag_n_ireland.png support_files/pixmaps/symbols/map_ireland.png support_files/pixmaps/symbols/flag_poland.png support_files/pixmaps/transfers.png support_files/pixmaps/menu_league_results.png support_files/pixmaps/menu_table.png support_files/pixmaps/menu_fixtures_comp.png support_files/pixmaps/menu_fixtures.png support_files/pixmaps/menu_boost.png support_files/pixmaps/menu_browse_tms.png support_files/pixmaps/menu_finances.png support_files/pixmaps/menu_last_match.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/menu_match_stats.png support_files/pixmaps/menu_physio.png support_files/pixmaps/boost_anti.png support_files/pixmaps/boost_off.png support_files/pixmaps/boost_on.png support_files/pixmaps/menu_player_browse.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/menu_player_contract.png support_files/pixmaps/menu_player_fire.png support_files/pixmaps/menu_player_info.png support_files/pixmaps/menu_player_put_transfer.png support_files/pixmaps/menu_player_remove_transfer.png support_files/pixmaps/table_up.png support_files/pixmaps/table_down.png support_files/pixmaps/table_stay.png support_files/pixmaps/menu_player_shoots.png support_files/pixmaps/menu_rearrange.png support_files/pixmaps/menu_scout.png support_files/pixmaps/menu_stadium.png support_files/pixmaps/menu_structure.png support_files/pixmaps/menu_style.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_libertadores.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/brazil/cup_supercup_brazil_intercontinental.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/europe/cup_supercup_europe_intercontinental.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/england/cup_england_prom_games5.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/cup_france_ligue.xml support_files/definitions/france/league_france4a.xml support_files/definitions/france/league_france4b.xml support_files/definitions/france/league_france4c.xml support_files/definitions/france/league_france4d.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/scotland/cup_scotland_league.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/definitions/argentina/league_argentina1.xml support_files/definitions/wales/league_wales1.xml support_files/definitions/wales/league_wales2a.xml support_files/definitions/wales/league_wales2b.xml support_files/definitions/wales/country_wales.xml support_files/definitions/wales/cup_wales_welsh.xml support_files/definitions/wales/cup_wales_challenge.xml support_files/definitions/wales/cup_wales_premier.xml support_files/definitions/wales/league_wales_english.xml support_files/definitions/wales/cup_wales_uefa_q.xml support_files/definitions/wales/cup_wales_uefa.xml support_files/definitions/wales/cup_wales_cl.xml support_files/definitions/wales/cup_wales_cl_q.xml support_files/definitions/ireland/country_ireland.xml support_files/definitions/ireland/cup_ireland_league.xml support_files/definitions/ireland/cup_ireland_senior.xml support_files/definitions/ireland/league_ireland1.xml support_files/definitions/ireland/league_n_ireland1.xml support_files/definitions/ireland/league_ireland2.xml support_files/definitions/ireland/cup_ireland_prom_games.xml support_files/definitions/ireland/cup_ireland_setanta.xml support_files/definitions/ireland/cup_ireland_cl.xml support_files/definitions/ireland/cup_ireland_cl_q.xml support_files/definitions/ireland/cup_ireland_uefa.xml support_files/definitions/ireland/cup_ireland_uefa_q.xml support_files/definitions/scg/country_scg.xml support_files/definitions/scg/cup_scg.xml support_files/definitions/scg/league_scg2a.xml support_files/definitions/scg/league_scg2b.xml support_files/definitions/scg/league_scg1.xml support_files/bygfoot_constants support_files/bygfoot_user.conf support_files/lg_commentary/lg_commentary_de.xml support_files/lg_commentary/lg_commentary_en.xml support_files/bygfoot_app support_files/bygfoot_help support_files/bygfoot.conf.sav support_files/bygfoot_lg_tokens install-data-local: @$(NORMAL_INSTALL) diff --git a/po/bygfoot.pot b/po/bygfoot.pot index 3769ba8b..c9480482 100644 --- a/po/bygfoot.pot +++ b/po/bygfoot.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-26 13:39+0200\n" +"POT-Creation-Date: 2005-06-28 04:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -71,7 +71,7 @@ msgid "" "player's value. Do you accept?" msgstr "" -#: src/callback_func.c:383 src/callbacks.c:533 +#: src/callback_func.c:383 src/callbacks.c:538 msgid "Your offer has been removed." msgstr "" @@ -148,94 +148,99 @@ msgstr "" msgid "The current game state is unsaved and will be lost. Continue?" msgstr "" -#: src/callbacks.c:146 src/callbacks.c:397 +#: src/callbacks.c:148 src/callbacks.c:402 msgid "Transfers are disabled in this country definition." msgstr "" -#: src/callbacks.c:150 +#: src/callbacks.c:152 msgid "Left click to make an offer. Right click to remove offer." msgstr "" -#: src/callbacks.c:157 +#: src/callbacks.c:153 +#, c-format +msgid "Transfer deadline is Week %d" +msgstr "" + +#: src/callbacks.c:162 msgid "The transfer deadline is over." msgstr "" -#: src/callbacks.c:166 src/callbacks.c:561 src/callbacks.c:578 +#: src/callbacks.c:171 src/callbacks.c:566 src/callbacks.c:583 msgid "You still have some transfer business to manage." msgstr "" -#: src/callbacks.c:170 +#: src/callbacks.c:175 msgid "At least one user didn't take his turn this week. Continue?" msgstr "" -#: src/callbacks.c:176 +#: src/callbacks.c:181 msgid "There are injured or banned players in one of the user teams. Continue?" msgstr "" -#: src/callbacks.c:381 +#: src/callbacks.c:386 msgid "This is your first season." msgstr "" -#: src/callbacks.c:399 src/callbacks.c:415 src/callbacks.c:431 -#: src/callbacks.c:449 src/callbacks.c:794 src/callbacks.c:810 +#: src/callbacks.c:404 src/callbacks.c:420 src/callbacks.c:436 +#: src/callbacks.c:454 src/callbacks.c:799 src/callbacks.c:815 msgid "You haven't selected a player." msgstr "" -#: src/callbacks.c:401 +#: src/callbacks.c:406 msgid "The player is already on the list." msgstr "" -#: src/callbacks.c:417 +#: src/callbacks.c:422 msgid "The player is not on the list." msgstr "" -#: src/callbacks.c:433 +#: src/callbacks.c:438 msgid "Your team can't have less than 11 players." msgstr "" -#: src/callbacks.c:454 +#: src/callbacks.c:459 msgid "Penalty/free kick shooter deselected." msgstr "" -#: src/callbacks.c:460 +#: src/callbacks.c:465 #, c-format msgid "%s will shoot penalties and free kicks when he plays." msgstr "" -#: src/callbacks.c:535 +#: src/callbacks.c:540 msgid "You haven't made an offer for the player." msgstr "" -#: src/callbacks.c:594 +#: src/callbacks.c:599 msgid "Enter a structure. The digits must sum up to 10." msgstr "" -#: src/callbacks.c:595 +#: src/callbacks.c:600 msgid "Structure" msgstr "" -#: src/callbacks.c:628 src/callbacks.c:644 +#: src/callbacks.c:633 src/callbacks.c:649 msgid "No match stored." msgstr "" -#: src/callbacks.c:722 src/game_gui.c:309 +#: src/callbacks.c:727 src/game_gui.c:309 msgid "Boost ON is disabled in this country definition." msgstr "" -#: src/callbacks.c:744 +#: src/callbacks.c:749 msgid "Finances are disabled in this country definition." msgstr "" -#: src/callbacks.c:749 +#: src/callbacks.c:754 msgid "" "Left-click: get loan; Right-click: pay back; Middle click: stadium window." msgstr "" -#: src/callbacks.c:763 +#: src/callbacks.c:768 msgid "Stadium management is disabled in this country definition." msgstr "" -#: src/callbacks.c:788 +#: src/callbacks.c:793 msgid "Contracts are disabled in this country definition." msgstr "" @@ -324,7 +329,7 @@ msgstr "" msgid "Next week you'll fire him and hire a new one." msgstr "" -#: src/game_gui.c:530 +#: src/game_gui.c:548 #, c-format msgid "" "The team owners have fired you because of financial mismanagement. Luckily, " @@ -332,7 +337,7 @@ msgid "" "some information on %s:" msgstr "" -#: src/game_gui.c:533 +#: src/game_gui.c:551 #, c-format msgid "" "The team owners have fired you because of unsuccessfulness. Luckily, the " @@ -340,49 +345,49 @@ msgid "" "information on %s:" msgstr "" -#: src/game_gui.c:536 +#: src/game_gui.c:554 #, c-format msgid "" "The owners of %s are deeply impressed by your success with %s and would like " "to hire you. Here's some information on %s:" msgstr "" -#: src/game_gui.c:539 +#: src/game_gui.c:557 msgid "Accept?" msgstr "" -#: src/game_gui.c:541 +#: src/game_gui.c:559 msgid " (NOTE: If you don't, the game is over for you.)" msgstr "" -#: src/game_gui.c:592 +#: src/game_gui.c:610 #, c-format msgid "Job offers set to %s." msgstr "" -#: src/game_gui.c:599 +#: src/game_gui.c:617 #, c-format msgid "Live game set to %s." msgstr "" -#: src/game_gui.c:606 +#: src/game_gui.c:624 #, c-format msgid "Overwrite set to %s." msgstr "" -#: src/game_gui.c:626 +#: src/game_gui.c:644 msgid "" "Bygfoot is a very intuitive and simple game, so there isn't a full-grown " "documentation. However, if you have trouble, there are a few places to go.\n" msgstr "" -#: src/game_gui.c:628 +#: src/game_gui.c:646 msgid "" "At the Bygfoot forums you can report bugs, ask for help and discuss the game " "(you don't have to register):\n" msgstr "" -#: src/game_gui.c:630 +#: src/game_gui.c:648 msgid "" "\n" "If you feel you've found out something about the game that has to be shared, " @@ -728,38 +733,38 @@ msgstr "" msgid "Next (W)" msgstr "" -#: src/lg_commentary.c:237 src/team.c:500 +#: src/lg_commentary.c:331 src/team.c:500 msgid "ALL OUT DEFEND" msgstr "" -#: src/lg_commentary.c:240 src/team.c:502 +#: src/lg_commentary.c:334 src/team.c:502 msgid "DEFEND" msgstr "" -#: src/lg_commentary.c:243 src/team.c:504 +#: src/lg_commentary.c:337 src/team.c:504 msgid "BALANCED" msgstr "" -#: src/lg_commentary.c:246 src/team.c:506 +#: src/lg_commentary.c:340 src/team.c:506 msgid "ATTACK" msgstr "" -#: src/lg_commentary.c:249 src/team.c:508 +#: src/lg_commentary.c:343 src/team.c:508 msgid "ALL OUT ATTACK" msgstr "" #. Boost value. -#: src/lg_commentary.c:252 src/team.c:516 +#: src/lg_commentary.c:346 src/team.c:516 msgid "ANTI" msgstr "" #. Boost value. -#: src/lg_commentary.c:255 src/team.c:519 +#: src/lg_commentary.c:349 src/team.c:519 msgid "OFF" msgstr "" #. Boost value. -#: src/lg_commentary.c:258 src/team.c:522 +#: src/lg_commentary.c:352 src/team.c:522 msgid "ON" msgstr "" @@ -767,71 +772,71 @@ msgstr "" msgid "Saving options/constants..." msgstr "" -#: src/load_save.c:59 +#: src/load_save.c:61 msgid "Saving leagues..." msgstr "" -#: src/load_save.c:70 +#: src/load_save.c:72 msgid "Saving cups..." msgstr "" -#: src/load_save.c:81 +#: src/load_save.c:83 msgid "Saving users..." msgstr "" -#: src/load_save.c:91 +#: src/load_save.c:93 msgid "Saving transfer list..." msgstr "" -#: src/load_save.c:101 +#: src/load_save.c:103 msgid "Saving season stats..." msgstr "" -#: src/load_save.c:111 +#: src/load_save.c:113 msgid "Saving miscellaneous..." msgstr "" -#: src/load_save.c:118 +#: src/load_save.c:120 msgid "Compressing savegame..." msgstr "" -#: src/load_save.c:126 src/load_save.c:257 +#: src/load_save.c:128 src/load_save.c:261 msgid "Done." msgstr "" -#: src/load_save.c:168 +#: src/load_save.c:170 msgid "Last save file not found." msgstr "" -#: src/load_save.c:176 +#: src/load_save.c:178 msgid "Uncompressing savegame..." msgstr "" -#: src/load_save.c:186 +#: src/load_save.c:188 msgid "Loading options/constants..." msgstr "" -#: src/load_save.c:200 +#: src/load_save.c:204 msgid "Loading leagues..." msgstr "" -#: src/load_save.c:210 +#: src/load_save.c:214 msgid "Loading cups..." msgstr "" -#: src/load_save.c:220 +#: src/load_save.c:224 msgid "Loading users..." msgstr "" -#: src/load_save.c:230 +#: src/load_save.c:234 msgid "Loading transfer list..." msgstr "" -#: src/load_save.c:240 +#: src/load_save.c:244 msgid "Loading season stats..." msgstr "" -#: src/load_save.c:250 +#: src/load_save.c:254 msgid "Loading miscellaneous..." msgstr "" @@ -2600,12 +2605,12 @@ msgstr "" msgid "Sponsorship offers" msgstr "" -#: src/xml.c:90 +#: src/xml.c:80 #, c-format msgid "Loading league: %s" msgstr "" -#: src/xml.c:150 +#: src/xml.c:140 #, c-format msgid "Loading cup: %s" msgstr "" diff --git a/src/callbacks.c b/src/callbacks.c index e7f66218..10de9bca 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -142,12 +142,17 @@ void on_button_transfers_clicked (GtkButton *button, gpointer user_data) { + gchar buf[SMALL]; + if(sett_int("int_opt_disable_transfers")) game_gui_print_message(_("Transfers are disabled in this country definition.")); else if(week < transfer_get_deadline()) { stat0 = STATUS_SHOW_TRANSFER_LIST; game_gui_print_message(_("Left click to make an offer. Right click to remove offer.")); + sprintf(buf, _("Transfer deadline is Week %d"), transfer_get_deadline()); + printf("buf %s \n", buf); + game_gui_print_message_with_delay(buf); treeview_show_transfer_list(GTK_TREE_VIEW(lookup_widget(window.main, "treeview_right"))); gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(window.main, "notebook_player")), 1); diff --git a/src/cup.c b/src/cup.c index ea0c6be5..4e8cc997 100644 --- a/src/cup.c +++ b/src/cup.c @@ -282,7 +282,7 @@ cup_load_choose_team(Cup *cup, GPtrArray *teams, const CupChooseTeam *ct) if(ct->number_of_teams != -1 && number_of_teams != ct->number_of_teams) { - g_warning("cup_load_choose_team (+): not enough teams (that don't participate in international cups yet) found in chooseteam %s for cup %s (%d specified, %d found) cup group %d.\n ", + g_warning("cup_load_choose_team (1): not enough teams (that don't participate in international cups yet) found in chooseteam %s for cup %s (%d specified, %d found) cup group %d.\n ", ct->sid->str, cup->name->str, ct->number_of_teams, number_of_teams, cup->group); main_exit_program(EXIT_CHOOSE_TEAM_ERROR, NULL); } @@ -321,7 +321,7 @@ cup_load_choose_team(Cup *cup, GPtrArray *teams, const CupChooseTeam *ct) if(number_of_teams != ct->number_of_teams) { - g_warning("cup_load_choose_team (*): not enough teams found in league 0 for chooseteam %s (%d; required: %d) in cup %s (group %d)\n", + g_warning("cup_load_choose_team (2): not enough teams found in league 0 for chooseteam %s (%d; required: %d) in cup %s (group %d)\n", ct->sid->str, number_of_teams, ct->number_of_teams, cup->name->str, cup->group); main_exit_program(EXIT_CHOOSE_TEAM_ERROR, NULL); } @@ -360,7 +360,7 @@ cup_load_choose_team(Cup *cup, GPtrArray *teams, const CupChooseTeam *ct) if(ct->number_of_teams != -1 && number_of_teams != ct->number_of_teams) { - g_warning("cup_load_choose_team(*): not enough teams (that don't participate in international cups yet) found in chooseteam %s for cup %s (%d specified, %d found) cup group %d.\n ", + g_warning("cup_load_choose_team(3): not enough teams (that don't participate in international cups yet) found in chooseteam %s for cup %s (%d specified, %d found) cup group %d.\n ", ct->sid->str, cup->name->str, ct->number_of_teams, number_of_teams, cup->group); main_exit_program(EXIT_CHOOSE_TEAM_ERROR, NULL); } diff --git a/src/file.c b/src/file.c index e8f205fd..340001ff 100644 --- a/src/file.c +++ b/src/file.c @@ -451,6 +451,7 @@ file_load_conf_files(void) file_load_opt_file(opt_str("string_opt_constants_file"), &constants); file_load_opt_file(opt_str("string_opt_appearance_file"), &constants_app); + file_load_opt_file("bygfoot_lg_tokens", &lg_tokens); } /** Load a user-specific conf file. diff --git a/src/free.c b/src/free.c index 24b6f816..b1861e02 100644 --- a/src/free.c +++ b/src/free.c @@ -456,6 +456,7 @@ free_variables(void) free_option_list(&settings, FALSE); free_option_list(&constants, FALSE); free_option_list(&constants_app, FALSE); + free_option_list(&lg_tokens, FALSE); for(i=0;ievent.type == LIVE_GAME_EVENT_STYLE_CHANGE_ALL_OUT_DEFEND || unit->event.type == LIVE_GAME_EVENT_STYLE_CHANGE_DEFEND || unit->event.type == LIVE_GAME_EVENT_STYLE_CHANGE_BALANCED || @@ -55,8 +55,10 @@ lg_commentary_generate(LiveGameUnit *unit, const Fixture *fix) unit->event.commentary = g_string_new(buf); - for(i=LG_TOKEN_ATTENDANCE;ilen;i++) + g_free(g_ptr_array_index(strings, i)); + + g_ptr_array_free(strings, TRUE); } /** Try to replace all special tokens in the string and write the result to dest. @@ -65,79 +67,167 @@ lg_commentary_generate(LiveGameUnit *unit, const Fixture *fix) @param dest The destination string. @return TRUE if we could replace all tokens, FALSE otherwise. */ gboolean -lg_commentary_replace_tokens(const gchar *string, gchar *strings[][2], gchar *dest) +lg_commentary_replace_tokens(const gchar *string, const GPtrArray *strings, gchar *dest) { gint i; + gboolean condition; + gchar buf[SMALL]; + const gchar *buf2 = NULL; + + strcpy(buf, string); - strcpy(dest, string); - - for(i=0;ilen;i++) { - if(query_misc_string_contains(dest, strings[i][0])) + if(query_misc_string_contains(buf, g_array_index(lg_tokens.list, Option, i).string_value->str)) { - if(strings[i][1] == NULL) + if(g_ptr_array_index(strings, i) == NULL) return FALSE; else - misc_string_replace_token(dest, strings[i][0], strings[i][1]); + misc_string_replace_token(buf, + g_array_index(lg_tokens.list, Option, i).string_value->str, + (gchar*)g_ptr_array_index(strings, i)); } } + misc_replace_sums(buf); + + if(buf[0] == '#') + { + buf2 = misc_parse(buf + 1, &condition); + strcpy(dest, buf2); + + return condition; + } + else + strcpy(dest, buf); + + + return TRUE; } /** Get the strings corresponding to the commentary tokens. */ void -lg_commentary_set_strings(gchar *strings[][2], const LiveGameUnit *unit, const Fixture *fix) +lg_commentary_set_strings(GPtrArray *strings, const LiveGameUnit *unit, const Fixture *fix) { + gint i, tmp_int = 1; gchar buf[SMALL]; - strings[LG_TOKEN_TEAM_HOME][0] = const_str("string_lg_commentary_token_team_home"); - strings[LG_TOKEN_TEAM_HOME][1] = fix->teams[0]->name->str; - - strings[LG_TOKEN_TEAM_AWAY][0] = const_str("string_lg_commentary_token_team_away"); - strings[LG_TOKEN_TEAM_AWAY][1] = fix->teams[1]->name->str; - - strings[LG_TOKEN_TEAM_IN_POSS][0] = const_str("string_lg_commentary_token_team_in_poss"); - strings[LG_TOKEN_TEAM_IN_POSS][1] = fix->teams[unit->possession]->name->str; - - - strings[LG_TOKEN_TEAM_NOT_IN_POSS][0] = const_str("string_lg_commentary_token_team_not_in_poss"); - strings[LG_TOKEN_TEAM_NOT_IN_POSS][1] = fix->teams[!unit->possession]->name->str; - - strings[LG_TOKEN_TEAM_LOSING][0] = const_str("string_lg_commentary_token_team_losing"); - strings[LG_TOKEN_TEAM_LOSING][1] = (unit->result[0] == unit->result[1]) ? NULL : - fix->teams[(unit->result[0] > unit->result[1])]->name->str; - - strings[LG_TOKEN_TEAM_WINNING][0] = const_str("string_lg_commentary_token_team_winning"); - strings[LG_TOKEN_TEAM_WINNING][1] = (unit->result[0] == unit->result[1]) ? NULL : - fix->teams[(unit->result[0] < unit->result[1])]->name->str; - - strings[LG_TOKEN_TEAM][0] = const_str("string_lg_commentary_token_team"); - strings[LG_TOKEN_TEAM][1] = (unit->event.team == -1) ? - NULL : fix->teams[unit->event.team]->name->str; - - strings[LG_TOKEN_PLAYER1][0] = const_str("string_lg_commentary_token_player1"); - strings[LG_TOKEN_PLAYER1][1] = (unit->event.player == -1) ? - NULL : lg_commentary_get_player_name(unit, fix, FALSE); - - strings[LG_TOKEN_PLAYER2][0] = const_str("string_lg_commentary_token_player2"); - strings[LG_TOKEN_PLAYER2][1] = (unit->event.player2 == -1) ? - NULL : lg_commentary_get_player_name(unit, fix, TRUE); - - strings[LG_TOKEN_ATTENDANCE][0] = const_str("string_lg_commentary_token_attendance"); - misc_print_grouped_int(fix->attendance, buf, FALSE); - strings[LG_TOKEN_ATTENDANCE][1] = g_strdup(buf); - - strings[LG_TOKEN_RESULT][0] = const_str("string_lg_commentary_token_result"); - sprintf(buf, "%d : %d", unit->result[0], unit->result[1]); - strings[LG_TOKEN_RESULT][1] = g_strdup(buf); - - strings[LG_TOKEN_MINUTE][0] = const_str("string_lg_commentary_token_minute"); - sprintf(buf, "%d", live_game_unit_get_minute(unit)); - strings[LG_TOKEN_MINUTE][1] = g_strdup(buf); - - strings[LG_TOKEN_EXTRA][0] = const_str("string_lg_commentary_token_extra"); - strings[LG_TOKEN_EXTRA][1] = lg_commentary_get_extra_data(unit, fix); + for(i=0;ilen;i++) + { + if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_team_home")) == 0) + g_ptr_array_add(strings, g_strdup(fix->teams[0]->name->str)); + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_team_away")) == 0) + g_ptr_array_add(strings, g_strdup(fix->teams[1]->name->str)); + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_team_in_poss")) == 0) + g_ptr_array_add(strings, g_strdup(fix->teams[unit->possession]->name->str)); + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_team_not_in_poss")) == 0) + g_ptr_array_add(strings, g_strdup(fix->teams[!unit->possession]->name->str)); + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_team_losing")) == 0) + { + if(unit->result[0] == unit->result[1]) + g_ptr_array_add(strings, NULL); + else + g_ptr_array_add(strings, g_strdup(fix->teams[(unit->result[0] > unit->result[1])]->name->str)); + } + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_team_winning")) == 0) + { + if(unit->result[0] == unit->result[1]) + g_ptr_array_add(strings, NULL); + else + g_ptr_array_add(strings, g_strdup(fix->teams[(unit->result[0] < unit->result[1])]->name->str)); + } + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_team")) == 0) + { + if(unit->event.team == -1) + g_ptr_array_add(strings, NULL); + else + g_ptr_array_add(strings, g_strdup(fix->teams[unit->event.team]->name->str)); + } + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_player1")) == 0) + g_ptr_array_add(strings, lg_commentary_get_player_name(unit, fix, FALSE)); + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_player2")) == 0) + g_ptr_array_add(strings, lg_commentary_get_player_name(unit, fix, TRUE)); + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_attendance")) == 0) + { + misc_print_grouped_int(fix->attendance, buf, FALSE); + g_ptr_array_add(strings, g_strdup(buf)); + } + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_time")) == 0) + { + sprintf(buf, "%d", unit->time); + g_ptr_array_add(strings, g_strdup(buf)); + } + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_minute")) == 0) + { + sprintf(buf, "%d", live_game_unit_get_minute(unit)); + g_ptr_array_add(strings, g_strdup(buf)); + } + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_minute_remaining")) == 0) + { + if(unit->time == LIVE_GAME_UNIT_TIME_EXTRA_TIME) + tmp_int = 120 - live_game_unit_get_minute(unit); + else if(unit->time == LIVE_GAME_UNIT_TIME_SECOND_HALF) + tmp_int = 90 - live_game_unit_get_minute(unit); + else if(unit->time == LIVE_GAME_UNIT_TIME_FIRST_HALF) + tmp_int = 45 - live_game_unit_get_minute(unit); + + if(unit->time == LIVE_GAME_UNIT_TIME_PENALTIES || + tmp_int <= 0) + g_ptr_array_add(strings, NULL); + else + { + sprintf(buf, "%d", tmp_int); + g_ptr_array_add(strings, g_strdup(buf)); + } + } + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_result")) == 0) + { + sprintf(buf, "%d : %d", unit->result[0], unit->result[1]); + g_ptr_array_add(strings, g_strdup(buf)); + } + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_goals_home")) == 0) + { + sprintf(buf, "%d", unit->result[0]); + g_ptr_array_add(strings, g_strdup(buf)); + } + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_goals_away")) == 0) + { + sprintf(buf, "%d", unit->result[1]); + g_ptr_array_add(strings, g_strdup(buf)); + } + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_goal_diff")) == 0) + { + sprintf(buf, "%d", ABS(unit->result[0] - unit->result[1])); + g_ptr_array_add(strings, strdup(buf)); + } + else if(strcmp(g_array_index(lg_tokens.list, Option, i).string_value->str, + lg_token("string_lg_commentary_token_extra")) == 0) + g_ptr_array_add(strings, lg_commentary_get_extra_data(unit, fix)); + else + { + g_warning("lg_commentary_set_strings: no rule found for token %s.", + g_array_index(lg_tokens.list, Option, i).string_value->str); + main_exit_program(EXIT_GENERAL, NULL); + } + } } /** Return the name of a player involved in the unit (or NULL). @@ -147,6 +237,10 @@ lg_commentary_get_player_name(const LiveGameUnit *unit, const Fixture *fix, gboo { gchar *return_value = NULL; + if((player2 && unit->event.player2 == -1) || + (!player2 && unit->event.player == -1)) + return NULL; + if(unit->event.type == LIVE_GAME_EVENT_GENERAL) return_value = (player2) ? player_get_last_name(player_of_id_team(fix->teams[unit->possession], diff --git a/src/lg_commentary.h b/src/lg_commentary.h index 8ba9bc92..4f574d3e 100644 --- a/src/lg_commentary.h +++ b/src/lg_commentary.h @@ -20,15 +20,23 @@ enum LGTokens LG_TOKEN_PLAYER2, LG_TOKEN_RESULT, LG_TOKEN_MINUTE, + LG_TOKEN_GOALS_HOME, + LG_TOKEN_GOALS_AWAY, + LG_TOKEN_GOAL_DIFF, LG_TOKEN_EXTRA, LG_TOKEN_END }; +#define lg_token(name) option_string(name, &lg_tokens) + gchar* lg_commentary_get_player_name(const LiveGameUnit *unit, const Fixture *fix, gint player); +gboolean +lg_commentary_replace_tokens(const gchar *string, const GPtrArray *strings, gchar *dest); + void -lg_commentary_set_strings(gchar *strings[][2], const LiveGameUnit *unit, const Fixture *fix); +lg_commentary_set_strings(GPtrArray *strings, const LiveGameUnit *unit, const Fixture *fix); void lg_commentary_generate(LiveGameUnit *unit, const Fixture *fix); @@ -36,9 +44,6 @@ lg_commentary_generate(LiveGameUnit *unit, const Fixture *fix); gchar* lg_commentary_get_extra_data(const LiveGameUnit *unit, const Fixture *fix); -gboolean -lg_commentary_replace_tokens(const gchar *string, gchar *strings[][2], gchar *dest); - void lg_commentary_load_commentary_file_from_option(void); diff --git a/src/load_save.c b/src/load_save.c index aab0782f..ca89a2ec 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -49,6 +49,8 @@ load_save_save_game(const gchar *filename) file_save_opt_file(buf, &options); sprintf(buf, "%s___constants", prefix); file_save_opt_file(buf, &constants); + sprintf(buf, "%s___settings", prefix); + file_save_opt_file(buf, &settings); if(debug > 60) printf("load_save_save leagues \n"); @@ -189,6 +191,8 @@ load_save_load_game(const gchar* filename) file_load_opt_file(buf, &options); sprintf(buf, "%s___constants", prefix); file_load_opt_file(buf, &constants); + sprintf(buf, "%s___settings", prefix); + file_load_opt_file(buf, &settings); language_set(language_get_code_index(opt_str("string_opt_language_code")) + 1); if(debug > 60) diff --git a/src/main.c b/src/main.c index a60e2167..f76ba820 100644 --- a/src/main.c +++ b/src/main.c @@ -55,9 +55,9 @@ main_init_variables(void) save_file = g_string_new(""); constants_app.list = settings.list = - constants.list = options.list = NULL; + constants.list = options.list = lg_tokens.list = NULL; constants_app.datalist = settings.datalist = - constants.datalist = options.datalist = NULL; + constants.datalist = options.datalist = lg_tokens.datalist = NULL; popups_active = 0; selected_row[0] = selected_row[1] = -1; diff --git a/src/misc.c b/src/misc.c index e357e7cc..6a5fa16e 100644 --- a/src/misc.c +++ b/src/misc.c @@ -221,33 +221,11 @@ misc_float_compare(gfloat first, gfloat second) return 0; } -/** Remove some of the first or last characters from src and copy - the rest to dest; no error-checking is done. */ -void -misc_truncate_string(const gchar *src, gchar *dest, gint number_of_chars) -{ - gint i; - gint num = ABS(number_of_chars); - - if(number_of_chars >= 0) - { - strncpy(dest, src, strlen(src) - num); - dest[strlen(src) - num] = '\0'; - return; - } - - for(i=0;i= num) - dest[i - num] = src[i]; - - dest[i - num] = '\0'; -} - /** Find out whether the first string contains the second string. */ gboolean query_misc_string_contains(const gchar *string, const gchar *text) { - gint i, j; + gint i; gint lens = strlen(string), lent = strlen(text); @@ -258,14 +236,8 @@ query_misc_string_contains(const gchar *string, const gchar *text) return (strcmp(text, string) == 0); for(i=0;i= strlen(token); i--) + gint i; + gchar buf[SMALL], buf2[SMALL]; + + if(strlen(string) < strlen(token)) + return; + + for(i=0;i' and '=') */ +const gchar* +misc_parse_comparison(const gchar *s, gboolean *result) +{ + gint value = 0; + s = misc_parse_expression(s, result); + s = misc_skip_spaces(s); + switch(*s) { + case '<': + if (*(s+1) == '=') + { + s = misc_parse_expression(s+2, &value); + *result = *result <= value; + } + else + { + s = misc_parse_expression(s+1, &value); + *result = *result < value; + } + break; + case '=': + s = misc_parse_expression(s+1, &value); + *result = *result == value; + break; + case '>': + if (*(s+1) == '=') + { + s = misc_parse_expression(s+2, &value); + *result = *result >= value; + } + else + { + s = misc_parse_expression(s+1, &value); + *result = *result > value; + } + break; + case '!': + if(*(s + 1) == '=') + { + s = misc_parse_expression(s+2, &value); + *result = *result != value; + } + break; + } + return s; +} + +const gchar* +misc_parse_and(const gchar *s, gboolean *result) +{ + gint value = 0; + s = misc_parse_comparison(s, result); + s = misc_skip_spaces(s); + while (*s == 'a' && *(s+1) == 'n' && *(s+2) == 'd') { + s = misc_parse_comparison(s + 3, &value); + *result = *result && value; + s = misc_skip_spaces(s); + } + + return s; +} + +const gchar* +misc_parse(const gchar *s, gboolean *result) +{ + gint value = 0; + s = misc_parse_and(s, result); + s = misc_skip_spaces(s); + while (*s == 'o' && *(s+1) == 'r') { + s = misc_parse_and(s + 2, &value); + *result = *result || value; + s = misc_skip_spaces(s); + } + return s; +} + diff --git a/src/misc.h b/src/misc.h index 99b42d6f..aa2be39b 100644 --- a/src/misc.h +++ b/src/misc.h @@ -45,7 +45,28 @@ query_misc_integer_is_in_g_array(gint item, GArray *array); void misc_string_replace_token(gchar *string, const gchar *token, const gchar *replacement); +void +misc_replace_sums(gchar *string); + gfloat misc_get_age_from_birth(gint birth_year, gint birth_month); +const gchar* +misc_skip_spaces(const gchar* s); + +const gchar* +misc_parse_value(const gchar *s, gint *value); + +const gchar* +misc_parse_expression(const gchar *s, gboolean *result); + +const gchar* +misc_parse_comparison(const gchar *s, gboolean *result); + +const gchar* +misc_parse_and(const gchar *s, gboolean *result); + +const gchar* +misc_parse(const gchar *s, gboolean *result); + #endif diff --git a/src/variables.h b/src/variables.h index a9ef19d5..c76fa8d9 100644 --- a/src/variables.h +++ b/src/variables.h @@ -31,6 +31,8 @@ OptionList constants; OptionList constants_app; /** Array with internal settings. */ OptionList settings; +/* Array holding live game tokens. */ +OptionList lg_tokens; /** The array containing the live game commentary strings. */ GPtrArray *lg_commentary[LIVE_GAME_EVENT_END]; diff --git a/src/xml.c b/src/xml.c index 21c3532e..55cc2223 100644 --- a/src/xml.c +++ b/src/xml.c @@ -21,16 +21,6 @@ #include "xml_loadsave_transfers.h" #include "xml_loadsave_users.h" -gint -xml_get_tag_from_name(const gchar *element_name) -{ - gchar buf[SMALL]; - - misc_truncate_string(element_name, buf, -1); - - return (gint)g_ascii_strtod(buf, NULL); -} - void xml_load_users(const gchar *dirname, const gchar *basename) { diff --git a/src/xml.h b/src/xml.h index 25f9912d..cdfa0a66 100644 --- a/src/xml.h +++ b/src/xml.h @@ -50,6 +50,8 @@ enum XmlTags #define xml_write_float(fil, value, tag, indent) fprintf(fil, "%s<_%d>%d\n", indent, tag, (gint)rint(value * 10000), tag) +#define xml_get_tag_from_name(name) (gint)g_ascii_strtod(name + 1, NULL) + void xml_load_users(const gchar *dirname, const gchar *basename); @@ -65,9 +67,6 @@ xml_load_cups(const gchar *dirname, const gchar *basename); void xml_load_cup(Cup *cup, const gchar *dirname, const gchar *basename, const GPtrArray *dir_contents); -gint -xml_get_tag_from_name(const gchar *element_name); - void xml_load_transfers(const gchar *dirname, const gchar *basename); diff --git a/src/xml_lg_commentary.c b/src/xml_lg_commentary.c index 594ef68c..35caa2e0 100644 --- a/src/xml_lg_commentary.c +++ b/src/xml_lg_commentary.c @@ -53,6 +53,7 @@ enum XmlLgCommentaryStates }; gint state, commentary_idx; +gchar condition[SMALL]; /** * The function called by the parser when an opening tag is read. @@ -73,7 +74,13 @@ xml_lg_commentary_read_start_element (GMarkupParseContext *context, else if(strcmp(element_name, TAG_EVENT_NAME) == 0) state = STATE_EVENT_NAME; else if(strcmp(element_name, TAG_EVENT_COMMENTARY) == 0) + { state = STATE_EVENT_COMMENTARY; + if(attribute_names[0] != NULL) + sprintf(condition, "#%s", attribute_values[0]); + else + strcpy(condition, ""); + } else if(strcmp(element_name, TAG_LG_COMMENTARY) != 0) g_warning("xml_lg_commentary_read_start_element: unknown tag: %s; I'm in state %d\n", element_name, state); @@ -114,14 +121,11 @@ xml_lg_commentary_read_text (GMarkupParseContext *context, GError **error) { gchar buf[text_len + 1]; - gint int_value; GString *commentary = NULL; strncpy(buf, text, text_len); buf[text_len] = '\0'; - int_value = (gint)g_ascii_strtod(buf, NULL); - if(state == STATE_EVENT_NAME) { if(strcmp(buf, EVENT_NAME_GENERAL) == 0) @@ -191,7 +195,8 @@ xml_lg_commentary_read_text (GMarkupParseContext *context, } else if(state == STATE_EVENT_COMMENTARY) { - commentary = g_string_new(buf); + commentary = g_string_new(""); + g_string_printf(commentary, "%s%s", condition, buf); g_ptr_array_add(lg_commentary[commentary_idx], commentary); } } diff --git a/support_files/bygfoot_constants b/support_files/bygfoot_constants index 291d3303..0950e34f 100644 --- a/support_files/bygfoot_constants +++ b/support_files/bygfoot_constants @@ -16,6 +16,8 @@ string_save_suffix .zip # number of seconds until messages disappear int_game_gui_message_duration 5 +# number of seconds to delay for delayed messages +int_game_gui_message_delay 3 # base values for stadium improvement: 500 seats and 5% int_stadium_improvement_base_seats 500 @@ -349,21 +351,6 @@ float_season_end_user_champ_addition 100 int_team_new_bound_upper 10 int_team_new_bound_lower 20 -# tokens in the live game commentary -string_lg_commentary_token_team_home _TH_ -string_lg_commentary_token_team_away _TA_ -string_lg_commentary_token_team_in_poss _TP_ -string_lg_commentary_token_team_not_in_poss _TN_ -string_lg_commentary_token_team_losing _TL_ -string_lg_commentary_token_team_winning _TW_ -string_lg_commentary_token_team _TT_ -string_lg_commentary_token_player1 _P1_ -string_lg_commentary_token_player2 _P2_ -string_lg_commentary_token_attendance _AT_ -string_lg_commentary_token_result _RE_ -string_lg_commentary_token_minute _MI_ -string_lg_commentary_token_extra _EX_ -_ # base probability that the ball gets from defending area # to midfield area. float_live_game_area_def_mid 5000 diff --git a/support_files/definitions/belgium/league_belgium1.xml b/support_files/definitions/belgium/league_belgium1.xml index 8139689b..97a4d9e2 100644 --- a/support_files/definitions/belgium/league_belgium1.xml +++ b/support_files/definitions/belgium/league_belgium1.xml @@ -5,7 +5,7 @@ flag_belgium.png 1 1 - 8000 + 6500 3 belgium @@ -64,14 +64,14 @@ Sint-Truiden - - Oostende - Brussel - Bergen + Zulte-Waregem + + + Roeselare diff --git a/support_files/definitions/belgium/league_belgium2.xml b/support_files/definitions/belgium/league_belgium2.xml index 944d78b7..3a184e0a 100644 --- a/support_files/definitions/belgium/league_belgium2.xml +++ b/support_files/definitions/belgium/league_belgium2.xml @@ -5,7 +5,7 @@ flag_belgium.png 1 1 - 7000 + 5000 3 belgium @@ -32,7 +32,7 @@ - Zulte Waregem + Oostende Geel @@ -44,7 +44,7 @@ Ronse - Roeselare + Bergen Antwerpen @@ -65,7 +65,7 @@ Deinze - Maasmechelen + Overpelt-Lommel Hamme @@ -80,10 +80,10 @@ Eupen - Aalst + Leuven - Wezet + Mechelen diff --git a/support_files/definitions/belgium/league_belgium3a.xml b/support_files/definitions/belgium/league_belgium3a.xml index c5e28530..fb4f1d65 100644 --- a/support_files/definitions/belgium/league_belgium3a.xml +++ b/support_files/definitions/belgium/league_belgium3a.xml @@ -5,7 +5,7 @@ flag_belgium.png 1 1 - 6000 + 4000 3 3 belgium @@ -32,10 +32,10 @@ Cappellen - K. Mechelen + Boom - Denderhoutem + Willebroek Turnhout @@ -56,7 +56,7 @@ Wetteren - Harelbeke + Diegem Waregem @@ -68,13 +68,13 @@ Bornem - Wevelgem + Woluwe - Lier II + Aalst - Evergem + West diff --git a/support_files/definitions/belgium/league_belgium3b.xml b/support_files/definitions/belgium/league_belgium3b.xml index ad1e1b3b..c2e4fd42 100644 --- a/support_files/definitions/belgium/league_belgium3b.xml +++ b/support_files/definitions/belgium/league_belgium3b.xml @@ -5,7 +5,7 @@ flag_belgium.png 1 1 - 6000 + 4000 3 3 belgium @@ -29,10 +29,10 @@ - Overpelt Lommel + Couillet - Leuven + Doornik Tongeren @@ -41,13 +41,13 @@ Sprimont - Woluwe + Montegnée Walhain - Diegem + Verviers La Calamine @@ -68,13 +68,13 @@ Namen - Veldwezelt + Wezet - Seraing + Leopoldsburg - F.B. boussu + F.B. Boussu diff --git a/support_files/definitions/belgium/league_belgium4a.xml b/support_files/definitions/belgium/league_belgium4a.xml index 8d3ca9ff..0bffba5a 100644 --- a/support_files/definitions/belgium/league_belgium4a.xml +++ b/support_files/definitions/belgium/league_belgium4a.xml @@ -5,7 +5,7 @@ flag_belgium.png 1 1 - 5000 + 3500 3 4 belgium @@ -23,10 +23,10 @@ - Doornik + V. Oostende - Gistel + Eine Zottegem @@ -53,22 +53,22 @@ Lauwe - L. Aalst + Evergem Sint-Eloois-Winkel - Eernegem + Oostnieuwkerke - Wielsbeke + Rumbeke Lovendegem - Ursel + Wevelgem diff --git a/support_files/definitions/belgium/league_belgium4b.xml b/support_files/definitions/belgium/league_belgium4b.xml index 8287766f..654614e6 100644 --- a/support_files/definitions/belgium/league_belgium4b.xml +++ b/support_files/definitions/belgium/league_belgium4b.xml @@ -5,7 +5,7 @@ flag_belgium.png 1 1 - 5000 + 3500 3 4 belgium @@ -22,53 +22,53 @@ - - Willebroek - - - Boom - - - Londerzeel - - - Lebbeke - - - Hoogstraten - Berchem - - Meldert - Dilbeek - Opstal + Grimbergen + + + Kampenhout Kontich + + Lebbeke + + + S. Lebeke + + + Londerzeel + + + Meldert + + + Opstal + + + Opwijk + Verrewinkel + + Schoten + + + Temse + + + Vorst + Wilrijk - - ZL Rijkevorsel - - - S. Lebbeke - - - Jette - - - Hoboken - diff --git a/support_files/definitions/belgium/league_belgium4c.xml b/support_files/definitions/belgium/league_belgium4c.xml index c088c16b..a3e5fe5e 100644 --- a/support_files/definitions/belgium/league_belgium4c.xml +++ b/support_files/definitions/belgium/league_belgium4c.xml @@ -5,7 +5,7 @@ flag_belgium.png 1 1 - 5000 + 3500 3 4 belgium @@ -23,7 +23,40 @@ - Mol + Aarschot + + + Mol-Wezel + + + ZL Rijkevorsel + + + Olen + + + Meerhout + + + Hoogstraten + + + Bree + + + Heist + + + Maasmechelen + + + Veltwezelt + + + Tessenderlo + + + Lichtaart Millen @@ -31,44 +64,11 @@ Spouwen Mopertingen - - Heist - - - Olen - - - Leopoldsburg - - - Bree - - - Grimbergen - - - Aarschot - - - Kampenhout - - - Meerhout - - - Diest - - - Overijse - - - Vilvoorde - Berkenbos - V. Maasmechelen + Lier II diff --git a/support_files/definitions/belgium/league_belgium4d.xml b/support_files/definitions/belgium/league_belgium4d.xml index 753d6a44..cbd62a0a 100644 --- a/support_files/definitions/belgium/league_belgium4d.xml +++ b/support_files/definitions/belgium/league_belgium4d.xml @@ -5,7 +5,7 @@ flag_belgium.png 1 1 - 5000 + 3500 3 4 belgium @@ -23,52 +23,52 @@ - Verviers + Luik - Montegnée - - - Couillet - - - Hoei - - - Couvin - - - Aarlen - - - Seilles + Seraing Spa - Bas-Oha + Huy - Meux - - - C. Luik + Malmundaria Hannuit + + Seilles + + + Ciney + + + Bas-Oha + + + Hamoir + + + Spy + + + Bertrige + + + Fleurus + + + Arlon + Bleid - Bercheux - - - Melen-Micheroux - - - Tamines + Couvin diff --git a/support_files/lg_commentary/lg_commentary_de.xml b/support_files/lg_commentary/lg_commentary_de.xml index f7aa2381..1f8b3fcc 100644 --- a/support_files/lg_commentary/lg_commentary_de.xml +++ b/support_files/lg_commentary/lg_commentary_de.xml @@ -232,11 +232,14 @@ foul_red _P2_ für eine Blutgrätsche _P2_ für absichtliches Handspiel - _P1_ wurde vom Platz gestellt _P2_ sieht die rote Karte _P2_ wird wegen wiederholtem Meckern vom Platz gestellt _P2_ wird nach einer Notbremse zum Duschen geschickt + + send_off + _P1_ wurde vom Platz gestellt + boost_change _TT_ hat den Boost auf _EX_ gestellt