From f3b9966bcdb32e078acf45fe2145c8ce95781d9d Mon Sep 17 00:00:00 2001 From: gyboth Date: Sun, 7 May 2006 16:32:52 +0000 Subject: [PATCH] "Bugfix related to the WC 2006." --- ChangeLog | 7 ++++++- po/bg.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 4 ++-- po/es.po | 4 ++-- po/fr.po | 4 ++-- po/nl.po | 4 ++-- po/pl.po | 4 ++-- po/ro.po | 4 ++-- po/sv.po | 4 ++-- po/zh.po | 4 ++-- src/cup.c | 10 +++++----- src/start_end.c | 3 ++- 13 files changed, 33 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ebefe05..5595facf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,13 @@ -4/10/2006: v1.9.6 +5/13/2006: v1.9.6 - fixed a bug that made the main window remain insensitive after opening and closing some other window - fixed a bug that crashed the game when loading memorable matches - fixed some nonsensical decisions in the strategy xml files + - updated Irish definition (Mark Calderbank) + - fixed a bug that crashed the game if you changed boost/style in + the live game window near the end of the game + - fixed a bug that made the WC 2006 unplayable (the final in + Germany got skipped) 3/24/2006: v1.9.5 diff --git a/po/bg.po b/po/bg.po index c51406bb..d6ff657e 100644 --- a/po/bg.po +++ b/po/bg.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bygfoot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-19 18:54+0200\n" +"POT-Creation-Date: 2006-05-07 18:30+0200\n" "PO-Revision-Date: 2006-03-01 17:06+0200\n" "Last-Translator: Rostislav \"zbrox\" Raykov \n" "Language-Team: Bulgarian \n" @@ -762,7 +762,7 @@ msgstr "" msgid "Boost" msgstr "Тласък" -#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:440 +#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:443 msgid "Boost ON is disabled in this country definition." msgstr "" "Режимът на тласъка \"Включен\" е изключен в дефиницията за тази страна." diff --git a/po/da.po b/po/da.po index 35493b68..110caf39 100644 --- a/po/da.po +++ b/po/da.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bygfoot Football Manager 1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-19 18:54+0200\n" +"POT-Creation-Date: 2006-05-07 18:30+0200\n" "PO-Revision-Date: 2006-03-27 06:17+0100\n" "Last-Translator: Kristian Poul Herkild \n" "Language-Team: \n" @@ -755,7 +755,7 @@ msgstr "" msgid "Boost" msgstr "Boost" -#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:440 +#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:443 msgid "Boost ON is disabled in this country definition." msgstr "Boost Til er slået fra i denne landedefinition." diff --git a/po/de.po b/po/de.po index 66fa628e..428a7650 100644 --- a/po/de.po +++ b/po/de.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-19 18:54+0200\n" +"POT-Creation-Date: 2006-05-07 18:30+0200\n" "PO-Revision-Date: 2006-02-23 18:24+0100\n" "Last-Translator: Michael Trent \n" "Language-Team: Deutsch \n" @@ -766,7 +766,7 @@ msgstr "Zweiwöchige Bilanz (Woche %d und %d)" msgid "Boost" msgstr "Boost" -#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:440 +#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:443 msgid "Boost ON is disabled in this country definition." msgstr "Boost AN ist in dieser Länderdefinition ausgeschaltet." diff --git a/po/es.po b/po/es.po index 95b2112a..18d207f5 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: es-1.9.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-19 18:54+0200\n" +"POT-Creation-Date: 2006-05-07 18:30+0200\n" "PO-Revision-Date: 2006-03-17 11:30+0100\n" "Last-Translator: Carlos Garces \n" "Language-Team: \n" @@ -758,7 +758,7 @@ msgstr "" msgid "Boost" msgstr "Motivación" -#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:440 +#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:443 msgid "Boost ON is disabled in this country definition." msgstr "'Motivación' está deshabilitado en esta definición regional." diff --git a/po/fr.po b/po/fr.po index d5362705..25b360c4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Bygfoot 1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-19 18:54+0200\n" +"POT-Creation-Date: 2006-05-07 18:30+0200\n" "PO-Revision-Date: 2006-03-01 23:33+0100\n" "Last-Translator: Forjan Frédéric \n" "Language-Team: French\n" @@ -761,7 +761,7 @@ msgstr "" msgid "Boost" msgstr "Boost" -#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:440 +#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:443 msgid "Boost ON is disabled in this country definition." msgstr "Boost ON désactivé dans cette définition de pays." diff --git a/po/nl.po b/po/nl.po index a98a8153..eba93626 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Bygfoot 1.9.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-19 18:54+0200\n" +"POT-Creation-Date: 2006-05-07 18:30+0200\n" "PO-Revision-Date: 2006-03-17 11:27+0100\n" "Last-Translator: Arne en Tobe Deprez \n" "Language-Team: Dutch \n" @@ -760,7 +760,7 @@ msgstr "" msgid "Boost" msgstr "Motivatie:" -#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:440 +#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:443 msgid "Boost ON is disabled in this country definition." msgstr "Extra Motivatie kan niet gebruikt worden in dit land bestand." diff --git a/po/pl.po b/po/pl.po index 15e211cb..456298ed 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-19 18:54+0200\n" +"POT-Creation-Date: 2006-05-07 18:30+0200\n" "PO-Revision-Date: 2006-02-28 22:51+0100\n" "Last-Translator: Michal Rudolf \n" "Language-Team: Polish \n" @@ -763,7 +763,7 @@ msgstr "" msgid "Boost" msgstr "Mobilizacja" -#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:440 +#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:443 msgid "Boost ON is disabled in this country definition." msgstr "Mobilizacja jest wyłączona w tej definicji kraju." diff --git a/po/ro.po b/po/ro.po index 9058c501..48e3a4b0 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bygfoot 0.9.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-19 18:54+0200\n" +"POT-Creation-Date: 2006-05-07 18:30+0200\n" "PO-Revision-Date: 2006-03-17 11:31+0100\n" "Last-Translator: Spoială Cristian \n" "Language-Team: Romanian\n" @@ -755,7 +755,7 @@ msgstr "Balanţa bisăptămânala(Saptamina %d si %d)" msgid "Boost" msgstr "Stimulent" -#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:440 +#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:443 msgid "Boost ON is disabled in this country definition." msgstr "Stimulentul este dezactivat în definiţia ţărilor." diff --git a/po/sv.po b/po/sv.po index aacacd22..7c2b5e84 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bygfoot 1.9.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-19 18:54+0200\n" +"POT-Creation-Date: 2006-05-07 18:30+0200\n" "PO-Revision-Date: 2006-02-26 22:53+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -757,7 +757,7 @@ msgstr "" msgid "Boost" msgstr "Boost" -#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:440 +#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:443 msgid "Boost ON is disabled in this country definition." msgstr "Boost PÅ är inaktiverad i det här landets definition." diff --git a/po/zh.po b/po/zh.po index 1e24bc93..af25978b 100644 --- a/po/zh.po +++ b/po/zh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: bygfoot 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-19 18:54+0200\n" +"POT-Creation-Date: 2006-05-07 18:30+0200\n" "PO-Revision-Date: 2005-09-28 13:35+0800\n" "Last-Translator: root \n" "Language-Team: Chinese \n" @@ -747,7 +747,7 @@ msgstr "" msgid "Boost" msgstr "ǿģʽ" -#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:440 +#: src/callbacks.c:847 src/game_gui.c:418 src/misc_callbacks.c:443 msgid "Boost ON is disabled in this country definition." msgstr "ļ Boost ON " diff --git a/src/cup.c b/src/cup.c index aae7a9b4..f0b60d93 100644 --- a/src/cup.c +++ b/src/cup.c @@ -987,11 +987,11 @@ query_cup_begins(const Cup *cup) &g_array_index(cup_round->choose_teams, CupChooseTeam, i), &league, &cup_temp); - if((cup_temp == NULL && - (!league->active || - g_array_index(league->fixtures, Fixture, - league->fixtures->len - 1).attendance == -1)) || - (league == NULL && + if((cup_temp == NULL && + league->active && + g_array_index(league->fixtures, Fixture, + league->fixtures->len - 1).attendance == -1) || + (league == NULL && ((cup_temp->fixtures->len > 0 && g_array_index(cup_temp->fixtures, Fixture, cup_temp->fixtures->len - 1).attendance == -1) || diff --git a/src/start_end.c b/src/start_end.c index a3f9c4bc..b4173d15 100644 --- a/src/start_end.c +++ b/src/start_end.c @@ -401,7 +401,8 @@ end_week_round_update_fixtures(void) fixture_update(acp(i)); for(i=0;ilen;i++) - if(lig(i).active && week == g_array_index( + if(lig(i).active && week == + g_array_index( lig(i).fixtures, Fixture, lig(i).fixtures->len - 1).week_number && week_round == 1 && team_is_user(g_array_index(lig(i).table.elements, TableElement, 0).team) != -1)