From 9752fe858afa78522d8acb43971c73e162f23b25 Mon Sep 17 00:00:00 2001 From: gyboth Date: Thu, 8 Sep 2005 16:37:10 +0000 Subject: [PATCH] "Porting issues." --- Makefile.am | 2 +- src/load_save.c | 44 ++++++++++++++++++++++----------- support_files/bygfoot_constants | 13 +++++----- 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index 826c6b39..cfa3eb8f 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/belgium support_files/definitions/germany support_files/definitions/romania support_files/definitions/france support_files/definitions/scotland support_files/definitions/brazil support_files/definitions/short_leagues_south_america support_files/definitions/italy support_files/definitions/usa support_files/definitions/argentina support_files/definitions/wales support_files/definitions/ireland support_files/definitions/scg support_files/definitions/australia support_files/definitions/england support_files/definitions/europe support_files/definitions/misc support_files/definitions/short_leagues support_files/definitions/poland support_files/definitions/spain support_files/definitions/aus_victoria support_files/definitions/aus_victoria/CVS support_files/definitions/bulgaria 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/names/player_names_australia.xml support_files/names/player_names_poland.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/symbols/flag_australia.png support_files/pixmaps/symbols/flag_spain.png support_files/pixmaps/symbols/flag_aus_victoria.png support_files/pixmaps/symbols/flag_turkey.png support_files/pixmaps/symbols/flag_bulgaria.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/pixmaps/menu_youth_academy.png support_files/pixmaps/menu_mmatches.png support_files/definitions/belgium/country_belgium.xml support_files/definitions/belgium/cup_belgium.xml support_files/definitions/belgium/cup_belgium_eindronde2.xml support_files/definitions/belgium/league_belgium1.xml support_files/definitions/belgium/league_belgium2.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_eindronde3.xml support_files/definitions/belgium/cup_belgium_eindronde4.xml support_files/definitions/belgium/cup_belgium_beker.xml support_files/definitions/germany/cup_germany_dfb.xml support_files/definitions/germany/league_germany1.xml support_files/definitions/germany/league_germany2.xml support_files/definitions/germany/league_germany3a.xml support_files/definitions/germany/league_germany3b.xml support_files/definitions/germany/country_germany.xml support_files/definitions/romania/country_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_supercup_romania.xml support_files/definitions/romania/cup_romania_cupa.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/scotland/league_scotland1.xml support_files/definitions/scotland/country_scotland.xml support_files/definitions/scotland/league_scotland2.xml support_files/definitions/scotland/cup_scotland_league.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/brazil/country_brazil.xml support_files/definitions/brazil/cup_brazil_copa_do_brasil.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_ar.xml support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml support_files/definitions/brazil/cup_brazil_sul_am_br1.xml support_files/definitions/brazil/cup_brazil_sul_am_br2.xml support_files/definitions/brazil/cup_brazil_sul_am_br3.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_knockout.xml support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml support_files/definitions/brazil/cup_brazil_libertadores.xml support_files/definitions/brazil/cup_supercup_brazil_intercontinental.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/country_italy.xml support_files/definitions/italy/cup_italy_coppa.xml support_files/definitions/italy/league_italy1.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/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/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/definitions/australia/league_australia1.xml support_files/definitions/australia/cup_australia_a_league.xml support_files/definitions/australia/country_australia.xml support_files/definitions/australia/cup_australia_playoffs.xml support_files/definitions/england/country_england.xml support_files/definitions/england/cup_england_fa.xml support_files/definitions/england/cup_england_league.xml support_files/definitions/england/cup_england_prom_games2.xml support_files/definitions/england/cup_england_prom_games3.xml support_files/definitions/england/cup_england_prom_games4.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_prom_games5.xml support_files/definitions/europe/cup_europe_champ_league.xml support_files/definitions/europe/cup_europe_cwc.xml support_files/definitions/europe/cup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_uefa.xml support_files/definitions/europe/league_europe_div.xml support_files/definitions/europe/cup_supercup_europe_intercontinental.xml support_files/definitions/misc/cup_supercup_league_vs_cup.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_switzerland1_short.xml support_files/definitions/short_leagues/league_turkey1_short.xml support_files/definitions/short_leagues/league_ukraine1_short.xml support_files/definitions/poland/league_poland1.xml support_files/definitions/poland/league_poland2.xml support_files/definitions/poland/league_poland3a.xml support_files/definitions/poland/league_poland3b.xml support_files/definitions/poland/league_poland3c.xml support_files/definitions/poland/league_poland3d.xml support_files/definitions/poland/country_poland.xml support_files/definitions/poland/cup_poland_prom_games1.xml support_files/definitions/poland/cup_poland_prom_games2.xml support_files/definitions/poland/cup_poland_puchar.xml support_files/definitions/spain/country_spain.xml support_files/definitions/spain/cup_spain_cdr.xml support_files/definitions/spain/cup_spain_prom_games_1.xml support_files/definitions/spain/cup_spain_prom_games_2.xml support_files/definitions/spain/cup_spain_prom_games_3.xml support_files/definitions/spain/cup_spain_prom_games_4.xml support_files/definitions/spain/cup_spain_rfef.xml support_files/definitions/spain/league_spain1.xml support_files/definitions/spain/league_spain2.xml support_files/definitions/spain/league_spain3a.xml support_files/definitions/spain/league_spain3b.xml support_files/definitions/spain/league_spain3c.xml support_files/definitions/spain/league_spain3d.xml support_files/definitions/aus_victoria/CVS/Root support_files/definitions/aus_victoria/CVS/Repository support_files/definitions/aus_victoria/CVS/Entries support_files/definitions/aus_victoria/country_aus_victoria.xml support_files/definitions/aus_victoria/cup_aus_vic_league.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff1.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff2.xml support_files/definitions/aus_victoria/league_aus_vic1.xml support_files/definitions/aus_victoria/league_aus_vic2nw.xml support_files/definitions/aus_victoria/league_aus_vic2se.xml support_files/definitions/aus_victoria/league_aus_vic3nw.xml support_files/definitions/aus_victoria/league_aus_vic3se.xml support_files/definitions/aus_victoria/league_aus_vicprem.xml support_files/definitions/aus_victoria/league_aus_vic4nw.xml support_files/definitions/aus_victoria/league_aus_vic4se.xml support_files/definitions/aus_victoria/league_aus_vic5nw.xml support_files/definitions/aus_victoria/league_aus_vic5se.xml support_files/definitions/aus_victoria/league_aus_vic6nw.xml support_files/definitions/aus_victoria/league_aus_vic6se.xml support_files/definitions/bulgaria/country_bulgaria.xml support_files/definitions/bulgaria/league_bulgaria1.xml support_files/definitions/bulgaria/league_bulgaria2a.xml support_files/definitions/bulgaria/league_bulgaria2b.xml support_files/definitions/bulgaria/league_bulgaria3a.xml support_files/definitions/bulgaria/league_bulgaria3b.xml support_files/definitions/bulgaria/league_bulgaria3c.xml support_files/definitions/bulgaria/league_bulgaria3d.xml support_files/definitions/bulgaria/cup_bulgaria_prom_games2.xml support_files/definitions/bulgaria/cup_bulgaria_national.xml support_files/definitions/bulgaria/cup_supercup_bulgaria.xml support_files/definitions/bulgaria.tar.bz2 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/lg_commentary/lg_commentary_nl.xml support_files/lg_commentary/lg_commentary_pl.xml support_files/bygfoot_app support_files/bygfoot_help support_files/bygfoot_lg_tokens +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/names/player_names_australia.xml support_files/names/player_names_poland.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/symbols/flag_australia.png support_files/pixmaps/symbols/flag_spain.png support_files/pixmaps/symbols/flag_aus_victoria.png support_files/pixmaps/symbols/flag_turkey.png support_files/pixmaps/symbols/flag_bulgaria.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/pixmaps/menu_youth_academy.png support_files/pixmaps/menu_mmatches.png support_files/definitions/belgium/country_belgium.xml support_files/definitions/belgium/cup_belgium.xml support_files/definitions/belgium/cup_belgium_eindronde2.xml support_files/definitions/belgium/league_belgium1.xml support_files/definitions/belgium/league_belgium2.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_eindronde3.xml support_files/definitions/belgium/cup_belgium_eindronde4.xml support_files/definitions/belgium/cup_belgium_beker.xml support_files/definitions/germany/cup_germany_dfb.xml support_files/definitions/germany/league_germany1.xml support_files/definitions/germany/league_germany2.xml support_files/definitions/germany/league_germany3a.xml support_files/definitions/germany/league_germany3b.xml support_files/definitions/germany/country_germany.xml support_files/definitions/romania/country_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_supercup_romania.xml support_files/definitions/romania/cup_romania_cupa.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/scotland/league_scotland1.xml support_files/definitions/scotland/country_scotland.xml support_files/definitions/scotland/league_scotland2.xml support_files/definitions/scotland/cup_scotland_league.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/brazil/country_brazil.xml support_files/definitions/brazil/cup_brazil_copa_do_brasil.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_ar.xml support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml support_files/definitions/brazil/cup_brazil_sul_am_br1.xml support_files/definitions/brazil/cup_brazil_sul_am_br2.xml support_files/definitions/brazil/cup_brazil_sul_am_br3.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_knockout.xml support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml support_files/definitions/brazil/cup_brazil_libertadores.xml support_files/definitions/brazil/cup_supercup_brazil_intercontinental.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/country_italy.xml support_files/definitions/italy/cup_italy_coppa.xml support_files/definitions/italy/league_italy1.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/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/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/definitions/australia/league_australia1.xml support_files/definitions/australia/cup_australia_a_league.xml support_files/definitions/australia/country_australia.xml support_files/definitions/australia/cup_australia_playoffs.xml support_files/definitions/england/country_england.xml support_files/definitions/england/cup_england_fa.xml support_files/definitions/england/cup_england_league.xml support_files/definitions/england/cup_england_prom_games2.xml support_files/definitions/england/cup_england_prom_games3.xml support_files/definitions/england/cup_england_prom_games4.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_prom_games5.xml support_files/definitions/europe/cup_europe_champ_league.xml support_files/definitions/europe/cup_europe_cwc.xml support_files/definitions/europe/cup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_uefa.xml support_files/definitions/europe/league_europe_div.xml support_files/definitions/europe/cup_supercup_europe_intercontinental.xml support_files/definitions/misc/cup_supercup_league_vs_cup.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_switzerland1_short.xml support_files/definitions/short_leagues/league_turkey1_short.xml support_files/definitions/short_leagues/league_ukraine1_short.xml support_files/definitions/poland/league_poland1.xml support_files/definitions/poland/league_poland2.xml support_files/definitions/poland/league_poland3a.xml support_files/definitions/poland/league_poland3b.xml support_files/definitions/poland/league_poland3c.xml support_files/definitions/poland/league_poland3d.xml support_files/definitions/poland/country_poland.xml support_files/definitions/poland/cup_poland_prom_games1.xml support_files/definitions/poland/cup_poland_prom_games2.xml support_files/definitions/poland/cup_poland_puchar.xml support_files/definitions/spain/country_spain.xml support_files/definitions/spain/cup_spain_cdr.xml support_files/definitions/spain/cup_spain_prom_games_1.xml support_files/definitions/spain/cup_spain_prom_games_2.xml support_files/definitions/spain/cup_spain_prom_games_3.xml support_files/definitions/spain/cup_spain_prom_games_4.xml support_files/definitions/spain/cup_spain_rfef.xml support_files/definitions/spain/league_spain1.xml support_files/definitions/spain/league_spain2.xml support_files/definitions/spain/league_spain3a.xml support_files/definitions/spain/league_spain3b.xml support_files/definitions/spain/league_spain3c.xml support_files/definitions/spain/league_spain3d.xml support_files/definitions/aus_victoria/CVS/Root support_files/definitions/aus_victoria/CVS/Repository support_files/definitions/aus_victoria/CVS/Entries support_files/definitions/aus_victoria/country_aus_victoria.xml support_files/definitions/aus_victoria/cup_aus_vic_league.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff1.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff2.xml support_files/definitions/aus_victoria/league_aus_vic1.xml support_files/definitions/aus_victoria/league_aus_vic2nw.xml support_files/definitions/aus_victoria/league_aus_vic2se.xml support_files/definitions/aus_victoria/league_aus_vic3nw.xml support_files/definitions/aus_victoria/league_aus_vic3se.xml support_files/definitions/aus_victoria/league_aus_vicprem.xml support_files/definitions/aus_victoria/league_aus_vic4nw.xml support_files/definitions/aus_victoria/league_aus_vic4se.xml support_files/definitions/aus_victoria/league_aus_vic5nw.xml support_files/definitions/aus_victoria/league_aus_vic5se.xml support_files/definitions/aus_victoria/league_aus_vic6nw.xml support_files/definitions/aus_victoria/league_aus_vic6se.xml support_files/definitions/bulgaria/league_bulgaria3d.xml support_files/definitions/bulgaria/league_bulgaria3c.xml support_files/definitions/bulgaria/league_bulgaria3b.xml support_files/definitions/bulgaria/league_bulgaria3a.xml support_files/definitions/bulgaria/league_bulgaria2b.xml support_files/definitions/bulgaria/league_bulgaria2a.xml support_files/definitions/bulgaria/country_bulgaria.xml support_files/definitions/bulgaria/league_bulgaria1.xml support_files/definitions/bulgaria/cup_bulgaria_prom_games2.xml support_files/definitions/bulgaria/cup_bulgaria_national.xml support_files/definitions/bulgaria/cup_supercup_bulgaria.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/lg_commentary/lg_commentary_nl.xml support_files/lg_commentary/lg_commentary_pl.xml support_files/bygfoot_app support_files/bygfoot_help support_files/bygfoot_lg_tokens install-data-local: @$(NORMAL_INSTALL) diff --git a/src/load_save.c b/src/load_save.c index 896a8462..9cedbd37 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -24,12 +24,12 @@ load_save_save_game(const gchar *filename) { gint i; gchar buf[SMALL]; - gchar *prefix = (g_str_has_suffix(filename, const_str("string_save_suffix"))) ? - g_strndup(filename, strlen(filename) - strlen(const_str("string_save_suffix"))) : + gchar *prefix = (g_str_has_suffix(filename, const_str("string_fs_save_suffix"))) ? + g_strndup(filename, strlen(filename) - strlen(const_str("string_fs_save_suffix"))) : g_strdup(filename); - gchar *fullname = (g_str_has_suffix(filename, const_str("string_save_suffix"))) ? + gchar *fullname = (g_str_has_suffix(filename, const_str("string_fs_save_suffix"))) ? g_strdup(filename) : - g_strdup_printf("%s%s", filename, const_str("string_save_suffix")); + g_strdup_printf("%s%s", filename, const_str("string_fs_save_suffix")); g_string_printf(save_file, "%s", fullname); @@ -136,13 +136,13 @@ gboolean load_save_load_game(const gchar* filename) { gchar buf[SMALL]; - gchar *fullname = (g_str_has_suffix(filename, const_str("string_save_suffix"))) ? + gchar *fullname = (g_str_has_suffix(filename, const_str("string_fs_save_suffix"))) ? g_strdup(filename) : - g_strdup_printf("%s%s", filename, const_str("string_save_suffix")); + g_strdup_printf("%s%s", filename, const_str("string_fs_save_suffix")); gchar *basename = g_path_get_basename(fullname), *dirname = g_path_get_dirname(fullname); - gchar *prefix = (g_str_has_suffix(basename, const_str("string_save_suffix"))) ? - g_strndup(basename, strlen(basename) - strlen(const_str("string_save_suffix"))) : + gchar *prefix = (g_str_has_suffix(basename, const_str("string_fs_save_suffix"))) ? + g_strndup(basename, strlen(basename) - strlen(const_str("string_fs_save_suffix"))) : g_strdup(basename); if(g_str_has_suffix(filename, "last_save")) @@ -182,9 +182,9 @@ load_save_load_game(const gchar* filename) GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX, _("Loading options...")); - sprintf(buf, "%s___options", prefix); + sprintf(buf, "%s%s%s___options", dirname, G_DIR_SEPARATOR_S, prefix); file_load_opt_file(buf, &options); - sprintf(buf, "%s___settings", prefix); + sprintf(buf, "%s%s%s___settings", dirname, G_DIR_SEPARATOR_S, prefix); file_load_opt_file(buf, &settings); language_set(language_get_code_index(opt_str("string_opt_language_code")) + 1); @@ -281,8 +281,16 @@ load_save_last_save_set(const gchar *filename) const gchar *home = g_get_home_dir(); FILE *fil = NULL; - sprintf(buf, "%s%s%s%ssaves%slast_save", home, G_DIR_SEPARATOR_S, - HOMEDIRNAME, G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); + if(os_is_unix) + sprintf(buf, "%s%s%s%ssaves%slast_save", home, G_DIR_SEPARATOR_S, + HOMEDIRNAME, G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); + else + { + gchar *pwd = g_get_current_dir(); + sprintf(buf, "%s%ssaves%slast_save", pwd, G_DIR_SEPARATOR_S, + G_DIR_SEPARATOR_S); + g_free(pwd); + } if(!file_my_fopen(buf, "w", &fil, FALSE)) return; @@ -301,8 +309,16 @@ load_save_last_save_get(void) FILE *fil = NULL; gint i = 0, c; - sprintf(buf, "%s%s%s%ssaves%slast_save", home, G_DIR_SEPARATOR_S, - HOMEDIRNAME, G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); + if(os_is_unix) + sprintf(buf, "%s%s%s%ssaves%slast_save", home, G_DIR_SEPARATOR_S, + HOMEDIRNAME, G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); + else + { + gchar *pwd = g_get_current_dir(); + sprintf(buf, "%s%ssaves%slast_save", pwd, G_DIR_SEPARATOR_S, + G_DIR_SEPARATOR_S); + g_free(pwd); + } if(!file_my_fopen(buf, "r", &fil, FALSE)) return NULL; diff --git a/support_files/bygfoot_constants b/support_files/bygfoot_constants index 24e6706c..b4546481 100644 --- a/support_files/bygfoot_constants +++ b/support_files/bygfoot_constants @@ -14,17 +14,16 @@ string_fs_uncompress_command_unix unzip string_fs_uncompress_switches_unix -qq -o string_fs_copy_file_command_unix cp string_fs_remove_file_command_unix rm +string_fs_save_suffix_unix .zip # commands for win32 filesystem interaction -string_fs_compress_command_win32 7za -string_fs_compress_switches_win32 a -tzip -string_fs_uncompress_command_win32 7za -string_fs_uncompress_switches_win32 e -y +string_fs_compress_command_win32 arj +string_fs_compress_switches_win32 a +string_fs_uncompress_command_win32 arj +string_fs_uncompress_switches_win32 e string_fs_copy_file_command_win32 copy string_fs_remove_file_command_win32 erase - -# suffix of compressed files -string_save_suffix .zip +string_fs_save_suffix_win32 .arj # number of seconds until messages disappear int_game_gui_message_duration 5