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

Some bugfixes.

Browse Source
This commit is contained in:
gyboth 2005-04-25 19:39:43 +00:00
parent 07974ae794
commit 214538c1d5
9 changed files with 95 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/callback_func.c
View File

@ -26,38 +26,33 @@ callback_show_next_live_game(void)
stat0 = STATUS_SHOW_LIVE_GAME;
if(week_round == 1)
{
for(i=0;i<ligs->len;i++)
for(j=0;j<lig(i).fixtures->len;j++)
if(g_array_index(lig(i).fixtures, Fixture, j).week_number == week &&
g_array_index(lig(i).fixtures, Fixture, j).week_round_number == week_round &&
fixture_user_team_involved(&g_array_index(lig(i).fixtures, Fixture, j)) != -1 &&
g_array_index(lig(i).fixtures, Fixture, j).attendance == -1 &&
option_int("int_opt_user_show_live_game",
&usr(fixture_user_team_involved(&g_array_index(lig(i).fixtures, Fixture, j))).
options))
{
live_game_calculate_fixture(&g_array_index(lig(i).fixtures, Fixture, j));
return;
}
}
else
{
for(i=0;i<cps->len;i++)
for(j=0;j<cp(i).fixtures->len;j++)
if(g_array_index(cp(i).fixtures, Fixture, j).week_number == week &&
g_array_index(cp(i).fixtures, Fixture, j).week_round_number == week_round &&
fixture_user_team_involved(&g_array_index(cp(i).fixtures, Fixture, j)) != -1 &&
g_array_index(cp(i).fixtures, Fixture, j).attendance == -1 &&
option_int("int_opt_user_show_live_game",
&usr(fixture_user_team_involved(&g_array_index(cp(i).fixtures, Fixture, j))).
options))
{
live_game_calculate_fixture(&g_array_index(cp(i).fixtures, Fixture, j));
return;
}
}
for(i=0;i<ligs->len;i++)
for(j=0;j<lig(i).fixtures->len;j++)
if(g_array_index(lig(i).fixtures, Fixture, j).week_number == week &&
g_array_index(lig(i).fixtures, Fixture, j).week_round_number == week_round &&
fixture_user_team_involved(&g_array_index(lig(i).fixtures, Fixture, j)) != -1 &&
g_array_index(lig(i).fixtures, Fixture, j).attendance == -1 &&
option_int("int_opt_user_show_live_game",
&usr(fixture_user_team_involved(&g_array_index(lig(i).fixtures, Fixture, j))).
options))
{
live_game_calculate_fixture(&g_array_index(lig(i).fixtures, Fixture, j));
return;
}
for(i=0;i<acps->len;i++)
for(j=0;j<acp(i)->fixtures->len;j++)
if(g_array_index(acp(i)->fixtures, Fixture, j).week_number == week &&
g_array_index(acp(i)->fixtures, Fixture, j).week_round_number == week_round &&
fixture_user_team_involved(&g_array_index(acp(i)->fixtures, Fixture, j)) != -1 &&
g_array_index(acp(i)->fixtures, Fixture, j).attendance == -1 &&
option_int("int_opt_user_show_live_game",
&usr(fixture_user_team_involved(&g_array_index(acp(i)->fixtures, Fixture, j))).
options))
{
live_game_calculate_fixture(&g_array_index(acp(i)->fixtures, Fixture, j));
return;
}
window_destroy(&window.live, TRUE);

10
src/cup.c
View File

@ -211,8 +211,8 @@ cup_get_choose_team_league_cup(const CupChooseTeam *ct,
break;
}
for(i=0;i<cps->len;i++)
if(strcmp(cp(i).sid->str, ct->sid->str) == 0)
for(i=0;i<acps->len;i++)
if(strcmp(acp(i)->sid->str, ct->sid->str) == 0)
{
*cup = &cp(i);
*league = NULL;
@ -681,6 +681,10 @@ cup_from_clid(gint clid)
{
gint i;
for(i=0;i<acps->len;i++)
if(acp(i)->id == clid)
return acp(i);
for(i=0;i<cps->len;i++)
if(cp(i).id == clid)
return &cp(i);
@ -694,7 +698,7 @@ cup_from_clid(gint clid)
lig(i).prom_rel.prom_games_cup.id == clid)
return &lig(i).prom_rel.prom_games_cup;
g_warning("cup_all_from_clid: didn't find cup with id %d\n", clid);
g_warning("cup_from_clid: didn't find cup with id %d\n", clid);
return NULL;
}

64
src/fixture.c
View File

@ -565,11 +565,11 @@ fixture_get_free_round(gint week_number, gint clid)
if(clid < ID_CUP_START || query_cup_is_prom(clid))
return 1;
for(i=0;i<cps->len;i++)
if(cp(i).id != clid)
for(j=0;j<cp(i).fixtures->len;j++)
if(g_array_index(cp(i).fixtures, Fixture, j).week_number == week_number &&
g_array_index(cp(i).fixtures, Fixture, j).week_round_number == max_round + 1)
for(i=0;i<acps->len;i++)
if(acp(i)->id != clid)
for(j=0;j<acp(i)->fixtures->len;j++)
if(g_array_index(acp(i)->fixtures, Fixture, j).week_number == week_number &&
g_array_index(acp(i)->fixtures, Fixture, j).week_round_number == max_round + 1)
max_round = MAX(max_round,
g_array_index(cp(i).fixtures, Fixture, j).week_round_number);
@ -923,16 +923,15 @@ fixture_get_latest(const Team *tm)
g_ptr_array_add(latest, &g_array_index(lig(i).fixtures, Fixture, j));
}
if(query_is_in_international_cups(tm))
for(i=0;i<cps->len;i++)
{
for(j=0;j<cp(i).fixtures->len;j++)
if(g_array_index(cp(i).fixtures, Fixture, j).attendance == -1)
break;
else if(g_array_index(cp(i).fixtures, Fixture, j).teams[0] == tm ||
g_array_index(cp(i).fixtures, Fixture, j).teams[1] == tm)
g_ptr_array_add(latest, &g_array_index(cp(i).fixtures, Fixture, j));
}
for(i=0;i<acps->len;i++)
{
for(j=0;j<acp(i)->fixtures->len;j++)
if(g_array_index(acp(i)->fixtures, Fixture, j).attendance == -1)
break;
else if(g_array_index(acp(i)->fixtures, Fixture, j).teams[0] == tm ||
g_array_index(acp(i)->fixtures, Fixture, j).teams[1] == tm)
g_ptr_array_add(latest, &g_array_index(acp(i)->fixtures, Fixture, j));
}
g_ptr_array_sort_with_data(latest, fixture_compare_func, GINT_TO_POINTER(FIXTURE_COMPARE_DATE));
@ -957,16 +956,15 @@ fixture_get_coming(const Team *tm)
g_ptr_array_add(coming, &g_array_index(lig(i).fixtures, Fixture, j));
}
if(query_is_in_international_cups(tm))
for(i=0;i<cps->len;i++)
{
for(j=cp(i).fixtures->len - 1; j >= 0; j--)
if(g_array_index(cp(i).fixtures, Fixture, j).attendance != -1)
break;
else if(g_array_index(cp(i).fixtures, Fixture, j).teams[0] == tm ||
g_array_index(cp(i).fixtures, Fixture, j).teams[1] == tm)
g_ptr_array_add(coming, &g_array_index(cp(i).fixtures, Fixture, j));
}
for(i=0;i<acps->len;i++)
{
for(j=acp(i)->fixtures->len - 1; j >= 0; j--)
if(g_array_index(acp(i)->fixtures, Fixture, j).attendance != -1)
break;
else if(g_array_index(acp(i)->fixtures, Fixture, j).teams[0] == tm ||
g_array_index(acp(i)->fixtures, Fixture, j).teams[1] == tm)
g_ptr_array_add(coming, &g_array_index(acp(i)->fixtures, Fixture, j));
}
g_ptr_array_sort_with_data(coming, fixture_compare_func, GINT_TO_POINTER(FIXTURE_COMPARE_DATE));
@ -993,16 +991,16 @@ fixture_get_matches(const Team *tm1, const Team *tm2)
g_ptr_array_add(matches, &g_array_index(lig(i).fixtures, Fixture, j));
}
for(i=0;i<cps->len;i++)
for(j=0;j<cp(i).fixtures->len;j++)
for(i=0;i<acps->len;i++)
for(j=0;j<acp(i)->fixtures->len;j++)
{
if(g_array_index(cp(i).fixtures, Fixture, j).attendance == -1)
if(g_array_index(acp(i)->fixtures, Fixture, j).attendance == -1)
break;
else if((g_array_index(cp(i).fixtures, Fixture, j).teams[0] == tm1 &&
g_array_index(cp(i).fixtures, Fixture, j).teams[1] == tm2) ||
(g_array_index(cp(i).fixtures, Fixture, j).teams[0] == tm2 &&
g_array_index(cp(i).fixtures, Fixture, j).teams[1] == tm1))
g_ptr_array_add(matches, &g_array_index(cp(i).fixtures, Fixture, j));
else if((g_array_index(acp(i)->fixtures, Fixture, j).teams[0] == tm1 &&
g_array_index(acp(i)->fixtures, Fixture, j).teams[1] == tm2) ||
(g_array_index(acp(i)->fixtures, Fixture, j).teams[0] == tm2 &&
g_array_index(acp(i)->fixtures, Fixture, j).teams[1] == tm1))
g_ptr_array_add(matches, &g_array_index(acp(i)->fixtures, Fixture, j));
}
return matches;

8
src/league.c
View File

@ -82,8 +82,8 @@ league_cup_get_index_from_clid(gint clid)
}
}
else
for(i=0;i<cps->len;i++)
if(cp(i).id == clid)
for(i=0;i<acps->len;i++)
if(acp(i)->id == clid)
{
index = i;
break;
@ -127,8 +127,8 @@ league_cup_get_next_clid(gint clid)
if(i != ligs->len - 1)
return_value = lig(i + 1).id;
else if(cps->len > 0)
return_value = cp(0).id;
else if(acps->len > 0)
return_value = acp(0)->id;
else
return_value = lig(0).id;
}

2
src/player.c
View File

@ -983,7 +983,7 @@ player_update_post_match(Player *pl, gint clid)
{
player_card_set(pl, clid, PLAYER_VALUE_CARD_YELLOW, 0, FALSE);
if(player_card_get(pl, clid, PLAYER_VALUE_CARD_RED) == 0)
if(player_card_get(pl, clid, PLAYER_VALUE_CARD_RED) == 0 && opt_int("int_opt_debug") < 50)
player_card_set(pl, clid, PLAYER_VALUE_CARD_RED, 1, FALSE);
}
}

36
src/team.c
View File

@ -382,23 +382,23 @@ team_get_fixture(const Team *tm, gboolean last_fixture)
}
}
for(i=0;i<cps->len;i++)
for(i=0;i<acps->len;i++)
{
if(cp(i).type == CUP_TYPE_NATIONAL ||
query_is_in_cup(tm, &cp(i)))
if(acp(i)->type == CUP_TYPE_NATIONAL ||
query_is_in_cup(tm, acp(i)))
{
for(j=0;j<cp(i).fixtures->len;j++)
if((g_array_index(cp(i).fixtures, Fixture, j).teams[0] == tm ||
g_array_index(cp(i).fixtures, Fixture, j).teams[1] == tm))
for(j=0;j<acp(i)->fixtures->len;j++)
if((g_array_index(acp(i)->fixtures, Fixture, j).teams[0] == tm ||
g_array_index(acp(i)->fixtures, Fixture, j).teams[1] == tm))
{
if(g_array_index(cp(i).fixtures, Fixture, j).attendance == -1 &&
if(g_array_index(acp(i)->fixtures, Fixture, j).attendance == -1 &&
(next_fix == NULL ||
query_fixture_is_earlier(&g_array_index(cp(i).fixtures, Fixture, j), next_fix)))
next_fix = &g_array_index(cp(i).fixtures, Fixture, j);
else if(g_array_index(cp(i).fixtures, Fixture, j).attendance != -1 &&
query_fixture_is_earlier(&g_array_index(acp(i)->fixtures, Fixture, j), next_fix)))
next_fix = &g_array_index(acp(i)->fixtures, Fixture, j);
else if(g_array_index(acp(i)->fixtures, Fixture, j).attendance != -1 &&
(last_fix == NULL ||
query_fixture_is_later(&g_array_index(cp(i).fixtures, Fixture, j), last_fix)))
last_fix = &g_array_index(cp(i).fixtures, Fixture, j);
query_fixture_is_later(&g_array_index(acp(i)->fixtures, Fixture, j), last_fix)))
last_fix = &g_array_index(acp(i)->fixtures, Fixture, j);
}
}
}
@ -918,12 +918,12 @@ query_team_plays(const Team *tm, gint week_number, gint week_round_number)
}
else
{
for(i=0;i<cps->len;i++)
for(j=0;j<cp(i).fixtures->len;j++)
if(g_array_index(cp(i).fixtures, Fixture, j).week_number == week_number &&
g_array_index(cp(i).fixtures, Fixture, j).week_round_number == week_round_number &&
(g_array_index(cp(i).fixtures, Fixture, j).teams[0] == tm ||
g_array_index(cp(i).fixtures, Fixture, j).teams[1] == tm))
for(i=0;i<acps->len;i++)
for(j=0;j<acp(i)->fixtures->len;j++)
if(g_array_index(acp(i)->fixtures, Fixture, j).week_number == week_number &&
g_array_index(acp(i)->fixtures, Fixture, j).week_round_number == week_round_number &&
(g_array_index(acp(i)->fixtures, Fixture, j).teams[0] == tm ||
g_array_index(acp(i)->fixtures, Fixture, j).teams[1] == tm))
return TRUE;
}

10
src/user.c
View File

@ -189,11 +189,11 @@ query_user_game_in_week_round(gint usr_idx, gint week_number, gint week_round_nu
}
else
{
for(i=0;i<cps->len;i++)
for(j=0;j<cp(i).fixtures->len;j++)
if(fixture_user_team_involved(&g_array_index(cp(i).fixtures, Fixture, j)) == usr_idx &&
g_array_index(cp(i).fixtures, Fixture, j).week_number == week_number &&
g_array_index(cp(i).fixtures, Fixture, j).week_round_number == week_round_number)
for(i=0;i<acps->len;i++)
for(j=0;j<acp(i)->fixtures->len;j++)
if(fixture_user_team_involved(&g_array_index(acp(i)->fixtures, Fixture, j)) == usr_idx &&
g_array_index(acp(i)->fixtures, Fixture, j).week_number == week_number &&
g_array_index(acp(i)->fixtures, Fixture, j).week_round_number == week_round_number)
return TRUE;
}

2
support_files/bygfoot_constants
View File

@ -216,7 +216,7 @@ int_user_success_national_quarter 30
# success points for promotion and relegation
int_user_success_promotion 60
int_user_success_relegation 50
int_user_success_relegation 60
# points above or below which there might be a job
# offer

2
support_files/bygfoot_user.conf
View File

@ -5,7 +5,7 @@
# is rather clear if you take a look at the options window in the game.
int_opt_user_show_live_game 0
int_opt_user_live_game_speed 0
int_opt_user_live_game_speed -10
int_opt_user_show_tendency_bar 1
int_opt_user_pause_injury 1
int_opt_user_pause_red 1