rixty/bygfoot
1
1
Fork 0
mirror of https://github.com/tstellar/bygfoot.git synced 2025-02-07 15:18:41 +01:00
Code Issues Projects Releases Wiki Activity

Minor bug fixed.

Browse Source
This commit is contained in:
gyboth 2005-05-16 14:44:13 +00:00
parent 9a8761c129
commit 71483a7602
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game.c
View File

@ -608,11 +608,12 @@ game_substitute_player(Team *tm, gint player_number)
/** Find out whether we substitute a player to balance /** Find out whether we substitute a player to balance
a team after a red card. a team after a red card.
@param clid The cup/league id of the fixture.
@param tm The team. @param tm The team.
@return A player index or -1 if we don't substitute. @return A player index or -1 if we don't substitute.
*/ */
gint gint
game_find_to_substitute(const Team *tm) game_find_to_substitute(gint clid, const Team *tm)
{ {
gint i; gint i;
gint position_to_substitute = -1; gint position_to_substitute = -1;
@ -624,7 +625,7 @@ game_find_to_substitute(const Team *tm)
num_def = math_get_place(current_structure, 3); num_def = math_get_place(current_structure, 3);
for(i=0;i<11;i++) for(i=0;i<11;i++)
if(player_is_banned(player_of_idx_team(tm, i)) <= 0) if(player_card_get(player_of_idx_team(tm, i), clid, PLAYER_VALUE_CARD_RED) <= 0)
g_ptr_array_add(players, player_of_idx_team(tm, i)); g_ptr_array_add(players, player_of_idx_team(tm, i));
g_ptr_array_sort_with_data(players, (GCompareDataFunc)player_compare_func, g_ptr_array_sort_with_data(players, (GCompareDataFunc)player_compare_func,
@ -677,13 +678,14 @@ game_player_get_ban_duration(void)
} }
/** Find out whether we make a sub after a send-off. /** Find out whether we make a sub after a send-off.
@param clid The id of the fixture.
@param tm The team. @param tm The team.
@param player The player index. @param player The player index.
@param to_substitute The return location for the index of @param to_substitute The return location for the index of
the player to substitute. the player to substitute.
@param substitute The return location for the player who comes into the game. */ @param substitute The return location for the player who comes into the game. */
void void
game_substitute_player_send_off(Team *tm, gint player_number, game_substitute_player_send_off(gint clid, Team *tm, gint player_number,
gint *to_substitute, gint *substitute) gint *to_substitute, gint *substitute)
{ {
gint i; gint i;
@ -694,7 +696,7 @@ game_substitute_player_send_off(Team *tm, gint player_number,
num_mid = math_get_place(current_structure, 2), num_mid = math_get_place(current_structure, 2),
num_def = math_get_place(current_structure, 3); num_def = math_get_place(current_structure, 3);
*to_substitute = game_find_to_substitute(tm); *to_substitute = game_find_to_substitute(clid, tm);
if(*to_substitute == -1) if(*to_substitute == -1)
return; return;

4
src/game.h
View File

@ -56,10 +56,10 @@ gfloat
game_get_foul_possession_factor(gboolean boost1, gboolean boost2); game_get_foul_possession_factor(gboolean boost1, gboolean boost2);
gint gint
game_find_to_substitute(const Team *tm); game_find_to_substitute(gint clid, const Team *tm);
void void
game_substitute_player_send_off(Team *tm, gint player_number, game_substitute_player_send_off(gint clid, Team *tm, gint player_number,
gint *to_substitute, gint *substitute); gint *to_substitute, gint *substitute);
void void
game_decrease_fitness(const Fixture *fix); game_decrease_fitness(const Fixture *fix);

3
src/live_game.c
View File

@ -821,7 +821,8 @@ live_game_event_send_off(gint team, gint player, gboolean second_yellow)
misc_callback_pause_live_game(); misc_callback_pause_live_game();
else if(tm[team]->players->len > 11) else if(tm[team]->players->len > 11)
{ {
game_substitute_player_send_off(tm[team], player_id_index(tm[team], player), game_substitute_player_send_off(match->fix->clid,
tm[team], player_id_index(tm[team], player),
&to_substitute, &substitute); &to_substitute, &substitute);
if(to_substitute != -1) if(to_substitute != -1)