From 5be5e30cb32eaceb4330fb5794bb699e9cd3e4cb Mon Sep 17 00:00:00 2001 From: gyboth Date: Fri, 8 Jul 2005 17:34:10 +0000 Subject: [PATCH] "YA loadsave." --- bygfoot.glade | 76 ++++----- po/bygfoot.pot | 158 +++++++++--------- src/Makefile.am | 7 +- src/interface.c | 353 +++++++++++++++++++-------------------- src/player.c | 6 +- src/xml.h | 4 +- src/xml_loadsave_teams.c | 240 +++----------------------- src/xml_loadsave_users.c | 68 +++++++- src/youth_academy.c | 4 - 9 files changed, 385 insertions(+), 531 deletions(-) diff --git a/bygfoot.glade b/bygfoot.glade index 2dd5f894..0ffdafb3 100644 --- a/bygfoot.glade +++ b/bygfoot.glade @@ -68,7 +68,7 @@ - + True gtk-revert-to-saved 1 @@ -136,7 +136,7 @@ - + True gtk-preferences 1 @@ -207,7 +207,7 @@ - + True menu_fixtures.png 0.5 @@ -228,7 +228,7 @@ - + True menu_fixtures_comp.png 0.5 @@ -249,7 +249,7 @@ - + True menu_table.png 0.5 @@ -270,7 +270,7 @@ - + True menu_league_results.png 0.5 @@ -297,7 +297,7 @@ - + True menu_league_stats.png 0.5 @@ -318,7 +318,7 @@ - + True menu_history.png 0.5 @@ -350,7 +350,7 @@ True - + True menu_style.png 0.5 @@ -428,7 +428,7 @@ True - + True menu_scout.png 0.5 @@ -495,7 +495,7 @@ True - + True menu_physio.png 0.5 @@ -588,7 +588,7 @@ True Best True - True + False @@ -598,7 +598,7 @@ True Good True - True + False menu_yc_best @@ -620,7 +620,7 @@ True Bad True - True + False menu_yc_best @@ -651,7 +651,7 @@ True - + True menu_boost.png 0.5 @@ -714,7 +714,7 @@ - + True gtk-undo 1 @@ -735,7 +735,7 @@ - + True menu_structure.png 0.5 @@ -757,7 +757,7 @@ - + True menu_rearrange.png 0.5 @@ -783,7 +783,7 @@ - + True menu_browse_tms.png 0.5 @@ -816,7 +816,7 @@ - + True menu_player_info.png 0.5 @@ -836,7 +836,7 @@ - + True menu_player_put_transfer.png 0.5 @@ -856,7 +856,7 @@ - + True menu_player_remove_transfer.png 0.5 @@ -876,7 +876,7 @@ - + True menu_player_contract.png 0.5 @@ -896,7 +896,7 @@ - + True menu_player_fire.png 0.5 @@ -916,7 +916,7 @@ - + True menu_player_shoots.png 0.5 @@ -951,7 +951,7 @@ - + True menu_player_browse.png 0.5 @@ -985,7 +985,7 @@ - + True menu_last_match.png 0.5 @@ -1006,7 +1006,7 @@ - + True menu_match_stats.png 0.5 @@ -1026,7 +1026,7 @@ - + True gtk-jump-to 1 @@ -1054,7 +1054,7 @@ - + True menu_history.png 0.5 @@ -1081,7 +1081,7 @@ - + True gtk-go-forward 1 @@ -1103,7 +1103,7 @@ - + True gtk-go-back 1 @@ -1125,7 +1125,7 @@ - + True gtk-justify-fill 1 @@ -1160,7 +1160,7 @@ - + True menu_finances.png 0.5 @@ -1181,7 +1181,7 @@ - + True menu_stadium.png 0.5 @@ -1214,7 +1214,7 @@ - + True gtk-dialog-info 1 @@ -1235,7 +1235,7 @@ - + True gtk-add 1 @@ -1256,7 +1256,7 @@ - + True gtk-help 1 diff --git a/po/bygfoot.pot b/po/bygfoot.pot index 649e1983..13d8dad8 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-07-08 11:22+0200\n" +"POT-Creation-Date: 2005-07-08 19:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -519,15 +519,15 @@ msgstr "" msgid "Best" msgstr "" -#: src/interface.c:495 src/interface.c:530 src/interface.c:575 +#: src/interface.c:495 src/interface.c:530 src/interface.c:574 msgid "Good" msgstr "" -#: src/interface.c:501 src/interface.c:536 src/interface.c:581 +#: src/interface.c:501 src/interface.c:536 src/interface.c:579 msgid "Average" msgstr "" -#: src/interface.c:507 src/interface.c:542 src/interface.c:587 +#: src/interface.c:507 src/interface.c:542 src/interface.c:585 msgid "Bad" msgstr "" @@ -547,255 +547,255 @@ msgstr "" msgid "Youth coach" msgstr "" -#: src/interface.c:593 +#: src/interface.c:590 msgid "Set investment" msgstr "" -#: src/interface.c:596 +#: src/interface.c:593 msgid "" "Set the percentage of your income you want to spend on the youth academy" msgstr "" -#: src/interface.c:598 +#: src/interface.c:595 msgid "Boost" msgstr "" -#: src/interface.c:609 +#: src/interface.c:606 msgid "On" msgstr "" -#: src/interface.c:615 +#: src/interface.c:612 msgid "Off" msgstr "" -#: src/interface.c:621 +#: src/interface.c:618 msgid "Anti" msgstr "" -#: src/interface.c:632 +#: src/interface.c:629 msgid "Reset player list" msgstr "" -#: src/interface.c:634 src/interface.c:1176 +#: src/interface.c:631 src/interface.c:1173 msgid "" "Reset player list to the formation at the beginning of the live game pause " "(right click on player list)" msgstr "" -#: src/interface.c:640 +#: src/interface.c:637 msgid "Enter custom structure" msgstr "" -#: src/interface.c:648 +#: src/interface.c:645 msgid "Rearrange team" msgstr "" -#: src/interface.c:651 +#: src/interface.c:648 msgid "" "Try to put the startup players onto their favoured positions and sort the " "substitutes (Ctrl-R or middle click)" msgstr "" -#: src/interface.c:665 +#: src/interface.c:662 msgid "Browse teams" msgstr "" -#: src/interface.c:673 +#: src/interface.c:670 msgid "_Player" msgstr "" -#: src/interface.c:680 src/interface.c:1726 +#: src/interface.c:677 src/interface.c:1723 msgid "Show info" msgstr "" -#: src/interface.c:688 src/interface.c:1730 +#: src/interface.c:685 src/interface.c:1727 msgid "Put on transfer list" msgstr "" -#: src/interface.c:696 src/interface.c:1734 +#: src/interface.c:693 src/interface.c:1731 msgid "Remove from transfer list" msgstr "" -#: src/interface.c:704 src/interface.c:1738 +#: src/interface.c:701 src/interface.c:1735 msgid "Offer new contract" msgstr "" -#: src/interface.c:712 src/interface.c:1742 +#: src/interface.c:709 src/interface.c:1739 msgid "Fire" msgstr "" -#: src/interface.c:720 src/interface.c:1746 +#: src/interface.c:717 src/interface.c:1743 msgid "Shoots penalties" msgstr "" -#: src/interface.c:728 src/interface.c:1750 +#: src/interface.c:725 src/interface.c:1747 msgid "Move to youth academy" msgstr "" -#: src/interface.c:737 +#: src/interface.c:734 msgid "Browse players" msgstr "" -#: src/interface.c:745 +#: src/interface.c:742 msgid "_User" msgstr "" -#: src/interface.c:752 +#: src/interface.c:749 msgid "Show last match" msgstr "" -#: src/interface.c:763 +#: src/interface.c:760 msgid "Show last match stats" msgstr "" -#: src/interface.c:774 +#: src/interface.c:771 msgid "Show coming matches" msgstr "" -#: src/interface.c:787 +#: src/interface.c:784 msgid "Show history" msgstr "" -#: src/interface.c:803 +#: src/interface.c:800 msgid "Next user" msgstr "" -#: src/interface.c:814 +#: src/interface.c:811 msgid "Previous user" msgstr "" -#: src/interface.c:825 +#: src/interface.c:822 msgid "Manage users" msgstr "" -#: src/interface.c:836 +#: src/interface.c:833 msgid "Fin_Stad" msgstr "" -#: src/interface.c:843 +#: src/interface.c:840 msgid "Show finances" msgstr "" -#: src/interface.c:854 +#: src/interface.c:851 msgid "Show stadium" msgstr "" -#: src/interface.c:865 +#: src/interface.c:862 msgid "_Help" msgstr "" -#: src/interface.c:872 src/misc2_interface.c:1036 +#: src/interface.c:869 src/misc2_interface.c:1036 msgid "About" msgstr "" -#: src/interface.c:880 src/misc2_interface.c:1050 +#: src/interface.c:877 src/misc2_interface.c:1050 msgid "Contributors" msgstr "" -#: src/interface.c:888 src/misc2_interface.c:1076 +#: src/interface.c:885 src/misc2_interface.c:1076 msgid "Help" msgstr "" -#: src/interface.c:904 +#: src/interface.c:901 msgid "Load game (Ctrl - O)" msgstr "" -#: src/interface.c:914 +#: src/interface.c:911 msgid "Save game (Ctrl - S)" msgstr "" -#: src/interface.c:924 +#: src/interface.c:921 msgid "Quit (Ctrl - Q)" msgstr "" -#: src/interface.c:944 +#: src/interface.c:941 msgid "Back to main menu (Esc)" msgstr "" -#: src/interface.c:957 +#: src/interface.c:954 msgid "Show transferlist (T)" msgstr "" -#: src/interface.c:975 +#: src/interface.c:972 msgid "Begin a new week (Space)" msgstr "" -#: src/interface.c:1006 +#: src/interface.c:1003 msgid " Season " msgstr "" -#: src/interface.c:1011 src/interface.c:1020 src/interface.c:1028 -#: src/interface.c:1088 +#: src/interface.c:1008 src/interface.c:1017 src/interface.c:1025 +#: src/interface.c:1085 msgid "1" msgstr "" -#: src/interface.c:1015 +#: src/interface.c:1012 msgid " Week " msgstr "" -#: src/interface.c:1024 +#: src/interface.c:1021 msgid " Round " msgstr "" -#: src/interface.c:1044 +#: src/interface.c:1041 msgid "Right click and left click to change your playing style" msgstr "" -#: src/interface.c:1054 +#: src/interface.c:1051 msgid "Right click and left click to change boost state" msgstr "" -#: src/interface.c:1083 +#: src/interface.c:1080 msgid "Rank " msgstr "" -#: src/interface.c:1097 +#: src/interface.c:1094 msgid "Money " msgstr "" -#: src/interface.c:1102 +#: src/interface.c:1099 msgid "2000" msgstr "" -#: src/interface.c:1114 +#: src/interface.c:1111 msgid "" "First value: average current skill of the first 11 players. Second value: " "average skill of all players." msgstr "" -#: src/interface.c:1120 +#: src/interface.c:1117 msgid "Av. skills: " msgstr "" -#: src/interface.c:1162 +#: src/interface.c:1159 msgid "Player list 1" msgstr "" -#: src/interface.c:1170 +#: src/interface.c:1167 msgid "Player list 2" msgstr "" -#: src/interface.c:1194 +#: src/interface.c:1191 msgid "Previous league/cup (1)" msgstr "" -#: src/interface.c:1207 +#: src/interface.c:1204 msgid "Next league/cup (2)" msgstr "" -#: src/interface.c:1220 +#: src/interface.c:1217 msgid "Previous (Q)" msgstr "" -#: src/interface.c:1233 +#: src/interface.c:1230 msgid "Next (W)" msgstr "" -#: src/interface.c:1800 +#: src/interface.c:1797 msgid "Move to team" msgstr "" -#: src/interface.c:1808 +#: src/interface.c:1805 msgid "Kick out of academy" msgstr "" @@ -998,7 +998,7 @@ msgid "Average skill:" msgstr "" #. Player status: ok. -#: src/misc2_interface.c:221 src/player.c:1136 src/treeview_helper.c:1089 +#: src/misc2_interface.c:221 src/player.c:1134 src/treeview_helper.c:1089 msgid "OK" msgstr "" @@ -1652,52 +1652,52 @@ msgstr "" msgid "You can't replace a banned player." msgstr "" -#: src/player.c:1032 +#: src/player.c:1030 #, c-format msgid "%s's contract expires in %.1f years." msgstr "" -#: src/player.c:1139 +#: src/player.c:1137 msgid "Concussion" msgstr "" -#: src/player.c:1142 +#: src/player.c:1140 msgid "Pulled muscle" msgstr "" -#: src/player.c:1145 +#: src/player.c:1143 msgid "Hamstring" msgstr "" -#: src/player.c:1148 +#: src/player.c:1146 msgid "Groin injury" msgstr "" -#: src/player.c:1151 +#: src/player.c:1149 msgid "Fractured ankle" msgstr "" -#: src/player.c:1154 +#: src/player.c:1152 msgid "Broken rib" msgstr "" -#: src/player.c:1157 +#: src/player.c:1155 msgid "Broken leg" msgstr "" -#: src/player.c:1160 +#: src/player.c:1158 msgid "Broken ankle" msgstr "" -#: src/player.c:1163 +#: src/player.c:1161 msgid "Broken arm" msgstr "" -#: src/player.c:1166 +#: src/player.c:1164 msgid "Broken shoulder" msgstr "" -#: src/player.c:1169 +#: src/player.c:1167 msgid "Torn crucial ligament" msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index e304dc66..104c8761 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,7 +32,7 @@ bygfoot_SOURCES = \ misc_callbacks.c callback_func.h callbacks.h game_gui.h game.h gui.h live_game.h load_save.h main.h maths.h misc_callback_func.h misc_callbacks.h option.h user.h variables.h window.h xml_country.h \ misc_callback_func.c callbacks.h finance.h game_gui.h game.h gui.h load_save.h maths.h misc_callback_func.h option.h start_end.h support.h treeview.h treeview_helper.h user.h variables.h window.h xml_country.h xml_name.h \ misc_interface.c misc_callbacks.h misc_interface.h support.h \ - misc2_callbacks.c callback_func.h callbacks.h debug.h finance.h game_gui.h load_save.h main.h misc2_callback_func.h misc2_callbacks.h misc2_interface.h player.h support.h transfer.h treeview.h treeview_helper.h user.h window.h \ + misc2_callbacks.c callback_func.h callbacks.h debug.h finance.h free.h game_gui.h load_save.h main.h misc2_callback_func.h misc2_callbacks.h misc2_interface.h player.h support.h transfer.h treeview.h treeview_helper.h user.h window.h \ misc2_callback_func.c callbacks.h file.h finance.h game_gui.h maths.h misc2_callback_func.h option.h player.h support.h team.h transfer.h treeview.h treeview_helper.h user.h window.h \ misc2_interface.c misc2_callbacks.h misc2_interface.h support.h \ name.c main.h name.h option.h variables.h xml_name.h \ @@ -41,7 +41,7 @@ bygfoot_SOURCES = \ options_callbacks.c file.h option_gui.h options_callbacks.h options_interface.h support.h user.h variables.h window.h \ options_interface.c options_callbacks.h options_interface.h support.h \ player.c cup.h fixture.h free.h game_gui.h league.h main.h maths.h misc.h name.h option.h player.h team.h transfer.h user.h \ - start_end.c cup.h file.h finance.h fixture.h free.h game_gui.h gui.h league.h live_game.h load_save.h main.h maths.h misc.h name.h option.h start_end.h stat.h table.h team.h transfer.h user.h variables.h xml_name.h \ + start_end.c cup.h file.h finance.h fixture.h free.h game_gui.h gui.h league.h live_game.h load_save.h main.h maths.h misc.h name.h option.h start_end.h stat.h table.h team.h transfer.h user.h variables.h xml_name.h youth_academy.h \ stat.c cup.h free.h league.h option.h player.h stat.h table_struct.h team.h variables.h \ support.c support.h \ table.c cup.h league.h misc.h table.h variables.h \ @@ -58,6 +58,7 @@ bygfoot_SOURCES = \ xml_loadsave_league_stat.c file.h misc.h stat.h team.h xml.h xml_loadsave_league_stat.h \ xml_loadsave_live_game.c cup.h file.h fixture.h league.h live_game.h misc.h option.h variables.h xml.h xml_loadsave_live_game.h \ xml_loadsave_misc.c cup.h file.h misc.h variables.h xml.h xml_loadsave_cup.h xml_loadsave_league.h xml_loadsave_misc.h \ + xml_loadsave_players.c player.h team.h xml.h xml_loadsave_players.h \ xml_loadsave_season_stats.c file.h free.h misc.h stat.h variables.h xml.h xml_loadsave_league_stat.h xml_loadsave_season_stats.h \ xml_loadsave_table.c file.h misc.h team.h xml.h xml_loadsave_table.h \ xml_loadsave_teams.c file.h misc.h player.h team.h xml.h xml_loadsave_teams.h \ @@ -69,7 +70,7 @@ bygfoot_SOURCES = \ xml_lg_commentary.c free.h lg_commentary.h live_game.h misc.h variables.h xml_lg_commentary.h \ xml_name.c file.h free.h misc.h name.h variables.h xml_name.h \ xml_team.c file.h free.h main.h misc.h option.h player.h team.h variables.h xml_team.h \ - youth_academy.c user.h youth_academy.h + youth_academy.c free.h maths.h name.h option.h player.h team.h user.h youth_academy.h bygfoot_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) diff --git a/src/interface.c b/src/interface.c index 8384a98c..88131b51 100644 --- a/src/interface.c +++ b/src/interface.c @@ -38,7 +38,7 @@ create_main_window (void) GtkWidget *menu_new; GtkWidget *menu_open; GtkWidget *menu_load_last_save; - GtkWidget *image1384; + GtkWidget *image1422; GtkWidget *menu_save; GtkWidget *menu_save_as; GtkWidget *trennlinie1; @@ -46,7 +46,7 @@ create_main_window (void) GtkWidget *menu_options; GtkWidget *menu_options_menu; GtkWidget *menu_preferences; - GtkWidget *image1385; + GtkWidget *image1423; GtkWidget *trennlinie7; GtkWidget *menu_job_offers; GtkWidget *menu_live_game; @@ -54,22 +54,22 @@ create_main_window (void) GtkWidget *menu_figures; GtkWidget *menu_figures_menu; GtkWidget *menu_fixtures_week; - GtkWidget *image1386; + GtkWidget *image1424; GtkWidget *menu_fixtures; - GtkWidget *image1387; + GtkWidget *image1425; GtkWidget *menu_tables; - GtkWidget *image1388; + GtkWidget *image1426; GtkWidget *menu_my_league_results; - GtkWidget *image1389; + GtkWidget *image1427; GtkWidget *trennlinie13; GtkWidget *menu_league_stats; - GtkWidget *image1390; + GtkWidget *image1428; GtkWidget *menu_season_history; - GtkWidget *image1391; + GtkWidget *image1429; GtkWidget *menu_team; GtkWidget *menu_team_menu; GtkWidget *menu_playing_style; - GtkWidget *image1392; + GtkWidget *image1430; GtkWidget *menu_playing_style_menu; GSList *menu_all_out_defend_group = NULL; GtkWidget *menu_all_out_defend; @@ -78,7 +78,7 @@ create_main_window (void) GtkWidget *menu_attack; GtkWidget *menu_all_out_attack; GtkWidget *menu_scout; - GtkWidget *image1393; + GtkWidget *image1431; GtkWidget *menu_scout_menu; GSList *menu_scout_best_group = NULL; GtkWidget *menu_scout_best; @@ -86,7 +86,7 @@ create_main_window (void) GtkWidget *menu_scout_average; GtkWidget *menu_scout_bad; GtkWidget *menu_physio; - GtkWidget *image1394; + GtkWidget *image1432; GtkWidget *menu_physio_menu; GSList *menu_physio_best_group = NULL; GtkWidget *menu_physio_best; @@ -105,7 +105,7 @@ create_main_window (void) GtkWidget *menu_yc_bad; GtkWidget *menu_set_investment; GtkWidget *menu_boost; - GtkWidget *image1395; + GtkWidget *image1433; GtkWidget *menu_boost_menu; GSList *menu_boost_on_group = NULL; GtkWidget *menu_boost_on; @@ -113,64 +113,64 @@ create_main_window (void) GtkWidget *menu_boost_anti; GtkWidget *trennlinie11; GtkWidget *menu_reset_players; - GtkWidget *image1396; + GtkWidget *image1434; GtkWidget *menu_custom_structure; - GtkWidget *image1397; + GtkWidget *image1435; GtkWidget *menu_rearrange_team; - GtkWidget *image1398; + GtkWidget *image1436; GtkWidget *trennlinie8; GtkWidget *menu_browse_teams; - GtkWidget *image1399; + GtkWidget *image1437; GtkWidget *menu_player; GtkWidget *menu_player_menu; GtkWidget *menu_show_info; - GtkWidget *image1400; + GtkWidget *image1438; GtkWidget *menu_put_on_transfer_list; - GtkWidget *image1401; + GtkWidget *image1439; GtkWidget *menu_remove_from_transfer_list; - GtkWidget *image1402; + GtkWidget *image1440; GtkWidget *menu_offer_new_contract; - GtkWidget *image1403; + GtkWidget *image1441; GtkWidget *menu_fire; - GtkWidget *image1404; + GtkWidget *image1442; GtkWidget *menu_shoots_penalties; - GtkWidget *image1405; + GtkWidget *image1443; GtkWidget *menu_move_to_youth_academy; GtkWidget *trennlinie10; GtkWidget *menu_browse_players; - GtkWidget *image1406; + GtkWidget *image1444; GtkWidget *menu_user; GtkWidget *menu_user_menu; GtkWidget *menu_user_show_last_match; - GtkWidget *image1407; + GtkWidget *image1445; GtkWidget *menu_user_show_last_stats; - GtkWidget *image1408; + GtkWidget *image1446; GtkWidget *menu_user_show_coming_matches; - GtkWidget *image1409; + GtkWidget *image1447; GtkWidget *trennlinie12; GtkWidget *menu_user_show_history; - GtkWidget *image1410; + GtkWidget *image1448; GtkWidget *trennlinie9; GtkWidget *menu_next_user; - GtkWidget *image1411; + GtkWidget *image1449; GtkWidget *menu_previous_user; - GtkWidget *image1412; + GtkWidget *image1450; GtkWidget *menu_manage_users; - GtkWidget *image1413; + GtkWidget *image1451; GtkWidget *menu_finances_stadium; GtkWidget *menu_finances_stadium_menu; GtkWidget *menu_show_finances; - GtkWidget *image1414; + GtkWidget *image1452; GtkWidget *menu_show_stadium; - GtkWidget *image1415; + GtkWidget *image1453; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *menu_about; - GtkWidget *image1416; + GtkWidget *image1454; GtkWidget *menu_contributors; - GtkWidget *image1417; + GtkWidget *image1455; GtkWidget *menu_help; - GtkWidget *image1418; + GtkWidget *image1456; GtkWidget *hbox1; GtkWidget *button_load; GtkWidget *image11; @@ -291,9 +291,9 @@ create_main_window (void) GDK_l, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); - image1384 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1384); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image1384); + image1422 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1422); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image1422); menu_save = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group); gtk_widget_show (menu_save); @@ -326,9 +326,9 @@ create_main_window (void) GDK_p, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image1385 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1385); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image1385); + image1423 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1423); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image1423); trennlinie7 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie7); @@ -363,9 +363,9 @@ create_main_window (void) GDK_F3, 0, GTK_ACCEL_VISIBLE); - image1386 = create_pixmap (main_window, "menu_fixtures.png"); - gtk_widget_show (image1386); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image1386); + image1424 = create_pixmap (main_window, "menu_fixtures.png"); + gtk_widget_show (image1424); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image1424); menu_fixtures = gtk_image_menu_item_new_with_mnemonic (_("Fixtures (competitions)")); gtk_widget_show (menu_fixtures); @@ -374,9 +374,9 @@ create_main_window (void) GDK_F4, 0, GTK_ACCEL_VISIBLE); - image1387 = create_pixmap (main_window, "menu_fixtures_comp.png"); - gtk_widget_show (image1387); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image1387); + image1425 = create_pixmap (main_window, "menu_fixtures_comp.png"); + gtk_widget_show (image1425); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image1425); menu_tables = gtk_image_menu_item_new_with_mnemonic (_("Tables")); gtk_widget_show (menu_tables); @@ -385,9 +385,9 @@ create_main_window (void) GDK_F5, 0, GTK_ACCEL_VISIBLE); - image1388 = create_pixmap (main_window, "menu_table.png"); - gtk_widget_show (image1388); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image1388); + image1426 = create_pixmap (main_window, "menu_table.png"); + gtk_widget_show (image1426); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image1426); menu_my_league_results = gtk_image_menu_item_new_with_mnemonic (_("My league results")); gtk_widget_show (menu_my_league_results); @@ -396,9 +396,9 @@ create_main_window (void) GDK_F6, 0, GTK_ACCEL_VISIBLE); - image1389 = create_pixmap (main_window, "menu_league_results.png"); - gtk_widget_show (image1389); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image1389); + image1427 = create_pixmap (main_window, "menu_league_results.png"); + gtk_widget_show (image1427); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image1427); trennlinie13 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie13); @@ -412,9 +412,9 @@ create_main_window (void) GDK_s, 0, GTK_ACCEL_VISIBLE); - image1390 = create_pixmap (main_window, "menu_league_stats.png"); - gtk_widget_show (image1390); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image1390); + image1428 = create_pixmap (main_window, "menu_league_stats.png"); + gtk_widget_show (image1428); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image1428); menu_season_history = gtk_image_menu_item_new_with_mnemonic (_("Season history")); gtk_widget_show (menu_season_history); @@ -423,9 +423,9 @@ create_main_window (void) GDK_h, 0, GTK_ACCEL_VISIBLE); - image1391 = create_pixmap (main_window, "menu_history.png"); - gtk_widget_show (image1391); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image1391); + image1429 = create_pixmap (main_window, "menu_history.png"); + gtk_widget_show (image1429); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image1429); menu_team = gtk_menu_item_new_with_mnemonic (_("_Team")); gtk_widget_show (menu_team); @@ -438,9 +438,9 @@ create_main_window (void) gtk_widget_show (menu_playing_style); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_playing_style); - image1392 = create_pixmap (main_window, "menu_style.png"); - gtk_widget_show (image1392); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image1392); + image1430 = create_pixmap (main_window, "menu_style.png"); + gtk_widget_show (image1430); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image1430); menu_playing_style_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_playing_style), menu_playing_style_menu); @@ -479,9 +479,9 @@ create_main_window (void) gtk_widget_show (menu_scout); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_scout); - image1393 = create_pixmap (main_window, "menu_scout.png"); - gtk_widget_show (image1393); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image1393); + image1431 = create_pixmap (main_window, "menu_scout.png"); + gtk_widget_show (image1431); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image1431); menu_scout_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_scout), menu_scout_menu); @@ -514,9 +514,9 @@ create_main_window (void) gtk_widget_show (menu_physio); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_physio); - image1394 = create_pixmap (main_window, "menu_physio.png"); - gtk_widget_show (image1394); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image1394); + image1432 = create_pixmap (main_window, "menu_physio.png"); + gtk_widget_show (image1432); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image1432); menu_physio_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_physio), menu_physio_menu); @@ -570,13 +570,11 @@ create_main_window (void) menu_yc_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_yc_best)); gtk_widget_show (menu_yc_best); gtk_container_add (GTK_CONTAINER (youth_coach1_menu), menu_yc_best); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_yc_best), TRUE); menu_yc_good = gtk_radio_menu_item_new_with_mnemonic (menu_yc_best_group, _("Good")); menu_yc_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_yc_good)); gtk_widget_show (menu_yc_good); gtk_container_add (GTK_CONTAINER (youth_coach1_menu), menu_yc_good); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_yc_good), TRUE); menu_yc_average = gtk_radio_menu_item_new_with_mnemonic (menu_yc_best_group, _("Average")); menu_yc_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_yc_average)); @@ -588,7 +586,6 @@ create_main_window (void) menu_yc_best_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_yc_bad)); gtk_widget_show (menu_yc_bad); gtk_container_add (GTK_CONTAINER (youth_coach1_menu), menu_yc_bad); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_yc_bad), TRUE); menu_set_investment = gtk_menu_item_new_with_mnemonic (_("Set investment")); gtk_widget_show (menu_set_investment); @@ -599,9 +596,9 @@ create_main_window (void) gtk_widget_show (menu_boost); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_boost); - image1395 = create_pixmap (main_window, "menu_boost.png"); - gtk_widget_show (image1395); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image1395); + image1433 = create_pixmap (main_window, "menu_boost.png"); + gtk_widget_show (image1433); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image1433); menu_boost_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_boost), menu_boost_menu); @@ -633,17 +630,17 @@ create_main_window (void) gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_reset_players); gtk_tooltips_set_tip (tooltips, menu_reset_players, _("Reset player list to the formation at the beginning of the live game pause (right click on player list)"), NULL); - image1396 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1396); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image1396); + image1434 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1434); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image1434); menu_custom_structure = gtk_image_menu_item_new_with_mnemonic (_("Enter custom structure")); gtk_widget_show (menu_custom_structure); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_custom_structure); - image1397 = create_pixmap (main_window, "menu_structure.png"); - gtk_widget_show (image1397); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image1397); + image1435 = create_pixmap (main_window, "menu_structure.png"); + gtk_widget_show (image1435); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image1435); menu_rearrange_team = gtk_image_menu_item_new_with_mnemonic (_("Rearrange team")); gtk_widget_show (menu_rearrange_team); @@ -653,9 +650,9 @@ create_main_window (void) GDK_r, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image1398 = create_pixmap (main_window, "menu_rearrange.png"); - gtk_widget_show (image1398); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image1398); + image1436 = create_pixmap (main_window, "menu_rearrange.png"); + gtk_widget_show (image1436); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image1436); trennlinie8 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie8); @@ -666,9 +663,9 @@ create_main_window (void) gtk_widget_show (menu_browse_teams); gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_browse_teams); - image1399 = create_pixmap (main_window, "menu_browse_tms.png"); - gtk_widget_show (image1399); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image1399); + image1437 = create_pixmap (main_window, "menu_browse_tms.png"); + gtk_widget_show (image1437); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image1437); menu_player = gtk_menu_item_new_with_mnemonic (_("_Player")); gtk_widget_show (menu_player); @@ -681,49 +678,49 @@ create_main_window (void) gtk_widget_show (menu_show_info); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_show_info); - image1400 = create_pixmap (main_window, "menu_player_info.png"); - gtk_widget_show (image1400); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image1400); + image1438 = create_pixmap (main_window, "menu_player_info.png"); + gtk_widget_show (image1438); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image1438); menu_put_on_transfer_list = gtk_image_menu_item_new_with_mnemonic (_("Put on transfer list")); gtk_widget_show (menu_put_on_transfer_list); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_put_on_transfer_list); - image1401 = create_pixmap (main_window, "menu_player_put_transfer.png"); - gtk_widget_show (image1401); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image1401); + image1439 = create_pixmap (main_window, "menu_player_put_transfer.png"); + gtk_widget_show (image1439); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image1439); menu_remove_from_transfer_list = gtk_image_menu_item_new_with_mnemonic (_("Remove from transfer list")); gtk_widget_show (menu_remove_from_transfer_list); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_remove_from_transfer_list); - image1402 = create_pixmap (main_window, "menu_player_remove_transfer.png"); - gtk_widget_show (image1402); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image1402); + image1440 = create_pixmap (main_window, "menu_player_remove_transfer.png"); + gtk_widget_show (image1440); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image1440); menu_offer_new_contract = gtk_image_menu_item_new_with_mnemonic (_("Offer new contract")); gtk_widget_show (menu_offer_new_contract); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_offer_new_contract); - image1403 = create_pixmap (main_window, "menu_player_contract.png"); - gtk_widget_show (image1403); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image1403); + image1441 = create_pixmap (main_window, "menu_player_contract.png"); + gtk_widget_show (image1441); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image1441); menu_fire = gtk_image_menu_item_new_with_mnemonic (_("Fire")); gtk_widget_show (menu_fire); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_fire); - image1404 = create_pixmap (main_window, "menu_player_fire.png"); - gtk_widget_show (image1404); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image1404); + image1442 = create_pixmap (main_window, "menu_player_fire.png"); + gtk_widget_show (image1442); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image1442); menu_shoots_penalties = gtk_image_menu_item_new_with_mnemonic (_("Shoots penalties")); gtk_widget_show (menu_shoots_penalties); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_shoots_penalties); - image1405 = create_pixmap (main_window, "menu_player_shoots.png"); - gtk_widget_show (image1405); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image1405); + image1443 = create_pixmap (main_window, "menu_player_shoots.png"); + gtk_widget_show (image1443); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image1443); menu_move_to_youth_academy = gtk_menu_item_new_with_mnemonic (_("Move to youth academy")); gtk_widget_show (menu_move_to_youth_academy); @@ -738,9 +735,9 @@ create_main_window (void) gtk_widget_show (menu_browse_players); gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_browse_players); - image1406 = create_pixmap (main_window, "menu_player_browse.png"); - gtk_widget_show (image1406); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image1406); + image1444 = create_pixmap (main_window, "menu_player_browse.png"); + gtk_widget_show (image1444); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image1444); menu_user = gtk_menu_item_new_with_mnemonic (_("_User")); gtk_widget_show (menu_user); @@ -756,9 +753,9 @@ create_main_window (void) GDK_m, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image1407 = create_pixmap (main_window, "menu_last_match.png"); - gtk_widget_show (image1407); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image1407); + image1445 = create_pixmap (main_window, "menu_last_match.png"); + gtk_widget_show (image1445); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image1445); menu_user_show_last_stats = gtk_image_menu_item_new_with_mnemonic (_("Show last match stats")); gtk_widget_show (menu_user_show_last_stats); @@ -767,17 +764,17 @@ create_main_window (void) GDK_F2, 0, GTK_ACCEL_VISIBLE); - image1408 = create_pixmap (main_window, "menu_match_stats.png"); - gtk_widget_show (image1408); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image1408); + image1446 = create_pixmap (main_window, "menu_match_stats.png"); + gtk_widget_show (image1446); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image1446); menu_user_show_coming_matches = gtk_image_menu_item_new_with_mnemonic (_("Show coming matches")); gtk_widget_show (menu_user_show_coming_matches); gtk_container_add (GTK_CONTAINER (menu_user_menu), menu_user_show_coming_matches); - image1409 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1409); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image1409); + image1447 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1447); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image1447); trennlinie12 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie12); @@ -791,9 +788,9 @@ create_main_window (void) GDK_h, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image1410 = create_pixmap (main_window, "menu_history.png"); - gtk_widget_show (image1410); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image1410); + image1448 = create_pixmap (main_window, "menu_history.png"); + gtk_widget_show (image1448); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image1448); trennlinie9 = gtk_separator_menu_item_new (); gtk_widget_show (trennlinie9); @@ -807,9 +804,9 @@ create_main_window (void) GDK_F9, 0, GTK_ACCEL_VISIBLE); - image1411 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1411); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image1411); + image1449 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1449); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image1449); menu_previous_user = gtk_image_menu_item_new_with_mnemonic (_("Previous user")); gtk_widget_show (menu_previous_user); @@ -818,9 +815,9 @@ create_main_window (void) GDK_F8, 0, GTK_ACCEL_VISIBLE); - image1412 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1412); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image1412); + image1450 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1450); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image1450); menu_manage_users = gtk_image_menu_item_new_with_mnemonic (_("Manage users")); gtk_widget_show (menu_manage_users); @@ -829,9 +826,9 @@ create_main_window (void) GDK_F12, 0, GTK_ACCEL_VISIBLE); - image1413 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1413); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image1413); + image1451 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1451); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image1451); menu_finances_stadium = gtk_menu_item_new_with_mnemonic (_("Fin_Stad")); gtk_widget_show (menu_finances_stadium); @@ -847,9 +844,9 @@ create_main_window (void) GDK_f, 0, GTK_ACCEL_VISIBLE); - image1414 = create_pixmap (main_window, "menu_finances.png"); - gtk_widget_show (image1414); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image1414); + image1452 = create_pixmap (main_window, "menu_finances.png"); + gtk_widget_show (image1452); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image1452); menu_show_stadium = gtk_image_menu_item_new_with_mnemonic (_("Show stadium")); gtk_widget_show (menu_show_stadium); @@ -858,9 +855,9 @@ create_main_window (void) GDK_f, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image1415 = create_pixmap (main_window, "menu_stadium.png"); - gtk_widget_show (image1415); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image1415); + image1453 = create_pixmap (main_window, "menu_stadium.png"); + gtk_widget_show (image1453); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image1453); menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help")); gtk_widget_show (menu_help1); @@ -873,25 +870,25 @@ create_main_window (void) gtk_widget_show (menu_about); gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_about); - image1416 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1416); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image1416); + image1454 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1454); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image1454); menu_contributors = gtk_image_menu_item_new_with_mnemonic (_("Contributors")); gtk_widget_show (menu_contributors); gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_contributors); - image1417 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1417); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image1417); + image1455 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1455); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image1455); menu_help = gtk_image_menu_item_new_with_mnemonic (_("Help")); gtk_widget_show (menu_help); gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_help); - image1418 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1418); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image1418); + image1456 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1456); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image1456); hbox1 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox1); @@ -1501,7 +1498,7 @@ create_main_window (void) GLADE_HOOKUP_OBJECT (main_window, menu_new, "menu_new"); GLADE_HOOKUP_OBJECT (main_window, menu_open, "menu_open"); GLADE_HOOKUP_OBJECT (main_window, menu_load_last_save, "menu_load_last_save"); - GLADE_HOOKUP_OBJECT (main_window, image1384, "image1384"); + GLADE_HOOKUP_OBJECT (main_window, image1422, "image1422"); GLADE_HOOKUP_OBJECT (main_window, menu_save, "menu_save"); GLADE_HOOKUP_OBJECT (main_window, menu_save_as, "menu_save_as"); GLADE_HOOKUP_OBJECT (main_window, trennlinie1, "trennlinie1"); @@ -1509,7 +1506,7 @@ create_main_window (void) GLADE_HOOKUP_OBJECT (main_window, menu_options, "menu_options"); GLADE_HOOKUP_OBJECT (main_window, menu_options_menu, "menu_options_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_preferences, "menu_preferences"); - GLADE_HOOKUP_OBJECT (main_window, image1385, "image1385"); + GLADE_HOOKUP_OBJECT (main_window, image1423, "image1423"); GLADE_HOOKUP_OBJECT (main_window, trennlinie7, "trennlinie7"); GLADE_HOOKUP_OBJECT (main_window, menu_job_offers, "menu_job_offers"); GLADE_HOOKUP_OBJECT (main_window, menu_live_game, "menu_live_game"); @@ -1517,22 +1514,22 @@ create_main_window (void) GLADE_HOOKUP_OBJECT (main_window, menu_figures, "menu_figures"); GLADE_HOOKUP_OBJECT (main_window, menu_figures_menu, "menu_figures_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_fixtures_week, "menu_fixtures_week"); - GLADE_HOOKUP_OBJECT (main_window, image1386, "image1386"); + GLADE_HOOKUP_OBJECT (main_window, image1424, "image1424"); GLADE_HOOKUP_OBJECT (main_window, menu_fixtures, "menu_fixtures"); - GLADE_HOOKUP_OBJECT (main_window, image1387, "image1387"); + GLADE_HOOKUP_OBJECT (main_window, image1425, "image1425"); GLADE_HOOKUP_OBJECT (main_window, menu_tables, "menu_tables"); - GLADE_HOOKUP_OBJECT (main_window, image1388, "image1388"); + GLADE_HOOKUP_OBJECT (main_window, image1426, "image1426"); GLADE_HOOKUP_OBJECT (main_window, menu_my_league_results, "menu_my_league_results"); - GLADE_HOOKUP_OBJECT (main_window, image1389, "image1389"); + GLADE_HOOKUP_OBJECT (main_window, image1427, "image1427"); GLADE_HOOKUP_OBJECT (main_window, trennlinie13, "trennlinie13"); GLADE_HOOKUP_OBJECT (main_window, menu_league_stats, "menu_league_stats"); - GLADE_HOOKUP_OBJECT (main_window, image1390, "image1390"); + GLADE_HOOKUP_OBJECT (main_window, image1428, "image1428"); GLADE_HOOKUP_OBJECT (main_window, menu_season_history, "menu_season_history"); - GLADE_HOOKUP_OBJECT (main_window, image1391, "image1391"); + GLADE_HOOKUP_OBJECT (main_window, image1429, "image1429"); GLADE_HOOKUP_OBJECT (main_window, menu_team, "menu_team"); GLADE_HOOKUP_OBJECT (main_window, menu_team_menu, "menu_team_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_playing_style, "menu_playing_style"); - GLADE_HOOKUP_OBJECT (main_window, image1392, "image1392"); + GLADE_HOOKUP_OBJECT (main_window, image1430, "image1430"); GLADE_HOOKUP_OBJECT (main_window, menu_playing_style_menu, "menu_playing_style_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_all_out_defend, "menu_all_out_defend"); GLADE_HOOKUP_OBJECT (main_window, menu_defend, "menu_defend"); @@ -1540,14 +1537,14 @@ create_main_window (void) GLADE_HOOKUP_OBJECT (main_window, menu_attack, "menu_attack"); GLADE_HOOKUP_OBJECT (main_window, menu_all_out_attack, "menu_all_out_attack"); GLADE_HOOKUP_OBJECT (main_window, menu_scout, "menu_scout"); - GLADE_HOOKUP_OBJECT (main_window, image1393, "image1393"); + GLADE_HOOKUP_OBJECT (main_window, image1431, "image1431"); GLADE_HOOKUP_OBJECT (main_window, menu_scout_menu, "menu_scout_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_scout_best, "menu_scout_best"); GLADE_HOOKUP_OBJECT (main_window, menu_scout_good, "menu_scout_good"); GLADE_HOOKUP_OBJECT (main_window, menu_scout_average, "menu_scout_average"); GLADE_HOOKUP_OBJECT (main_window, menu_scout_bad, "menu_scout_bad"); GLADE_HOOKUP_OBJECT (main_window, menu_physio, "menu_physio"); - GLADE_HOOKUP_OBJECT (main_window, image1394, "image1394"); + GLADE_HOOKUP_OBJECT (main_window, image1432, "image1432"); GLADE_HOOKUP_OBJECT (main_window, menu_physio_menu, "menu_physio_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_physio_best, "menu_physio_best"); GLADE_HOOKUP_OBJECT (main_window, menu_physio_good, "menu_physio_good"); @@ -1564,71 +1561,71 @@ create_main_window (void) GLADE_HOOKUP_OBJECT (main_window, menu_yc_bad, "menu_yc_bad"); GLADE_HOOKUP_OBJECT (main_window, menu_set_investment, "menu_set_investment"); GLADE_HOOKUP_OBJECT (main_window, menu_boost, "menu_boost"); - GLADE_HOOKUP_OBJECT (main_window, image1395, "image1395"); + GLADE_HOOKUP_OBJECT (main_window, image1433, "image1433"); GLADE_HOOKUP_OBJECT (main_window, menu_boost_menu, "menu_boost_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_boost_on, "menu_boost_on"); GLADE_HOOKUP_OBJECT (main_window, menu_boost_off, "menu_boost_off"); GLADE_HOOKUP_OBJECT (main_window, menu_boost_anti, "menu_boost_anti"); GLADE_HOOKUP_OBJECT (main_window, trennlinie11, "trennlinie11"); GLADE_HOOKUP_OBJECT (main_window, menu_reset_players, "menu_reset_players"); - GLADE_HOOKUP_OBJECT (main_window, image1396, "image1396"); + GLADE_HOOKUP_OBJECT (main_window, image1434, "image1434"); GLADE_HOOKUP_OBJECT (main_window, menu_custom_structure, "menu_custom_structure"); - GLADE_HOOKUP_OBJECT (main_window, image1397, "image1397"); + GLADE_HOOKUP_OBJECT (main_window, image1435, "image1435"); GLADE_HOOKUP_OBJECT (main_window, menu_rearrange_team, "menu_rearrange_team"); - GLADE_HOOKUP_OBJECT (main_window, image1398, "image1398"); + GLADE_HOOKUP_OBJECT (main_window, image1436, "image1436"); GLADE_HOOKUP_OBJECT (main_window, trennlinie8, "trennlinie8"); GLADE_HOOKUP_OBJECT (main_window, menu_browse_teams, "menu_browse_teams"); - GLADE_HOOKUP_OBJECT (main_window, image1399, "image1399"); + GLADE_HOOKUP_OBJECT (main_window, image1437, "image1437"); GLADE_HOOKUP_OBJECT (main_window, menu_player, "menu_player"); GLADE_HOOKUP_OBJECT (main_window, menu_player_menu, "menu_player_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_show_info, "menu_show_info"); - GLADE_HOOKUP_OBJECT (main_window, image1400, "image1400"); + GLADE_HOOKUP_OBJECT (main_window, image1438, "image1438"); GLADE_HOOKUP_OBJECT (main_window, menu_put_on_transfer_list, "menu_put_on_transfer_list"); - GLADE_HOOKUP_OBJECT (main_window, image1401, "image1401"); + GLADE_HOOKUP_OBJECT (main_window, image1439, "image1439"); GLADE_HOOKUP_OBJECT (main_window, menu_remove_from_transfer_list, "menu_remove_from_transfer_list"); - GLADE_HOOKUP_OBJECT (main_window, image1402, "image1402"); + GLADE_HOOKUP_OBJECT (main_window, image1440, "image1440"); GLADE_HOOKUP_OBJECT (main_window, menu_offer_new_contract, "menu_offer_new_contract"); - GLADE_HOOKUP_OBJECT (main_window, image1403, "image1403"); + GLADE_HOOKUP_OBJECT (main_window, image1441, "image1441"); GLADE_HOOKUP_OBJECT (main_window, menu_fire, "menu_fire"); - GLADE_HOOKUP_OBJECT (main_window, image1404, "image1404"); + GLADE_HOOKUP_OBJECT (main_window, image1442, "image1442"); GLADE_HOOKUP_OBJECT (main_window, menu_shoots_penalties, "menu_shoots_penalties"); - GLADE_HOOKUP_OBJECT (main_window, image1405, "image1405"); + GLADE_HOOKUP_OBJECT (main_window, image1443, "image1443"); GLADE_HOOKUP_OBJECT (main_window, menu_move_to_youth_academy, "menu_move_to_youth_academy"); GLADE_HOOKUP_OBJECT (main_window, trennlinie10, "trennlinie10"); GLADE_HOOKUP_OBJECT (main_window, menu_browse_players, "menu_browse_players"); - GLADE_HOOKUP_OBJECT (main_window, image1406, "image1406"); + GLADE_HOOKUP_OBJECT (main_window, image1444, "image1444"); GLADE_HOOKUP_OBJECT (main_window, menu_user, "menu_user"); GLADE_HOOKUP_OBJECT (main_window, menu_user_menu, "menu_user_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_user_show_last_match, "menu_user_show_last_match"); - GLADE_HOOKUP_OBJECT (main_window, image1407, "image1407"); + GLADE_HOOKUP_OBJECT (main_window, image1445, "image1445"); GLADE_HOOKUP_OBJECT (main_window, menu_user_show_last_stats, "menu_user_show_last_stats"); - GLADE_HOOKUP_OBJECT (main_window, image1408, "image1408"); + GLADE_HOOKUP_OBJECT (main_window, image1446, "image1446"); GLADE_HOOKUP_OBJECT (main_window, menu_user_show_coming_matches, "menu_user_show_coming_matches"); - GLADE_HOOKUP_OBJECT (main_window, image1409, "image1409"); + GLADE_HOOKUP_OBJECT (main_window, image1447, "image1447"); GLADE_HOOKUP_OBJECT (main_window, trennlinie12, "trennlinie12"); GLADE_HOOKUP_OBJECT (main_window, menu_user_show_history, "menu_user_show_history"); - GLADE_HOOKUP_OBJECT (main_window, image1410, "image1410"); + GLADE_HOOKUP_OBJECT (main_window, image1448, "image1448"); GLADE_HOOKUP_OBJECT (main_window, trennlinie9, "trennlinie9"); GLADE_HOOKUP_OBJECT (main_window, menu_next_user, "menu_next_user"); - GLADE_HOOKUP_OBJECT (main_window, image1411, "image1411"); + GLADE_HOOKUP_OBJECT (main_window, image1449, "image1449"); GLADE_HOOKUP_OBJECT (main_window, menu_previous_user, "menu_previous_user"); - GLADE_HOOKUP_OBJECT (main_window, image1412, "image1412"); + GLADE_HOOKUP_OBJECT (main_window, image1450, "image1450"); GLADE_HOOKUP_OBJECT (main_window, menu_manage_users, "menu_manage_users"); - GLADE_HOOKUP_OBJECT (main_window, image1413, "image1413"); + GLADE_HOOKUP_OBJECT (main_window, image1451, "image1451"); GLADE_HOOKUP_OBJECT (main_window, menu_finances_stadium, "menu_finances_stadium"); GLADE_HOOKUP_OBJECT (main_window, menu_finances_stadium_menu, "menu_finances_stadium_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_show_finances, "menu_show_finances"); - GLADE_HOOKUP_OBJECT (main_window, image1414, "image1414"); + GLADE_HOOKUP_OBJECT (main_window, image1452, "image1452"); GLADE_HOOKUP_OBJECT (main_window, menu_show_stadium, "menu_show_stadium"); - GLADE_HOOKUP_OBJECT (main_window, image1415, "image1415"); + GLADE_HOOKUP_OBJECT (main_window, image1453, "image1453"); GLADE_HOOKUP_OBJECT (main_window, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (main_window, menu_help1_menu, "menu_help1_menu"); GLADE_HOOKUP_OBJECT (main_window, menu_about, "menu_about"); - GLADE_HOOKUP_OBJECT (main_window, image1416, "image1416"); + GLADE_HOOKUP_OBJECT (main_window, image1454, "image1454"); GLADE_HOOKUP_OBJECT (main_window, menu_contributors, "menu_contributors"); - GLADE_HOOKUP_OBJECT (main_window, image1417, "image1417"); + GLADE_HOOKUP_OBJECT (main_window, image1455, "image1455"); GLADE_HOOKUP_OBJECT (main_window, menu_help, "menu_help"); - GLADE_HOOKUP_OBJECT (main_window, image1418, "image1418"); + GLADE_HOOKUP_OBJECT (main_window, image1456, "image1456"); GLADE_HOOKUP_OBJECT (main_window, hbox1, "hbox1"); GLADE_HOOKUP_OBJECT (main_window, button_load, "button_load"); GLADE_HOOKUP_OBJECT (main_window, image11, "image11"); diff --git a/src/player.c b/src/player.c index 2e43617d..e5740207 100644 --- a/src/player.c +++ b/src/player.c @@ -1016,14 +1016,12 @@ player_update_injury(Player *pl) void player_update_weekly(Player *pl) { - if(debug < 50) - { - pl->age += 0.0192; + pl->age += 0.0192; + if(debug < 50) if(!sett_int("int_opt_disable_contracts") && pl->age > const_float("float_player_age_lower")) pl->contract -= 0.0192; - } if(!sett_int("int_opt_disable_contracts") && debug < 50 && pl->contract * 12 <= opt_user_int("int_opt_user_contract_limit") && diff --git a/src/xml.h b/src/xml.h index cdfa0a66..d8ebe2f3 100644 --- a/src/xml.h +++ b/src/xml.h @@ -39,9 +39,11 @@ enum XmlTags #define TAG_START_TABLE 6000 #define TAG_START_USERS 7000 #define TAG_START_LIVE_GAME 8000 -#define TAG_START_TRANSFERS 9000 +#define TAG_START_PLAYERS 9000 +#define TAG_END_PLAYERS 9900 #define TAG_START_LEAGUE_STAT 10000 #define TAG_START_SEASON_STATS 11000 +#define TAG_START_TRANSFERS 20000 #define xml_write_string(fil, string, tag, indent) fprintf(fil, "%s<_%d>%s\n", indent, tag, string, tag) #define xml_write_g_string(fil, gstring, tag, indent) xml_write_string(fil, (gstring)->str, tag, indent) diff --git a/src/xml_loadsave_teams.c b/src/xml_loadsave_teams.c index 41c0223a..df5efa87 100644 --- a/src/xml_loadsave_teams.c +++ b/src/xml_loadsave_teams.c @@ -3,6 +3,7 @@ #include "player.h" #include "team.h" #include "xml.h" +#include "xml_loadsave_players.h" #include "xml_loadsave_teams.h" enum @@ -21,36 +22,6 @@ enum TAG_TEAM_STADIUM_POSSIBLE_ATTENDANCE, TAG_TEAM_STADIUM_GAMES, TAG_TEAM_STADIUM_SAFETY, - TAG_TEAM_PLAYER, - TAG_TEAM_PLAYER_NAME, - TAG_TEAM_PLAYER_POS, - TAG_TEAM_PLAYER_CPOS, - TAG_TEAM_PLAYER_HEALTH, - TAG_TEAM_PLAYER_RECOVERY, - TAG_TEAM_PLAYER_ID, - TAG_TEAM_PLAYER_VALUE, - TAG_TEAM_PLAYER_WAGE, - TAG_TEAM_PLAYER_OFFERS, - TAG_TEAM_PLAYER_SKILL, - TAG_TEAM_PLAYER_CSKILL, - TAG_TEAM_PLAYER_TALENT, - TAG_TEAM_PLAYER_ETAL, - TAG_TEAM_PLAYER_FITNESS, - TAG_TEAM_PLAYER_LSU, - TAG_TEAM_PLAYER_AGE, - TAG_TEAM_PLAYER_PEAK_AGE, - TAG_TEAM_PLAYER_CONTRACT, - TAG_TEAM_PLAYER_PARTICIPATION, - TAG_TEAM_PLAYER_GAMES_GOAL, - TAG_TEAM_PLAYER_GAMES_GOAL_CLID, - TAG_TEAM_PLAYER_GAMES_GOAL_GAMES, - TAG_TEAM_PLAYER_GAMES_GOAL_GOALS, - TAG_TEAM_PLAYER_GAMES_GOAL_SHOTS, - TAG_TEAM_PLAYER_CARD, - TAG_TEAM_PLAYER_CARD_CLID, - TAG_TEAM_PLAYER_CARD_YELLOW, - TAG_TEAM_PLAYER_CARD_RED, - TAG_TEAM_PLAYER_CAREER, TAG_END }; @@ -63,11 +34,11 @@ PlayerCard new_card; void xml_loadsave_teams_start_element (GMarkupParseContext *context, - const gchar *element_name, - const gchar **attribute_names, - const gchar **attribute_values, - gpointer user_data, - GError **error) + const gchar *element_name, + const gchar **attribute_names, + const gchar **attribute_values, + gpointer user_data, + GError **error) { gint i; gint tag = xml_get_tag_from_name(element_name); @@ -89,10 +60,11 @@ xml_loadsave_teams_start_element (GMarkupParseContext *context, if(tag == TAG_TEAM) new_team = team_new(FALSE); - else if(tag == TAG_TEAM_PLAYER) + else if(tag >= TAG_START_PLAYERS && tag <= TAG_END_PLAYERS) { - new_player = player_new(&new_team, 80, FALSE); - etalidx = careeridx = 0; + valid_tag = TRUE; + state = TAG_START_PLAYERS; + xml_loadsave_players_start_element(tag, &new_team); } if(!valid_tag) @@ -102,9 +74,9 @@ xml_loadsave_teams_start_element (GMarkupParseContext *context, void xml_loadsave_teams_end_element (GMarkupParseContext *context, - const gchar *element_name, - gpointer user_data, - GError **error) + const gchar *element_name, + gpointer user_data, + GError **error) { gint tag = xml_get_tag_from_name(element_name); @@ -121,13 +93,8 @@ xml_loadsave_teams_end_element (GMarkupParseContext *context, tag == TAG_TEAM_STRUCTURE || tag == TAG_TEAM_STYLE || tag == TAG_TEAM_BOOST || - tag == TAG_TEAM_STADIUM || - tag == TAG_TEAM_PLAYER) - { + tag == TAG_TEAM_STADIUM) state = TAG_TEAM; - if(tag == TAG_TEAM_PLAYER) - g_array_append_val(new_team.players, new_player); - } else if(tag == TAG_TEAM_STADIUM_NAME || tag == TAG_TEAM_STADIUM_CAPACITY || tag == TAG_TEAM_STADIUM_AVERAGE_ATTENDANCE || @@ -135,48 +102,12 @@ xml_loadsave_teams_end_element (GMarkupParseContext *context, tag == TAG_TEAM_STADIUM_GAMES || tag == TAG_TEAM_STADIUM_SAFETY) state = TAG_TEAM_STADIUM; - else if(tag == TAG_TEAM_PLAYER_NAME || - tag == TAG_TEAM_PLAYER_POS || - tag == TAG_TEAM_PLAYER_CPOS || - tag == TAG_TEAM_PLAYER_HEALTH || - tag == TAG_TEAM_PLAYER_RECOVERY || - tag == TAG_TEAM_PLAYER_ID || - tag == TAG_TEAM_PLAYER_VALUE || - tag == TAG_TEAM_PLAYER_WAGE || - tag == TAG_TEAM_PLAYER_OFFERS || - tag == TAG_TEAM_PLAYER_SKILL || - tag == TAG_TEAM_PLAYER_CSKILL || - tag == TAG_TEAM_PLAYER_TALENT || - tag == TAG_TEAM_PLAYER_ETAL || - tag == TAG_TEAM_PLAYER_FITNESS || - tag == TAG_TEAM_PLAYER_LSU || - tag == TAG_TEAM_PLAYER_AGE || - tag == TAG_TEAM_PLAYER_PEAK_AGE || - tag == TAG_TEAM_PLAYER_CONTRACT || - tag == TAG_TEAM_PLAYER_PARTICIPATION || - tag == TAG_TEAM_PLAYER_GAMES_GOAL || - tag == TAG_TEAM_PLAYER_CAREER || - tag == TAG_TEAM_PLAYER_CARD) + else if(tag >= TAG_START_PLAYERS && tag <= TAG_END_PLAYERS) { - state = TAG_TEAM_PLAYER; - if(tag == TAG_TEAM_PLAYER_ETAL) - etalidx++; - else if(tag == TAG_TEAM_PLAYER_CAREER) - careeridx++; - else if(tag == TAG_TEAM_PLAYER_CARD) - g_array_append_val(new_player.cards, new_card); - else if(tag == TAG_TEAM_PLAYER_GAMES_GOAL) - g_array_append_val(new_player.games_goals, new_games_goals); + xml_loadsave_players_end_element(tag, new_team.players); + if(tag == TAG_START_PLAYERS) + state = TAG_TEAM; } - else if(tag == TAG_TEAM_PLAYER_GAMES_GOAL_CLID || - tag == TAG_TEAM_PLAYER_GAMES_GOAL_GAMES || - tag == TAG_TEAM_PLAYER_GAMES_GOAL_GOALS || - tag == TAG_TEAM_PLAYER_GAMES_GOAL_SHOTS) - state = TAG_TEAM_PLAYER_GAMES_GOAL; - else if(tag == TAG_TEAM_PLAYER_CARD_CLID || - tag == TAG_TEAM_PLAYER_CARD_YELLOW || - tag == TAG_TEAM_PLAYER_CARD_RED) - state = TAG_TEAM_PLAYER_CARD; else if(tag != TAG_TEAMS) g_warning("xml_loadsave_teams_end_element: unknown tag: %s; I'm in state %d\n", element_name, state); @@ -184,10 +115,10 @@ xml_loadsave_teams_end_element (GMarkupParseContext *context, void xml_loadsave_teams_text (GMarkupParseContext *context, - const gchar *text, - gsize text_len, - gpointer user_data, - GError **error) + const gchar *text, + gsize text_len, + gpointer user_data, + GError **error) { gchar buf[SMALL]; gint int_value = -1; @@ -227,60 +158,8 @@ xml_loadsave_teams_text (GMarkupParseContext *context, new_team.stadium.games = int_value; else if(state == TAG_TEAM_STADIUM_SAFETY) new_team.stadium.safety = float_value; - else if(state == TAG_TEAM_PLAYER_NAME) - g_string_printf(new_player.name, "%s", buf); - else if(state == TAG_TEAM_PLAYER_POS) - new_player.pos = int_value; - else if(state == TAG_TEAM_PLAYER_CPOS) - new_player.cpos = int_value; - else if(state == TAG_TEAM_PLAYER_HEALTH) - new_player.health = int_value; - else if(state == TAG_TEAM_PLAYER_RECOVERY) - new_player.recovery = int_value; - else if(state == TAG_TEAM_PLAYER_ID) - new_player.id = int_value; - else if(state == TAG_TEAM_PLAYER_VALUE) - new_player.value = int_value; - else if(state == TAG_TEAM_PLAYER_WAGE) - new_player.wage = int_value; - else if(state == TAG_TEAM_PLAYER_OFFERS) - new_player.offers = int_value; - else if(state == TAG_TEAM_PLAYER_PARTICIPATION) - new_player.participation = int_value; - else if(state == TAG_TEAM_PLAYER_SKILL) - new_player.skill = float_value; - else if(state == TAG_TEAM_PLAYER_CSKILL) - new_player.cskill = float_value; - else if(state == TAG_TEAM_PLAYER_TALENT) - new_player.talent = float_value; - else if(state == TAG_TEAM_PLAYER_FITNESS) - new_player.fitness = float_value; - else if(state == TAG_TEAM_PLAYER_LSU) - new_player.lsu = float_value; - else if(state == TAG_TEAM_PLAYER_AGE) - new_player.age = float_value; - else if(state == TAG_TEAM_PLAYER_PEAK_AGE) - new_player.peak_age = float_value; - else if(state == TAG_TEAM_PLAYER_CONTRACT) - new_player.contract = float_value; - else if(state == TAG_TEAM_PLAYER_ETAL) - new_player.etal[etalidx] = float_value; - else if(state == TAG_TEAM_PLAYER_GAMES_GOAL_CLID) - new_games_goals.clid = int_value; - else if(state == TAG_TEAM_PLAYER_GAMES_GOAL_GAMES) - new_games_goals.games = int_value; - else if(state == TAG_TEAM_PLAYER_GAMES_GOAL_GOALS) - new_games_goals.goals = int_value; - else if(state == TAG_TEAM_PLAYER_GAMES_GOAL_SHOTS) - new_games_goals.shots = int_value; - else if(state == TAG_TEAM_PLAYER_CARD_CLID) - new_card.clid = int_value; - else if(state == TAG_TEAM_PLAYER_CARD_YELLOW) - new_card.yellow = int_value; - else if(state == TAG_TEAM_PLAYER_CARD_RED) - new_card.red = int_value; - else if(state == TAG_TEAM_PLAYER_CAREER) - new_player.career[careeridx] = int_value; + else if(state >= TAG_START_PLAYERS && state <= TAG_END_PLAYERS) + xml_loadsave_players_text(buf); } void @@ -344,8 +223,6 @@ xml_loadsave_teams_write(const gchar *filename, const GArray *teams) void xml_loadsave_teams_write_team(FILE *fil, const Team* team) { - gint i; - fprintf(fil, "<_%d>\n", TAG_TEAM); xml_write_g_string(fil, team->name, TAG_NAME, I1); @@ -371,74 +248,7 @@ xml_loadsave_teams_write_team(FILE *fil, const Team* team) fprintf(fil, "%s\n", I1, TAG_TEAM_STADIUM); - for(i=0;iplayers->len;i++) - xml_loadsave_teams_write_player(fil, &g_array_index(team->players, Player, i)); + xml_loadsave_players_write(fil, team->players); fprintf(fil, "\n", TAG_TEAM); } - -void -xml_loadsave_teams_write_player(FILE *fil, const Player *pl) -{ - gint i; - - fprintf(fil, "%s<_%d>\n", I1, TAG_TEAM_PLAYER); - - xml_write_g_string(fil, pl->name, TAG_TEAM_PLAYER_NAME, I2); - xml_write_int(fil, pl->pos, TAG_TEAM_PLAYER_POS, I2); - xml_write_int(fil, pl->cpos, TAG_TEAM_PLAYER_CPOS, I2); - xml_write_int(fil, pl->health, TAG_TEAM_PLAYER_HEALTH, I2); - xml_write_int(fil, pl->recovery, TAG_TEAM_PLAYER_RECOVERY, I2); - xml_write_int(fil, pl->id, TAG_TEAM_PLAYER_ID, I2); - xml_write_int(fil, pl->value, TAG_TEAM_PLAYER_VALUE, I2); - xml_write_int(fil, pl->wage, TAG_TEAM_PLAYER_WAGE, I2); - xml_write_int(fil, pl->offers, TAG_TEAM_PLAYER_OFFERS, I2); - xml_write_int(fil, pl->participation, TAG_TEAM_PLAYER_PARTICIPATION, I2); - - xml_write_float(fil, pl->skill, TAG_TEAM_PLAYER_SKILL, I2); - xml_write_float(fil, pl->cskill, TAG_TEAM_PLAYER_CSKILL, I2); - xml_write_float(fil, pl->talent, TAG_TEAM_PLAYER_TALENT, I2); - xml_write_float(fil, pl->fitness, TAG_TEAM_PLAYER_FITNESS, I2); - xml_write_float(fil, pl->lsu, TAG_TEAM_PLAYER_LSU, I2); - xml_write_float(fil, pl->age, TAG_TEAM_PLAYER_AGE, I2); - xml_write_float(fil, pl->peak_age, TAG_TEAM_PLAYER_PEAK_AGE, I2); - xml_write_float(fil, pl->contract, TAG_TEAM_PLAYER_CONTRACT, I2); - - for(i=0;i<4;i++) - xml_write_float(fil, pl->etal[i], TAG_TEAM_PLAYER_ETAL, I3); - - for(i=0;icareer[i], TAG_TEAM_PLAYER_CAREER, I2); - - for(i=0;igames_goals->len;i++) - { - fprintf(fil, "%s<_%d>\n", I2, TAG_TEAM_PLAYER_GAMES_GOAL); - - xml_write_int(fil, g_array_index(pl->games_goals, PlayerGamesGoals, i).clid, - TAG_TEAM_PLAYER_GAMES_GOAL_CLID, I3); - xml_write_int(fil, g_array_index(pl->games_goals, PlayerGamesGoals, i).games, - TAG_TEAM_PLAYER_GAMES_GOAL_GAMES, I3); - xml_write_int(fil, g_array_index(pl->games_goals, PlayerGamesGoals, i).goals, - TAG_TEAM_PLAYER_GAMES_GOAL_GOALS, I3); - xml_write_int(fil, g_array_index(pl->games_goals, PlayerGamesGoals, i).shots, - TAG_TEAM_PLAYER_GAMES_GOAL_SHOTS, I3); - - fprintf(fil, "%s\n", I2, TAG_TEAM_PLAYER_GAMES_GOAL); - } - - for(i=0;icards->len;i++) - { - fprintf(fil, "%s<_%d>\n", I2, TAG_TEAM_PLAYER_CARD); - - xml_write_int(fil, g_array_index(pl->cards, PlayerCard, i).clid, - TAG_TEAM_PLAYER_CARD_CLID, I3); - xml_write_int(fil, g_array_index(pl->cards, PlayerCard, i).yellow, - TAG_TEAM_PLAYER_CARD_YELLOW, I3); - xml_write_int(fil, g_array_index(pl->cards, PlayerCard, i).red, - TAG_TEAM_PLAYER_CARD_RED, I3); - - fprintf(fil, "%s\n", I2, TAG_TEAM_PLAYER_CARD); - } - - fprintf(fil, "%s\n", I1, TAG_TEAM_PLAYER); -} diff --git a/src/xml_loadsave_users.c b/src/xml_loadsave_users.c index 7e0dae3e..f9e926d4 100644 --- a/src/xml_loadsave_users.c +++ b/src/xml_loadsave_users.c @@ -5,6 +5,7 @@ #include "variables.h" #include "xml.h" #include "xml_loadsave_live_game.h" +#include "xml_loadsave_players.h" #include "xml_loadsave_users.h" enum @@ -36,6 +37,11 @@ enum TAG_USER_SPONSOR_NAME, TAG_USER_SPONSOR_CONTRACT, TAG_USER_SPONSOR_BENEFIT, + TAG_USER_YA_COACH, + TAG_USER_YA_PERCENTAGE, + TAG_USER_YA_AV_COACH, + TAG_USER_YA_AV_PERCENTAGE, + TAG_USER_YA_COUNTER, TAG_END }; @@ -70,12 +76,23 @@ xml_loadsave_users_start_element (GMarkupParseContext *context, valid_tag = TRUE; } - if(state == TAG_USER) + if(tag == TAG_USER) { new_user = user_new(); idx = idx_mon_out = idx_mon_in = 0; } + if(tag >= TAG_START_PLAYERS && tag <= TAG_END_PLAYERS) + { + state = TAG_START_PLAYERS; + valid_tag = TRUE; + + if(tag == TAG_START_PLAYERS) + new_user.youth_academy.players = g_array_new(FALSE, FALSE, sizeof(Player)); + + xml_loadsave_players_start_element(tag, new_user.tm); + } + if(state == TAG_USER_MONEY_OUTS || state == TAG_USER_MONEY_INS) idx = 0; @@ -87,9 +104,9 @@ xml_loadsave_users_start_element (GMarkupParseContext *context, void xml_loadsave_users_end_element (GMarkupParseContext *context, - const gchar *element_name, - gpointer user_data, - GError **error) + const gchar *element_name, + gpointer user_data, + GError **error) { gint tag = xml_get_tag_from_name(element_name); @@ -111,7 +128,12 @@ xml_loadsave_users_end_element (GMarkupParseContext *context, tag == TAG_NAME || tag == TAG_TEAM_ID || tag == TAG_USER_HISTORY || - tag == TAG_USER_EVENT) + tag == TAG_USER_EVENT || + tag == TAG_USER_YA_COACH || + tag == TAG_USER_YA_PERCENTAGE || + tag == TAG_USER_YA_AV_COACH || + tag == TAG_USER_YA_AV_PERCENTAGE || + tag == TAG_USER_YA_COUNTER) { state = TAG_USER; if(tag == TAG_USER_COUNTER) @@ -148,6 +170,12 @@ xml_loadsave_users_end_element (GMarkupParseContext *context, tag == TAG_USER_EVENT_VALUE2 || tag == TAG_USER_EVENT_VALUE_STRING) state = TAG_USER_EVENT; + else if(tag >= TAG_START_PLAYERS && tag <= TAG_END_PLAYERS) + { + xml_loadsave_players_end_element(tag, new_user.youth_academy.players); + if(tag == TAG_START_PLAYERS) + state = TAG_USER; + } else if(tag != TAG_USERS) g_warning("xml_loadsave_users_end_element: unknown tag: %s; I'm in state %d\n", element_name, state); @@ -155,18 +183,20 @@ xml_loadsave_users_end_element (GMarkupParseContext *context, void xml_loadsave_users_text (GMarkupParseContext *context, - const gchar *text, - gsize text_len, - gpointer user_data, - GError **error) + const gchar *text, + gsize text_len, + gpointer user_data, + GError **error) { gchar buf[SMALL]; gint int_value = -1; + gfloat float_value = -1; strncpy(buf, text, text_len); buf[text_len] = '\0'; int_value = (gint)g_ascii_strtod(buf, NULL); + float_value = (gfloat)g_ascii_strtod(text, NULL) / 10000; if(state == TAG_NAME) g_string_printf(new_user.name, "%s", buf); @@ -220,6 +250,18 @@ xml_loadsave_users_text (GMarkupParseContext *context, new_event.value2 = int_value; else if(state == TAG_USER_EVENT_VALUE_STRING) new_event.value_string = g_string_new(buf); + else if(state == TAG_USER_YA_COACH) + new_user.youth_academy.coach = int_value; + else if(state == TAG_USER_YA_PERCENTAGE) + new_user.youth_academy.percentage = int_value; + else if(state == TAG_USER_YA_AV_COACH) + new_user.youth_academy.av_coach = float_value; + else if(state == TAG_USER_YA_AV_PERCENTAGE) + new_user.youth_academy.av_percentage = float_value; + else if(state == TAG_USER_YA_COUNTER) + new_user.youth_academy.counter_youth = float_value; + else if(state >= TAG_START_PLAYERS && state <= TAG_END_PLAYERS) + xml_loadsave_players_text(buf); } void @@ -353,6 +395,14 @@ xml_loadsave_users_write(const gchar *prefix) fprintf(fil, "%s\n", I1, TAG_USER_EVENT); } + xml_write_int(fil, usr(i).youth_academy.coach, TAG_USER_YA_COACH, I1); + xml_write_int(fil, usr(i).youth_academy.percentage, TAG_USER_YA_PERCENTAGE, I1); + xml_write_float(fil, usr(i).youth_academy.av_coach, TAG_USER_YA_AV_COACH, I1); + xml_write_float(fil, usr(i).youth_academy.av_percentage, TAG_USER_YA_AV_PERCENTAGE, I1); + xml_write_float(fil, usr(i).youth_academy.counter_youth, TAG_USER_YA_COUNTER, I1); + + xml_loadsave_players_write(fil, usr(i).youth_academy.players); + fprintf(fil, "\n", TAG_USER); } diff --git a/src/youth_academy.c b/src/youth_academy.c index d7be720b..e89864f7 100644 --- a/src/youth_academy.c +++ b/src/youth_academy.c @@ -181,9 +181,5 @@ youth_academy_update_weekly(void) _("A new youth wanted to registered at your youth academy but there was no room for him.")); } } - - /*d*/ - printf("we %d co %.1f pe %.1f count %.1f \n", - week, ya->av_coach, ya->av_percentage, ya->counter_youth); } }