"Bugfixes."

This commit is contained in:
gyboth 2005-10-15 16:49:04 +00:00
parent ab67a9fc73
commit 7f2c108686
20 changed files with 80 additions and 118 deletions

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
AM_CFLAGS = -Wall -fprofile-arcs -ftest-coverage -pg
AM_CFLAGS = -Wall #-fprofile-arcs -ftest-coverage -pg
SUBDIRS = src po

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -422,7 +422,7 @@ msgstr "%s: %d седмици\n"
#: src/main.c:51
msgid "- a simple and addictive GTK2 football manager"
msgstr ""
msgstr " - прост и пристрастяващ GTK2 футболен мениджър"
#: src/misc_interface.c:981 src/misc_interface.c:989 src/misc_interface.c:1015
#: src/misc_interface.c:1023
@ -825,7 +825,7 @@ msgstr "Избор на файл"
#: src/options_interface.c:397
msgid "Choose game language (might not work in Windows versions)"
msgstr ""
msgstr "Избор на език на играта (може да не работи в Windows версията)"
#: src/misc2_interface.c:801
msgid "Click on a user to remove him from the game."
@ -1009,7 +1009,7 @@ msgstr "Готово."
#: src/treeview.c:1399
msgid "Drawing credit"
msgstr ""
msgstr "Кредитен лимит"
#. Games drawn.
#. Draw.
@ -1219,9 +1219,8 @@ msgid "Go/Ga"
msgstr "Гол/Мач"
#: src/treeview.c:1507
#, fuzzy
msgid "Goalie"
msgstr "Вратари"
msgstr "Вратар"
#: src/interface.c:637
msgid "Goalies"
@ -1393,7 +1392,7 @@ msgstr "Език"
#: src/main.c:42
msgid "Language to use (a code like 'de')"
msgstr ""
msgstr "Език, който да се използва (код като 'bg')"
#. A cup stage, e.g. Last 32 when there are only 32 teams left.
#: src/cup.c:904
@ -1471,9 +1470,8 @@ msgid "Load game (Ctrl - O)"
msgstr "Зареждане на игра (Ctrl - O)"
#: src/main.c:44
#, fuzzy
msgid "Load last savegame"
msgstr "Заре_ждане на последното запазване"
msgstr "Зареждане на последното запазване"
#: src/misc_interface.c:213
msgid "Load only the player names in the definition files"
@ -1969,7 +1967,7 @@ msgstr "Дясно натискане за настройване на 0"
#. Round
#: src/treeview2.c:161
msgid "Ro"
msgstr ""
msgstr "Кръг"
#: src/cup.c:896
msgid "Round robin"
@ -2020,11 +2018,11 @@ msgstr ""
#: src/interface.c:378
msgid "Save window geometry"
msgstr ""
msgstr "Запазване на геометрията на прозореца"
#: src/interface.c:381
msgid "Save window size, position and vertical divider"
msgstr ""
msgstr "Запазване на размера, позицията и вертикалния разделител на прозореца"
#: src/load_save.c:69
msgid "Saving cups..."
@ -2073,9 +2071,8 @@ msgid "Season history"
msgstr "История на сезона"
#: src/interface.c:438
#, fuzzy
msgid "Season results"
msgstr "Най-новите резултати"
msgstr "Резултати от сезона"
#: src/misc_interface.c:409 src/window.c:643
msgid "Select font"
@ -2204,7 +2201,7 @@ msgstr "Space"
#: src/main.c:38
msgid "Specify additional support directory (takes priority over default ones)"
msgstr ""
msgstr "Определяне на допълнителна поддържаща папка (има приоритет над стандартните)"
#: src/misc_interface.c:670
msgid "Speed"
@ -2273,9 +2270,8 @@ msgstr "Статус:"
#. Hot streak or cold streak of a player.
#: src/treeview.c:1862
#, fuzzy
msgid "Streak"
msgstr "Сезон"
msgstr "Серия"
#: src/callbacks.c:666
msgid "Structure"
@ -2391,14 +2387,12 @@ msgid "The player is not on the list."
msgstr "Играчът не е в списъка."
#: src/treeview_helper.c:934
#, fuzzy
msgid "The player is on a cold streak"
msgstr "Играчът не е в списъка."
msgstr "Играчът има лоша серия."
#: src/treeview_helper.c:932
#, fuzzy
msgid "The player is on a hot streak"
msgstr "Играчът не е в списъка."
msgstr "Играчът има добра серия."
#: src/callbacks.c:506
msgid "The player is too old for the youth academy."
@ -2454,14 +2448,12 @@ msgstr ""
"продължите ли?"
#: src/callbacks.c:382
#, fuzzy
msgid "There are no leagues in this country definition (only cups)."
msgstr "Трансферите в определенията за тази игра са изключени."
msgstr "Няма първенства в дефиницията за тази страна (само купи)."
#: src/callbacks.c:364
#, fuzzy
msgid "There are no leagues or cups with tables in this country definition."
msgstr "Трансферите в определенията за тази игра са изключени."
msgstr "Няма нито първенства, нито купи с таблици в тази дефиниция за страна."
#: src/callback_func.c:355
msgid "There are no offers for the player."
@ -2589,9 +2581,8 @@ msgstr "Заплати"
#. Week
#: src/treeview2.c:159
#, fuzzy
msgid "We"
msgstr "Седмица"
msgstr "Сед"
#: src/treeview.c:2007
msgid "Week"
@ -2943,7 +2934,7 @@ msgstr "Печелите финала за %s срещу %s."
#: src/finance.c:117
msgid "Your bank account has to be above your drawing credit limit next week."
msgstr ""
msgstr "Банковата Ви сметка, трябва да е над кредитния ви лимит следващата седмица."
#: src/user.c:915
#, c-format
@ -3040,10 +3031,8 @@ msgstr "Младежка академия"
#: src/callbacks.c:495 src/callbacks.c:1047 src/callbacks.c:1062
#: src/callbacks.c:1079
#, fuzzy
msgid "Youth academy is disabled in this country definition."
msgstr ""
"Режимът на тласъка \"Включен\" е изключен в дефиницията за тази страна."
msgstr "Младежката академия е изключена в тази дефиниция за страна."
#: src/interface.c:602 src/treeview.c:1314
msgid "Youth coach"
@ -3084,21 +3073,3 @@ msgstr "_Отбор"
#: src/interface.c:813
msgid "_User"
msgstr "Поребител"
#, fuzzy
#~ msgid "Left- and right click to change boost"
#~ msgstr "Дясно и ляво натискане за смяна на тласъка"
#, fuzzy
#~ msgid "Left- and right click to change style"
#~ msgstr "Дясно и ляво натискане за смяна на тласъка"
#~ msgid "News"
#~ msgstr "Новини"
#~ msgid ""
#~ "Setting the language only works for installed packages (not for the "
#~ "binary package)"
#~ msgstr ""
#~ "Настройването на езика работи само за инсталирани пакети (не за двоичния "
#~ "пакет)"

View File

@ -7,16 +7,16 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Bygfoot 1.9.1\n"
"Project-Id-Version: Bygfoot 1.9.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-13 10:47+0200\n"
"PO-Revision-Date: 2005-09-15 10:26+0200\n"
"PO-Revision-Date: 2005-10-13 16:38+0200\n"
"Last-Translator: Arne en Tobe Deprez <tobedeprez@scarlet.be>\n"
"Language-Team: Dutch <tobedeprez@scarlet.be>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Plural-Forms: nplurals=2; plural=(n != 1);"
#: src/treeview_helper.c:828
#, c-format
@ -422,7 +422,7 @@ msgstr "%s: %d weken\n"
#: src/main.c:51
msgid "- a simple and addictive GTK2 football manager"
msgstr ""
msgstr "- een simpele en verslavende GTK2 voetbal manager"
#: src/misc_interface.c:981 src/misc_interface.c:989 src/misc_interface.c:1015
#: src/misc_interface.c:1023
@ -485,14 +485,14 @@ msgstr "<span foreground='%s' background='%s'>Week %d Ronde %d</span>"
#: src/youth_academy.c:208
msgid "A new youth registered at your youth academy."
msgstr "Er is een niewe jeugtspeler in uw jeugt academie geregistreerd"
msgstr "Er is een niewe jeugdspeler in uw jeugd academie geregistreerd"
#: src/youth_academy.c:212
msgid ""
"A new youth wanted to registered at your youth academy but there was no room "
"for him."
msgstr ""
"Er wou een nieuwe jeugtspeler toetreden tot uw academy, maar er was geen "
"Er wou een nieuwe jeugdspeler toetreden tot uw academy, maar er was geen "
"plaats voor hem."
#: src/treeview_helper.c:1451
@ -825,7 +825,7 @@ msgstr "Kies een bestand"
#: src/options_interface.c:397
msgid "Choose game language (might not work in Windows versions)"
msgstr ""
msgstr "Kies spel taal (misshien werkt dit niet in Windows)"
#: src/misc2_interface.c:801
msgid "Click on a user to remove him from the game."
@ -866,7 +866,7 @@ msgstr "Vraag afsluiten wanneer niet opgeslagen"
#: src/options_interface.c:501
msgid "Confirm removing youths"
msgstr "Vraag voor verwijderen van jeugtspelers"
msgstr "Vraag voor verwijderen van jeugdspelers"
#: src/options_interface.c:214
msgid "Confirm when unfit"
@ -973,7 +973,7 @@ msgstr "Debug"
#: src/main.c:40
msgid "Debug level to use"
msgstr ""
msgstr "Debug level"
#: src/misc2_interface.c:1195
msgid "Decide later"
@ -1219,9 +1219,8 @@ msgid "Go/Ga"
msgstr "Go/Ma"
#: src/treeview.c:1507
#, fuzzy
msgid "Goalie"
msgstr "Keepers"
msgstr "Keeper"
#: src/interface.c:637
msgid "Goalies"
@ -1393,7 +1392,7 @@ msgstr "Taal"
#: src/main.c:42
msgid "Language to use (a code like 'de')"
msgstr ""
msgstr "Te gebruiken taal (een code zoals 'de')"
#. A cup stage, e.g. Last 32 when there are only 32 teams left.
#: src/cup.c:904
@ -1473,9 +1472,8 @@ msgid "Load game (Ctrl - O)"
msgstr "Laad spel (Ctrl+O)"
#: src/main.c:44
#, fuzzy
msgid "Load last savegame"
msgstr "L_aad laatste opgeslagen spel"
msgstr "Laad laatste opgeslagen spel"
#: src/misc_interface.c:213
msgid "Load only the player names in the definition files"
@ -1604,7 +1602,7 @@ msgstr "Zet in team"
#: src/interface.c:796 src/interface.c:1910
msgid "Move to youth academy"
msgstr "Zet in de jeugt academie"
msgstr "Zet in de jeugd academie"
#: src/interface.c:427
msgid "My league results"
@ -1959,7 +1957,7 @@ msgid ""
"Right click to move players to and from the youth academy; left click for "
"context menu."
msgstr ""
"Klik met de rechter muisknop om spelers naar en van de jeugt academie te "
"Klik met de rechter muisknop om spelers naar en van de jeugd academie te "
"verplaatsen; klik met de linker muisknop om het popup menu te tonen."
#: src/misc_interface.c:971 src/misc_interface.c:1005
@ -1969,7 +1967,7 @@ msgstr "Klik met de rechtermuisknop om op 0 te zetten"
#. Round
#: src/treeview2.c:161
msgid "Ro"
msgstr ""
msgstr "Ro"
#: src/cup.c:896
msgid "Round robin"
@ -2015,11 +2013,11 @@ msgstr "Sla gebruikersinstellingen op"
#: src/interface.c:378
msgid "Save window geometry"
msgstr ""
msgstr "Sla venster instellingen op"
#: src/interface.c:381
msgid "Save window size, position and vertical divider"
msgstr ""
msgstr "Sla de grote, de positie van het verster op."
#: src/load_save.c:69
msgid "Saving cups..."
@ -2068,9 +2066,8 @@ msgid "Season history"
msgstr "Seizoen geschiedenis"
#: src/interface.c:438
#, fuzzy
msgid "Season results"
msgstr "Laatste resultaten"
msgstr "Seizoen resultaten"
#: src/misc_interface.c:409 src/window.c:643
msgid "Select font"
@ -2088,7 +2085,7 @@ msgstr "Kies investering"
msgid ""
"Set the percentage of your income you want to devote to your youth academy."
msgstr ""
"Kies het pecentage van uw incomen dat je in de jeugt academie wilt "
"Kies het pecentage van uw incomen dat je in de jeugd academie wilt "
"investeren."
#: src/options_interface.c:514
@ -2175,7 +2172,7 @@ msgstr ""
#: src/interface.c:595
msgid "Show youth academy"
msgstr "Toon jeugt academie"
msgstr "Toon jeugd academie"
#. Skill of a player.
#: src/treeview.c:259
@ -2200,7 +2197,7 @@ msgstr "Spatie"
#: src/main.c:38
msgid "Specify additional support directory (takes priority over default ones)"
msgstr ""
msgstr "Kies de extra bestanden map (heeft voorrang over de standaard mappen)"
#: src/misc_interface.c:670
msgid "Speed"
@ -2269,9 +2266,8 @@ msgstr "Status:"
#. Hot streak or cold streak of a player.
#: src/treeview.c:1862
#, fuzzy
msgid "Streak"
msgstr "Sei"
msgstr "Vorm"
#: src/callbacks.c:666
msgid "Structure"
@ -2388,18 +2384,16 @@ msgid "The player is not on the list."
msgstr "De speler staat niet op de transferlijst"
#: src/treeview_helper.c:934
#, fuzzy
msgid "The player is on a cold streak"
msgstr "De speler staat niet op de transferlijst"
msgstr "De speler is in een minder goede periode"
#: src/treeview_helper.c:932
#, fuzzy
msgid "The player is on a hot streak"
msgstr "De speler staat niet op de transferlijst"
msgstr "De speler is in een goede periode"
#: src/callbacks.c:506
msgid "The player is too old for the youth academy."
msgstr "De speler is te oud voor de jeugt academie."
msgstr "De speler is te oud voor de jeugd academie."
#: src/callback_func.c:500
msgid "The player won't negotiate with you anymore."
@ -2450,14 +2444,12 @@ msgstr ""
"Doorgaan?"
#: src/callbacks.c:382
#, fuzzy
msgid "There are no leagues in this country definition (only cups)."
msgstr "Transfers zijn uitgeschakeld in dit land."
msgstr "Er zijn geen competieties in dit lan (alleen bekers)"
#: src/callbacks.c:364
#, fuzzy
msgid "There are no leagues or cups with tables in this country definition."
msgstr "Transfers zijn uitgeschakeld in dit land."
msgstr "Er zijn geen competieties of bekers met standen in dit land."
#: src/callback_func.c:355
msgid "There are no offers for the player."
@ -2473,7 +2465,7 @@ msgstr ""
#: src/callbacks.c:511
msgid "There is no room in your youth academy."
msgstr "Er is geen plaats in uw jeugt academie."
msgstr "Er is geen plaats in uw jeugd academie."
#: src/misc_callbacks.c:183
msgid ""
@ -2585,9 +2577,8 @@ msgstr "Lonen"
#. Week
#: src/treeview2.c:159
#, fuzzy
msgid "We"
msgstr "Week"
msgstr "We"
#: src/treeview.c:2007
msgid "Week"
@ -2616,7 +2607,7 @@ msgid ""
"academy"
msgstr ""
"Of er een bevestigingsdialoog moet getoont worden wanneer een speler uit de "
"jeugtacademie zet"
"jeugdacademie zet"
#: src/options_interface.c:227
msgid ""
@ -2906,6 +2897,7 @@ msgid ""
"You offered a transfer fee of %s and a wage of %s for %s. The owners and the "
"player are satisfied with your offer. Do you still want to buy the player?"
msgstr ""
"Je hebt een transfersom van %s en een loon van %s voor %s aangebode. De eigenaars en de spelers zijn opgetogen met uw aanbod. Wil je de speler nog steeds kopen?"
#. Cup round name (e.g. Last 32), number, cup name.
#: src/user.c:745
@ -3015,7 +3007,7 @@ msgid ""
"academy."
msgstr ""
"Jeugtspeler %s dacht dat hij oud genoeg was voor een echt contract en heeft "
"uw jeugt academie verlaten."
"uw jeugd academie verlaten."
#: src/youth_academy.c:173
#, c-format
@ -3038,9 +3030,8 @@ msgstr "Jeugt academie"
#: src/callbacks.c:495 src/callbacks.c:1047 src/callbacks.c:1062
#: src/callbacks.c:1079
#, fuzzy
msgid "Youth academy is disabled in this country definition."
msgstr "Extra Motivatie kan niet gebruikt worden in dit land bestand."
msgstr "De jeugdacademie kan niet gebruikt worden in dit land."
#: src/interface.c:602 src/treeview.c:1314
msgid "Youth coach"
@ -3079,24 +3070,5 @@ msgid "_Team"
msgstr "_Team"
#: src/interface.c:813
#, fuzzy
msgid "_User"
msgstr "Gebr_uiker"
#, fuzzy
#~ msgid "Left- and right click to change boost"
#~ msgstr "Rechter- en linkermuisknop om extra motivatiestatus te veranderen"
#, fuzzy
#~ msgid "Left- and right click to change style"
#~ msgstr "Rechter- en linkermuisknop om extra motivatiestatus te veranderen"
#~ msgid "News"
#~ msgstr "Niews"
#~ msgid ""
#~ "Setting the language only works for installed packages (not for the "
#~ "binary package)"
#~ msgstr ""
#~ "De taal instellingen werken alleen voor geinstaleerde paketten (niet voor "
#~ "het binary paket)"

View File

@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
AM_CFLAGS = -Wall -fprofile-arcs -ftest-coverage -pg
AM_CFLAGS = -Wall #-fprofile-arcs -ftest-coverage -pg
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \

View File

@ -4,6 +4,9 @@
#include "user.h"
#include "variables.h"
/*d*/
#include "league.h"
/**
Free all memory allocated by the program.
This mainly means we have to free a lot of strings

View File

@ -154,7 +154,7 @@ game_get_player(const Team *tm, gint player_type,
else
{
g_warning("game_get_player: All players injured or banned, apparently.\n");
printf("player list:\n");
printf("%s %s player list:\n", league_cup_get_name_string(tm->clid), tm->name);
for(i=0;i<tm->players->len;i++)
{
if(i < 10)

View File

@ -167,3 +167,12 @@ xml_load_transfers(const gchar *dirname, const gchar *basename)
xml_loadsave_transfers_read(buf);
}
void
xml_write_string(FILE *fil, const gchar *string, gint tag, const gchar* indent)
{
if(string == NULL)
return;
fprintf(fil, "%s<_%d>%s</_%d>\n", indent, tag, string, tag);
}

View File

@ -46,7 +46,6 @@ enum XmlTags
#define TAG_START_SEASON_STATS 11000
#define TAG_START_TRANSFERS 20000
#define xml_write_string(fil, string, tag, indent) fprintf(fil, "%s<_%d>%s</_%d>\n", indent, tag, string, tag)
#define xml_write_g_string(fil, gstring, tag, indent) xml_write_string(fil, (gstring)->str, tag, indent)
#define xml_write_int(fil, value, tag, indent) fprintf(fil, "%s<_%d>%d</_%d>\n", indent, tag, value, tag)
@ -55,6 +54,9 @@ enum XmlTags
#define xml_get_tag_from_name(name) (gint)g_ascii_strtod(name + 1, NULL)
void
xml_write_string(FILE *fil, const gchar *string, gint tag, const gchar* indent);
void
xml_load_users(const gchar *dirname, const gchar *basename);

View File

@ -163,7 +163,7 @@ xml_loadsave_cup_text (GMarkupParseContext *context,
buf[text_len] = '\0';
int_value = (gint)g_ascii_strtod(buf, NULL);
float_value = (gfloat)g_ascii_strtod(buf, NULL);
float_value = (gfloat)g_ascii_strtod(buf, NULL) / 10000;
if(state == TAG_NAME)
misc_string_assign(&new_cup->name, buf);

View File

@ -249,13 +249,13 @@ xml_loadsave_league_write(const gchar *prefix, const League *league)
fprintf(fil, "%s<_%d>\n", I0, TAG_LEAGUE_PROM_REL);
xml_write_string(fil, league->prom_rel.prom_games_dest_sid,
TAG_LEAGUE_PROM_REL_PROM_GAMES_DEST_SID, I1);
TAG_LEAGUE_PROM_REL_PROM_GAMES_DEST_SID, I1);
xml_write_string(fil, league->prom_rel.prom_games_cup_sid,
TAG_LEAGUE_PROM_REL_PROM_GAMES_CUP_SID, I1);
TAG_LEAGUE_PROM_REL_PROM_GAMES_CUP_SID, I1);
xml_write_int(fil, league->prom_rel.prom_games_number_of_advance,
TAG_LEAGUE_PROM_REL_PROM_GAMES_NUMBER_OF_ADVANCE, I1);
xml_write_string(fil, league->prom_rel.prom_games_loser_sid,
TAG_LEAGUE_PROM_REL_PROM_GAMES_LOSER_SID, I1);
TAG_LEAGUE_PROM_REL_PROM_GAMES_LOSER_SID, I1);
fprintf(fil, "%s<_%d>\n", I1, TAG_LEAGUE_PROM_REL_ELEMENTS);
for(i=0;i<league->prom_rel.elements->len;i++)

View File

@ -49,7 +49,10 @@ xml_loadsave_league_stat_start_element (GMarkupParseContext *context,
}
if(tag == TAG_STAT)
{
valueidx = 0;
new_stat.value_string = NULL;
}
else if(tag == TAG_STAT_TEAMS_OFF ||
tag == TAG_STAT_TEAMS_DEF ||
tag == TAG_STAT_PLAYER_SCORERS ||

View File

@ -152,11 +152,13 @@ xml_loadsave_live_game_text (GMarkupParseContext *context,
{
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 = g_ascii_strtod(buf, NULL) / 10000;
if(state == TAG_LIVE_GAME_FIX_ID)
{
@ -188,7 +190,7 @@ xml_loadsave_live_game_text (GMarkupParseContext *context,
else if(state == TAG_LIVE_GAME_UNIT_EVENT_VERBOSITY)
new_unit.event.verbosity = int_value;
else if(state == TAG_LIVE_GAME_STAT_POSSESSION)
lgame->stats.possession = int_value;
lgame->stats.possession = float_value;
else if(state == TAG_LIVE_GAME_STAT_VALUE)
lgame->stats.values[statvalidx][statvalidx2] = int_value;
else if(state == TAG_LIVE_GAME_STAT_PLAYER_ELEMENT)