From 33c14b056f56b52670de6dba6ff840b69f82c0a0 Mon Sep 17 00:00:00 2001 From: gyboth Date: Fri, 9 Dec 2005 15:52:57 +0000 Subject: [PATCH] "Minor usability improvements." --- ChangeLog | 31 ++-- bygfoot_misc.glade | 310 ++++++++++++++++--------------- locale/bg/LC_MESSAGES/bygfoot.mo | Bin 66556 -> 66556 bytes locale/da/LC_MESSAGES/bygfoot.mo | Bin 50500 -> 50500 bytes locale/de/LC_MESSAGES/bygfoot.mo | Bin 51831 -> 57758 bytes locale/es/LC_MESSAGES/bygfoot.mo | Bin 50054 -> 50054 bytes locale/fr/LC_MESSAGES/bygfoot.mo | Bin 55304 -> 58999 bytes locale/nl/LC_MESSAGES/bygfoot.mo | Bin 57000 -> 57030 bytes locale/pl/LC_MESSAGES/bygfoot.mo | Bin 56795 -> 56795 bytes locale/ro/LC_MESSAGES/bygfoot.mo | Bin 46887 -> 46887 bytes locale/zh/LC_MESSAGES/bygfoot.mo | Bin 41659 -> 41659 bytes src/callback_func.c | 76 ++++---- src/callbacks.c | 31 +++- src/lg_commentary.c | 3 +- src/live_game.c | 11 +- src/misc_callbacks.c | 10 - src/misc_callbacks.h | 7 +- src/misc_interface.c | 72 +++---- src/transfer.c | 110 ++++++----- src/treeview_helper.c | 5 +- src/user.c | 6 +- support_files/bygfoot_help | 4 +- 22 files changed, 367 insertions(+), 309 deletions(-) diff --git a/ChangeLog b/ChangeLog index 765666cd..7691b6dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,22 +1,25 @@ -10/10/2005: v1.9.2 +11/16/2005: v1.9.3 + - updated German country definition (thanks to Sebastian Vöcking) + - added strategies for CPU teams + - added option to randomise teams in cups in the startup window + (relevant for the World Cup definition, mainly) + - added betting + - minor bugfixes + + +10/16/2005: v1.9.2 - fixed some minor bugs - - updated some translations - - switched to Gnu zip in the Windows port + - updated translations + - added Spanish and Chinese translations + - switched from 'arj' to GNU 'zip' in the Windows port - added player streaks (hot/cold) - added definition for the Netherlands (thanks to Zwakstroom) - added definition for the World Cup 2006 Germany - minor definition system improvements - - boost costs money - - reworked the Brazilian definition, making it more like it is in - reality - - added some nice pictures to the progress bar shown when - calculating results or loading/saving games - - added search popup to the teams list in the startup window (just - type a few letters to begin search) - - added job exchange (including jobs from abroad!) - - added betting - - added definition for Greece (thanks to Theodore Dimitriadis) - + - window geometry can be saved + - boost and style change 'on the fly' during live games + - added season results view (Figures -> Season results) + - added command line options 09/10/2005: v1.9.1 - updated German and Dutch translations diff --git a/bygfoot_misc.glade b/bygfoot_misc.glade index e2108c43..616f8b7d 100644 --- a/bygfoot_misc.glade +++ b/bygfoot_misc.glade @@ -27,6 +27,73 @@ False 0 + + + True + False + 0 + + + + True + Choose country + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 5 + + + 0 + False + False + + + + + + True + + + + 0 + True + True + + + + + 5 + False + True + + + + + + True + Choose team + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 5 + + + 0 + False + False + + + True @@ -80,7 +147,6 @@ True True True - @@ -110,56 +176,10 @@ - - - True - False - 0 - - - - True - Choose country - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 5 - - - 0 - False - False - - - - - - True - - - - 0 - True - True - - - - - 5 - False - True - - - 1 - 5 + 10 True @@ -172,7 +192,7 @@ True - Start in + Choose league to start in False False GTK_JUSTIFY_LEFT @@ -214,33 +234,33 @@ + + + True + Choose username + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + True False 5 - - - True - Username - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - True @@ -261,81 +281,6 @@ True - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Add user - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - 0 @@ -344,6 +289,81 @@ + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Add user + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + 1 diff --git a/locale/bg/LC_MESSAGES/bygfoot.mo b/locale/bg/LC_MESSAGES/bygfoot.mo index 644a4ed846623bb121e1106a0a4b14e3cbfb176e..310afec731dbdbcaac99877adbb6df37e2afe45b 100644 GIT binary patch delta 22 dcmey<&hn?7WkXm6ySaj)nU#^z=Gcn)-2iCL2%-Q0 delta 22 dcmey<&hn?7WkXm6yODySp_QS<=Gcn)-2iBU2%P`` diff --git a/locale/da/LC_MESSAGES/bygfoot.mo b/locale/da/LC_MESSAGES/bygfoot.mo index 88eb067828c7cb240db777b7af2d65c83ec47bd1..3be8a13ad14634b3b5a632a97abce9153eabc623 100644 GIT binary patch delta 22 dcmX@o#eAfTd4q5zySaj)nU#^zW~oXo9{^ev2L1p5 delta 22 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 delta 14144 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 D9!!c= diff --git a/locale/nl/LC_MESSAGES/bygfoot.mo b/locale/nl/LC_MESSAGES/bygfoot.mo index ccdfff37ee30783aca8b99ab3f91573077573e32..af63572685369711606aeb79cfa872d97baf38d8 100644 GIT binary patch delta 5628 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 delta 5597 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 diff --git a/locale/pl/LC_MESSAGES/bygfoot.mo b/locale/pl/LC_MESSAGES/bygfoot.mo index 2fbed26cba2ec19becb4da717381655a0d4a1a61..0aaeb6c39655956f0b9f2b6f735dd8b426dc2fb2 100644 GIT binary patch delta 42 rcmcb;oB8%`<_)*n*i94+&8-YgCO>RjGI?Tq6t^809BzKq{xK8)bEXhu delta 41 qcmcb;oB8%`<_)*n*o_nn4Xq3Rj!es}ClbhRPHotEF5DEZP6c7{u diff --git a/locale/ro/LC_MESSAGES/bygfoot.mo b/locale/ro/LC_MESSAGES/bygfoot.mo index df113fd5a874f62b32244eb63e2493e21587a794..7031fc832daebcaacfee8450d84b89aa38cc876e 100644 GIT binary patch delta 22 ecmZ4fj%oQjrVRzT?B)uFW>!W_!TPhE|3ao6B=Icme=xUkIuI diff --git a/locale/zh/LC_MESSAGES/bygfoot.mo b/locale/zh/LC_MESSAGES/bygfoot.mo index bfc18bbc0bba065096f2e532fa34978639a8dbbf..3f7cf65e0532f29714683245007274e6700fe49a 100644 GIT binary patch delta 22 ecmdmelxg=-rVT>H?B)uFW>!Wq^^)(5Qs delta 22 ecmdmelxg=-rVT>H>_!TPhE|3anq^^iU+6w diff --git a/src/callback_func.c b/src/callback_func.c index 33809a5f..ec3994ef 100644 --- a/src/callback_func.c +++ b/src/callback_func.c @@ -102,33 +102,6 @@ callback_player_clicked(gint idx, GdkEventButton *event) return; if(event->button == 1) - { - if(selected_row == -1) - { - selected_row = idx; - return; - } - - player_swap(current_user.tm, selected_row, - current_user.tm, idx); - if(opt_user_int("int_opt_user_swap_adapts") == 1 && - current_user.tm->structure != - team_find_appropriate_structure(current_user.tm)) - { - team_change_structure(current_user.tm, - team_find_appropriate_structure(current_user.tm)); - team_rearrange(current_user.tm); - } - - game_gui_write_av_skills(); - - selected_row = -1; - - treeview_show_user_player_list(); - if(stat0 == STATUS_MAIN) - treeview_show_next_opponent(); - } - else if(event->button == 3) { if(stat0 == STATUS_SHOW_TRANSFER_LIST) { @@ -142,10 +115,37 @@ callback_player_clicked(gint idx, GdkEventButton *event) } else { - selected_row = idx; - window_show_menu_player((GdkEvent*)event); + if(selected_row == -1) + { + selected_row = idx; + return; + } + + player_swap(current_user.tm, selected_row, + current_user.tm, idx); + if(opt_user_int("int_opt_user_swap_adapts") == 1 && + current_user.tm->structure != + team_find_appropriate_structure(current_user.tm)) + { + team_change_structure(current_user.tm, + team_find_appropriate_structure(current_user.tm)); + team_rearrange(current_user.tm); + } + + game_gui_write_av_skills(); + + selected_row = -1; + + treeview_show_user_player_list(); + if(stat0 == STATUS_MAIN) + treeview_show_next_opponent(); } } + else if(event->button == 3) + { + selected_row = idx; + window_show_menu_player((GdkEvent*)event); + } setsav0; } @@ -361,7 +361,8 @@ callback_transfer_list_user(gint button, gint idx) gchar buf[SMALL], buf2[SMALL], buf3[SMALL]; - if(button == 3) + if(button == 3 || + (button == 1 && trans(idx).offers->len == 0)) { transfer_remove_player(idx); on_button_transfers_clicked(NULL, NULL); @@ -369,10 +370,8 @@ callback_transfer_list_user(gint button, gint idx) } else if(button == 1) { - if(trans(idx).offers->len == 0) - game_gui_print_message(_("There are no offers for the player.")); - else if(trans(idx).offers->len > 0 && - transoff(idx, 0).status != TRANSFER_OFFER_ACCEPTED) + if(trans(idx).offers->len > 0 && + transoff(idx, 0).status != TRANSFER_OFFER_ACCEPTED) game_gui_print_message(_("There are some offers for the player which you rejected or will see next week.")); else { @@ -794,9 +793,10 @@ callback_show_youth_academy(void) attributes.on_off[PLAYER_LIST_ATTRIBUTE_ETAL] = 1; if(stat0 != STATUS_SHOW_YA) - game_gui_print_message(_("Right click to move players to and from the youth academy; left click for context menu.")); + game_gui_print_message(_("Left click to move players to and from the youth academy; right click for context menu.")); - treeview_show_player_list(GTK_TREE_VIEW(lookup_widget(window.main, "treeview_right")), - player_get_pointers_from_array(current_user.youth_academy.players), - attributes, FALSE); + treeview_show_player_list( + GTK_TREE_VIEW(lookup_widget(window.main, "treeview_right")), + player_get_pointers_from_array(current_user.youth_academy.players), + attributes, FALSE); } diff --git a/src/callbacks.c b/src/callbacks.c index ce012293..b6dff548 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -176,11 +176,19 @@ on_button_transfers_clicked (GtkButton *button, game_gui_print_message(_("Transfers are disabled in this country definition.")); else if(week < transfer_get_deadline() || transfer_list->len > 0) { - stat0 = STATUS_SHOW_TRANSFER_LIST; - game_gui_print_message(_("Left click to make an offer. Right click to remove offer.")); - game_gui_print_message_with_delay(_("Transfer deadline is Week %d"), transfer_get_deadline()); - treeview_show_transfer_list(GTK_TREE_VIEW(lookup_widget(window.main, "treeview_right"))); - gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(window.main, "notebook_player")), 1); + if(stat0 != STATUS_SHOW_TRANSFER_LIST) + { + stat0 = STATUS_SHOW_TRANSFER_LIST; + game_gui_print_message( + _("Left click to make an offer. Right click to remove offer.")); + game_gui_print_message_with_delay( + _("Transfer deadline is Week %d"), transfer_get_deadline()); + } + + treeview_show_transfer_list( + GTK_TREE_VIEW(lookup_widget(window.main, "treeview_right"))); + gtk_notebook_set_current_page( + GTK_NOTEBOOK(lookup_widget(window.main, "notebook_player")), 1); gui_set_arrows(); } @@ -533,7 +541,8 @@ on_menu_move_to_youth_academy_activate (GtkMenuItem *menuitem, if(pl->age > const_float("float_player_age_lower")) game_gui_print_message(_("The player is too old for the youth academy.")); else if(current_user.tm->players->len <= 11) - game_gui_print_message(_("You can't move the player, there are too few players in your team.")); + game_gui_print_message( + _("You can't move the player, there are too few players in your team.")); else if(current_user.youth_academy.players->len == const_int("int_youth_academy_max_youths")) game_gui_print_message(_("There is no room in your youth academy.")); @@ -616,7 +625,8 @@ on_treeview_right_button_press_event (GtkWidget *widget, { case STATUS_SHOW_TRANSFER_LIST: if(trans(idx - 1).tm == current_user.tm || - (trans(idx - 1).offers->len > 0 && transoff(idx - 1, 0).status == TRANSFER_OFFER_ACCEPTED) || + (trans(idx - 1).offers->len > 0 && + transoff(idx - 1, 0).status == TRANSFER_OFFER_ACCEPTED) || event->button == 1) callback_transfer_list_clicked(event->button, idx - 1); else if(event->button == 3) @@ -624,7 +634,8 @@ on_treeview_right_button_press_event (GtkWidget *widget, if(transfer_remove_offer(idx - 1, current_user.tm)) game_gui_print_message(_("Your offer has been removed.")); else - game_gui_print_message(_("You haven't made an offer for the player.")); + game_gui_print_message( + _("You haven't made an offer for the player.")); return TRUE; } break; @@ -639,9 +650,9 @@ on_treeview_right_button_press_event (GtkWidget *widget, break; case STATUS_SHOW_YA: selected_row = idx - 1; - if(event->button == 3) + if(event->button == 1) on_menu_youth_move_to_team_activate(NULL, NULL); - else + else if(event->button == 3) window_show_menu_youth((GdkEvent*)event); break; case STATUS_SHOW_JOB_EXCHANGE: diff --git a/src/lg_commentary.c b/src/lg_commentary.c index 3c9b5c79..0856bca6 100644 --- a/src/lg_commentary.c +++ b/src/lg_commentary.c @@ -453,7 +453,8 @@ lg_commentary_set_player_tokens(const LiveGameUnit *unit, const Fixture *fix) player_get_last_name(pl1->name)); misc_token_add(token_rep, option_int("string_token_player_goals0", &tokens), - misc_int_to_char(player_games_goals_get(pl1, fix->clid, PLAYER_VALUE_GOALS))); + misc_int_to_char(player_games_goals_get( + pl1, fix->clid, PLAYER_VALUE_GOALS))); misc_token_add(token_rep, option_int("string_token_player_goals_all0", &tokens), misc_int_to_char(player_all_games_goals(pl1, PLAYER_VALUE_GOALS))); diff --git a/src/live_game.c b/src/live_game.c index 27f38d44..b1a06e24 100644 --- a/src/live_game.c +++ b/src/live_game.c @@ -474,8 +474,9 @@ live_game_event_injury(gint team, gint player, gboolean create_new) last_unit.event.player)->fitness = MAX(0, player_of_id_team(tms[last_unit.event.team], last_unit.event.player)->fitness - - math_rnd(const_float("float_live_game_temp_injury_fitness_decrease_lower"), - const_float("float_live_game_temp_injury_fitness_decrease_upper"))); + math_rnd( + const_float("float_live_game_temp_injury_fitness_decrease_lower"), + const_float("float_live_game_temp_injury_fitness_decrease_upper"))); } live_game_finish_unit(); @@ -612,7 +613,8 @@ live_game_event_scoring_chance(void) else { last_unit.event.player = - game_get_player(tms[last_unit.possession], last_unit.area, 0, -1, TRUE); + game_get_player( + tms[last_unit.possession], last_unit.area, 0, -1, TRUE); last_unit.event.player2 = game_get_player(tms[last_unit.possession], last_unit.area, 0, @@ -708,6 +710,9 @@ live_game_event_general(gboolean create_new) debug > 130) printf("\t\tlive_game_event_general\n"); + if(create_new && stat0 == STATUS_LIVE_GAME_PAUSE) + return; + if(create_new) { new.minute = live_game_get_minute(); diff --git a/src/misc_callbacks.c b/src/misc_callbacks.c index 767f4a64..3e946244 100644 --- a/src/misc_callbacks.c +++ b/src/misc_callbacks.c @@ -70,16 +70,6 @@ on_team_selection_cancel_clicked (GtkButton *button, main_exit_program(EXIT_OK, NULL); } - -void -on_team_selection_tv_row_activated (GtkTreeView *treeview, - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data) -{ - on_button_add_player_clicked(NULL, NULL); -} - void on_team_selection_load_clicked (GtkButton *button, gpointer user_data) diff --git a/src/misc_callbacks.h b/src/misc_callbacks.h index 9ce5f5e6..2c8d92b0 100644 --- a/src/misc_callbacks.h +++ b/src/misc_callbacks.h @@ -35,11 +35,6 @@ on_team_selection_cancel_clicked (GtkButton *button, gpointer user_data); void -on_team_selection_tv_row_activated (GtkTreeView *treeview, - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data); -void on_team_selection_ok_clicked (GtkButton *button, gpointer user_data); @@ -173,7 +168,6 @@ on_button_sponsors_clicked (GtkButton *button, void on_button_sponsors_wait_clicked (GtkButton *button, gpointer user_data); -#endif gboolean on_eventbox_lg_style_button_press_event @@ -186,3 +180,4 @@ on_eventbox_lg_boost_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data); +#endif diff --git a/src/misc_interface.c b/src/misc_interface.c index 5e923e25..c2904746 100644 --- a/src/misc_interface.c +++ b/src/misc_interface.c @@ -31,21 +31,22 @@ create_window_startup (void) { GtkWidget *window_startup; GtkWidget *vbox2; + GtkWidget *vbox34; + GtkWidget *label69; + GtkWidget *combo_country; + GtkWidget *label121; GtkWidget *hpaned1; GtkWidget *scrolledwindow10; GtkWidget *treeview_users; GtkWidget *scrolledwindow1; GtkWidget *treeview_startup; GtkWidget *hseparator10; - GtkWidget *vbox34; - GtkWidget *label69; - GtkWidget *combo_country; GtkWidget *hseparator11; GtkWidget *label4; GtkWidget *comboboxentry_start_league; GtkWidget *hseparator12; - GtkWidget *hbox54; GtkWidget *label75; + GtkWidget *hbox54; GtkWidget *entry_player_name; GtkWidget *button_add_player; GtkWidget *alignment19; @@ -94,6 +95,24 @@ create_window_startup (void) gtk_widget_show (vbox2); gtk_container_add (GTK_CONTAINER (window_startup), vbox2); + vbox34 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox34); + gtk_box_pack_start (GTK_BOX (vbox2), vbox34, FALSE, TRUE, 5); + + label69 = gtk_label_new (_("Choose country")); + gtk_widget_show (label69); + gtk_box_pack_start (GTK_BOX (vbox34), label69, FALSE, FALSE, 0); + gtk_misc_set_padding (GTK_MISC (label69), 0, 5); + + combo_country = gtk_combo_box_new_text (); + gtk_widget_show (combo_country); + gtk_box_pack_start (GTK_BOX (vbox34), combo_country, TRUE, TRUE, 0); + + label121 = gtk_label_new (_("Choose team")); + gtk_widget_show (label121); + gtk_box_pack_start (GTK_BOX (vbox2), label121, FALSE, FALSE, 0); + gtk_misc_set_padding (GTK_MISC (label121), 0, 5); + hpaned1 = gtk_hpaned_new (); gtk_widget_show (hpaned1); gtk_box_pack_start (GTK_BOX (vbox2), hpaned1, TRUE, TRUE, 0); @@ -128,25 +147,12 @@ create_window_startup (void) gtk_box_pack_start (GTK_BOX (vbox2), hseparator10, FALSE, FALSE, 0); gtk_widget_set_size_request (hseparator10, 1, 5); - vbox34 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox34); - gtk_box_pack_start (GTK_BOX (vbox2), vbox34, FALSE, TRUE, 5); - - label69 = gtk_label_new (_("Choose country")); - gtk_widget_show (label69); - gtk_box_pack_start (GTK_BOX (vbox34), label69, FALSE, FALSE, 0); - gtk_misc_set_padding (GTK_MISC (label69), 0, 5); - - combo_country = gtk_combo_box_new_text (); - gtk_widget_show (combo_country); - gtk_box_pack_start (GTK_BOX (vbox34), combo_country, TRUE, TRUE, 0); - hseparator11 = gtk_hseparator_new (); gtk_widget_show (hseparator11); gtk_box_pack_start (GTK_BOX (vbox2), hseparator11, FALSE, FALSE, 0); - gtk_widget_set_size_request (hseparator11, 1, 5); + gtk_widget_set_size_request (hseparator11, 1, 10); - label4 = gtk_label_new (_("Start in")); + label4 = gtk_label_new (_("Choose league to start in")); gtk_widget_show (label4); gtk_box_pack_start (GTK_BOX (vbox2), label4, FALSE, FALSE, 0); @@ -159,14 +165,14 @@ create_window_startup (void) gtk_box_pack_start (GTK_BOX (vbox2), hseparator12, FALSE, FALSE, 0); gtk_widget_set_size_request (hseparator12, 1, 5); + label75 = gtk_label_new (_("Choose username")); + gtk_widget_show (label75); + gtk_box_pack_start (GTK_BOX (vbox2), label75, FALSE, FALSE, 0); + hbox54 = gtk_hbox_new (FALSE, 5); gtk_widget_show (hbox54); gtk_box_pack_start (GTK_BOX (vbox2), hbox54, FALSE, TRUE, 0); - label75 = gtk_label_new (_("Username")); - gtk_widget_show (label75); - gtk_box_pack_start (GTK_BOX (hbox54), label75, FALSE, FALSE, 0); - entry_player_name = gtk_entry_new (); gtk_widget_show (entry_player_name); gtk_box_pack_start (GTK_BOX (hbox54), entry_player_name, TRUE, TRUE, 0); @@ -175,7 +181,7 @@ create_window_startup (void) button_add_player = gtk_button_new (); gtk_widget_show (button_add_player); - gtk_box_pack_start (GTK_BOX (hbox54), button_add_player, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox2), button_add_player, FALSE, FALSE, 0); alignment19 = gtk_alignment_new (0.5, 0.5, 0, 0); gtk_widget_show (alignment19); @@ -326,15 +332,12 @@ create_window_startup (void) g_signal_connect ((gpointer) window_startup, "delete_event", G_CALLBACK (on_team_selection_cancel_clicked), NULL); - g_signal_connect ((gpointer) treeview_users, "button_press_event", - G_CALLBACK (on_treeview_users_button_press_event), - NULL); - g_signal_connect ((gpointer) treeview_startup, "row_activated", - G_CALLBACK (on_team_selection_tv_row_activated), - NULL); g_signal_connect ((gpointer) combo_country, "changed", G_CALLBACK (on_combo_country_changed), NULL); + g_signal_connect ((gpointer) treeview_users, "button_press_event", + G_CALLBACK (on_treeview_users_button_press_event), + NULL); g_signal_connect ((gpointer) entry_player_name, "activate", G_CALLBACK (on_entry_player_name_activate), NULL); @@ -357,21 +360,22 @@ create_window_startup (void) /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (window_startup, window_startup, "window_startup"); GLADE_HOOKUP_OBJECT (window_startup, vbox2, "vbox2"); + GLADE_HOOKUP_OBJECT (window_startup, vbox34, "vbox34"); + GLADE_HOOKUP_OBJECT (window_startup, label69, "label69"); + GLADE_HOOKUP_OBJECT (window_startup, combo_country, "combo_country"); + GLADE_HOOKUP_OBJECT (window_startup, label121, "label121"); GLADE_HOOKUP_OBJECT (window_startup, hpaned1, "hpaned1"); GLADE_HOOKUP_OBJECT (window_startup, scrolledwindow10, "scrolledwindow10"); GLADE_HOOKUP_OBJECT (window_startup, treeview_users, "treeview_users"); GLADE_HOOKUP_OBJECT (window_startup, scrolledwindow1, "scrolledwindow1"); GLADE_HOOKUP_OBJECT (window_startup, treeview_startup, "treeview_startup"); GLADE_HOOKUP_OBJECT (window_startup, hseparator10, "hseparator10"); - GLADE_HOOKUP_OBJECT (window_startup, vbox34, "vbox34"); - GLADE_HOOKUP_OBJECT (window_startup, label69, "label69"); - GLADE_HOOKUP_OBJECT (window_startup, combo_country, "combo_country"); GLADE_HOOKUP_OBJECT (window_startup, hseparator11, "hseparator11"); GLADE_HOOKUP_OBJECT (window_startup, label4, "label4"); GLADE_HOOKUP_OBJECT (window_startup, comboboxentry_start_league, "comboboxentry_start_league"); GLADE_HOOKUP_OBJECT (window_startup, hseparator12, "hseparator12"); - GLADE_HOOKUP_OBJECT (window_startup, hbox54, "hbox54"); GLADE_HOOKUP_OBJECT (window_startup, label75, "label75"); + GLADE_HOOKUP_OBJECT (window_startup, hbox54, "hbox54"); GLADE_HOOKUP_OBJECT (window_startup, entry_player_name, "entry_player_name"); GLADE_HOOKUP_OBJECT (window_startup, button_add_player, "button_add_player"); GLADE_HOOKUP_OBJECT (window_startup, alignment19, "alignment19"); diff --git a/src/transfer.c b/src/transfer.c index bc3387bc..3412ad4d 100644 --- a/src/transfer.c +++ b/src/transfer.c @@ -108,22 +108,29 @@ transfer_add_cpu_offers(void) if(team_is_user(trans(i).tm) != -1 && trans(i).offers->len == 0 && math_rnd(0, 1) < const_float("float_transfer_offer_prob_max") - - (user_from_team(trans(i).tm)->scout % 10 * const_float("float_transfer_offer_prob_reduce"))) - transfer_add_offer(i, transfer_team_get_new(), - (gint)rint((gfloat)player_of_id_team(trans(i).tm, trans(i).id)->value * - (1 + math_rnd( - scout_factor_bounds[user_from_team(trans(i).tm)->scout % 10][0], - scout_factor_bounds[user_from_team(trans(i).tm)->scout % 10][1]))), - -1); + (user_from_team(trans(i).tm)->scout % 10 * + const_float("float_transfer_offer_prob_reduce"))) + transfer_add_offer( + i, transfer_team_get_new(), + math_round_integer( + (gint)rint( + (gfloat)player_of_id_team(trans(i).tm, trans(i).id)->value * + (1 + math_rnd( + scout_factor_bounds[user_from_team(trans(i).tm)->scout % 10][0], + scout_factor_bounds[user_from_team(trans(i).tm)->scout % 10][1]))), 2), + -1); } + /** Return a random team as a potential buyer for a user player. */ Team* transfer_team_get_new(void) { gint rndom; - GPtrArray *league_teams = team_get_sorted(team_compare_func, TEAM_COMPARE_UNSORTED, FALSE), - *cup_teams = team_get_sorted(team_compare_func, TEAM_COMPARE_UNSORTED, TRUE); + GPtrArray *league_teams = team_get_sorted(team_compare_func, + TEAM_COMPARE_UNSORTED, FALSE), + *cup_teams = team_get_sorted(team_compare_func, + TEAM_COMPARE_UNSORTED, TRUE); Team *return_value = NULL; while(return_value == NULL || team_is_user(return_value) != -1) @@ -206,29 +213,39 @@ transfer_evaluate_offers(void) { if(transoff(i, j).status != TRANSFER_OFFER_REJECTED2) { - if(player_of_id_team(trans(i).tm, trans(i).id)->value > transoff(i, j).fee && - player_of_id_team(trans(i).tm, trans(i).id)->wage > transoff(i, j).wage) + if(player_of_id_team(trans(i).tm, trans(i).id)->value > + transoff(i, j).fee && + player_of_id_team(trans(i).tm, trans(i).id)->wage > + transoff(i, j).wage) { - user_event_add(user_from_team(transoff(i, j).tm), - EVENT_TYPE_TRANSFER_OFFER_REJECTED_FEE_WAGE, - transoff(i, j).fee, transoff(i, j).wage, - trans(i).tm, player_of_id_team(trans(i).tm, trans(i).id)->name); + user_event_add( + user_from_team(transoff(i, j).tm), + EVENT_TYPE_TRANSFER_OFFER_REJECTED_FEE_WAGE, + transoff(i, j).fee, transoff(i, j).wage, + trans(i).tm, + player_of_id_team(trans(i).tm, trans(i).id)->name); transoff(i, j).status = TRANSFER_OFFER_REJECTED; } - else if(player_of_id_team(trans(i).tm, trans(i).id)->value > transoff(i, j).fee) + else if(player_of_id_team(trans(i).tm, trans(i).id)->value > + transoff(i, j).fee) { - user_event_add(user_from_team(transoff(i, j).tm), - EVENT_TYPE_TRANSFER_OFFER_REJECTED_FEE, - transoff(i, j).fee, transoff(i, j).wage, - trans(i).tm, player_of_id_team(trans(i).tm, trans(i).id)->name); + user_event_add( + user_from_team(transoff(i, j).tm), + EVENT_TYPE_TRANSFER_OFFER_REJECTED_FEE, + transoff(i, j).fee, transoff(i, j).wage, + trans(i).tm, + player_of_id_team(trans(i).tm, trans(i).id)->name); transoff(i, j).status = TRANSFER_OFFER_REJECTED; } - else if(player_of_id_team(trans(i).tm, trans(i).id)->wage > transoff(i, j).wage) + else if(player_of_id_team(trans(i).tm, trans(i).id)->wage > + transoff(i, j).wage) { - user_event_add(user_from_team(transoff(i, j).tm), - EVENT_TYPE_TRANSFER_OFFER_REJECTED_WAGE, - transoff(i, j).fee, transoff(i, j).wage, - trans(i).tm, player_of_id_team(trans(i).tm, trans(i).id)->name); + user_event_add( + user_from_team(transoff(i, j).tm), + EVENT_TYPE_TRANSFER_OFFER_REJECTED_WAGE, + transoff(i, j).fee, transoff(i, j).wage, + trans(i).tm, + player_of_id_team(trans(i).tm, trans(i).id)->name); transoff(i, j).status = TRANSFER_OFFER_REJECTED; } else @@ -257,11 +274,12 @@ transfer_add_new_players(void) const_int("int_transfer_max_players") - transfer_list->len); for(i=0;ivalue * (1 + deviance_value)); - new.wage[i] = (gint)rint((gfloat)pl->wage * (1 + deviance_wage)); + deviance_value = + math_rnd(-(i + 1) * const_float("float_transfer_scout_deviance_value"), + (i + 1) * const_float("float_transfer_scout_deviance_value")); + deviance_wage = + math_rnd(-(i + 1) * const_float("float_transfer_scout_deviance_wage"), + (i + 1) * const_float("float_transfer_scout_deviance_wage")); + new.fee[i] = math_round_integer( + (gint)rint((gfloat)pl->value * (1 + deviance_value)), 2); + new.wage[i] = math_round_integer( + (gint)rint((gfloat)pl->wage * (1 + deviance_wage)), 2); } g_array_append_val(transfer_list, new); @@ -453,13 +475,15 @@ transfer_add_remove_user_player(Player *pl) { if(week < transfer_get_deadline()) { - transfer_add_player(pl, - (gint)rint(((gfloat)const_int("int_transfer_time_lower") + - (gfloat)const_int("int_transfer_time_upper")) / 2)); - game_gui_print_message(_("%s has been added to the transfer list for %d weeks."), - pl->name, - (gint)rint(((gfloat)const_int("int_transfer_time_lower") + - (gfloat)const_int("int_transfer_time_upper")) / 2)); + transfer_add_player( + pl, + (gint)rint(((gfloat)const_int("int_transfer_time_lower") + + (gfloat)const_int("int_transfer_time_upper")) / 2)); + game_gui_print_message( + _("%s has been added to the transfer list for %d weeks."), + pl->name, + (gint)rint(((gfloat)const_int("int_transfer_time_lower") + + (gfloat)const_int("int_transfer_time_upper")) / 2)); } else { diff --git a/src/treeview_helper.c b/src/treeview_helper.c index 6529bcd2..01c139bd 100644 --- a/src/treeview_helper.c +++ b/src/treeview_helper.c @@ -703,7 +703,10 @@ treeview_helper_team_selection(GtkTreeViewColumn *col, g_object_set(renderer, "text", ((Team*)team_pointer)->name, NULL); else if(column == 4) { - sprintf(buf, "%.1f", team_get_average_skill((Team*)team_pointer, FALSE)); + if(stat0 == STATUS_TEAM_SELECTION) + strcpy(buf, ""); + else + sprintf(buf, "%.1f", team_get_average_skill((Team*)team_pointer, FALSE)); g_object_set(renderer, "text", buf, NULL); } else diff --git a/src/user.c b/src/user.c index c1625ebe..6f151eaa 100644 --- a/src/user.c +++ b/src/user.c @@ -633,8 +633,8 @@ user_history_add(User *user, gint type, const gchar *team_name, g_array_index(user->history, UserHistory, i).season == season && strcmp(g_array_index(user->history, UserHistory, i).team_name, team_name) == 0 && - strcmp(g_array_index(user->history, UserHistory, i).string[1], - string1) == 0) + strcmp(g_array_index(user->history, UserHistory, i).string[0], + string0) == 0) { /** Same cup round. */ if(strcmp(g_array_index(user->history, UserHistory, i).string[2], @@ -663,6 +663,8 @@ user_history_add(User *user, gint type, const gchar *team_name, { if(string0 != NULL) misc_string_assign(&his->string[0], string0); + if(string1 != NULL) + misc_string_assign(&his->string[1], string1); if(string2 != NULL) misc_string_assign(&his->string[2], string2); g_array_sort(user->history, (GCompareFunc)user_history_compare); diff --git a/support_files/bygfoot_help b/support_files/bygfoot_help index c14192f4..e6f97b32 100644 --- a/support_files/bygfoot_help +++ b/support_files/bygfoot_help @@ -27,8 +27,8 @@ string_contrib_entry Cristian Spoiala (Romania) string_contrib_entry Sebastian Vöcking (Germany) string_contrib_title Translations -string_contrib_entry Alexandre Beraud (French) -string_contrib_entry Győző Both (German) +string_contrib_entry Alexandre Beraud, Arnaud Le Rouzic (French) +string_contrib_entry Győző Both, Michael Trent (German) string_contrib_entry Tobe & Arne Deprez (Dutch) string_contrib_entry Marcelo Garrone, Carlos Garces (Spanish) string_contrib_entry Kristian Poul Herkild (Danish)