"Transfer bug fixed."

po/bygfoot.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 13:03+0200\n"
+"POT-Creation-Date: 2005-07-03 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -733,38 +733,38 @@ msgstr ""
 msgid "Next (W)"
 msgstr ""
 
-#: src/lg_commentary.c:518 src/team.c:500
+#: src/lg_commentary.c:522 src/team.c:500
 msgid "ALL OUT DEFEND"
 msgstr ""
 
-#: src/lg_commentary.c:521 src/team.c:502
+#: src/lg_commentary.c:525 src/team.c:502
 msgid "DEFEND"
 msgstr ""
 
-#: src/lg_commentary.c:524 src/team.c:504
+#: src/lg_commentary.c:528 src/team.c:504
 msgid "BALANCED"
 msgstr ""
 
-#: src/lg_commentary.c:527 src/team.c:506
+#: src/lg_commentary.c:531 src/team.c:506
 msgid "ATTACK"
 msgstr ""
 
-#: src/lg_commentary.c:530 src/team.c:508
+#: src/lg_commentary.c:534 src/team.c:508
 msgid "ALL OUT ATTACK"
 msgstr ""
 
 #. Boost value.
-#: src/lg_commentary.c:533 src/team.c:516
+#: src/lg_commentary.c:537 src/team.c:516
 msgid "ANTI"
 msgstr ""
 
 #. Boost value.
-#: src/lg_commentary.c:536 src/team.c:519
+#: src/lg_commentary.c:540 src/team.c:519
 msgid "OFF"
 msgstr ""
 
 #. Boost value.
-#: src/lg_commentary.c:539 src/team.c:522
+#: src/lg_commentary.c:543 src/team.c:522
 msgid "ON"
 msgstr ""
 
@@ -1691,7 +1691,7 @@ msgstr ""
 msgid "W  "
 msgstr ""
 
-#: src/transfer.c:435
+#: src/transfer.c:437
 #, c-format
 msgid "%s has been added to the transfer list for %d weeks."
 msgstr ""

src/lg_commentary.c

@@ -412,11 +412,15 @@ lg_commentary_set_team_tokens(const LiveGameUnit *unit, const Fixture *fix)
 	    g_strdup(fix->teams[(unit->result[0] > unit->result[1])]->name->str);
 	token_rep[option_int("string_lg_commentary_token_team_winning", &lg_tokens)] = 
 	    g_strdup(fix->teams[(unit->result[0] < unit->result[1])]->name->str);
+	token_rep[option_int("string_lg_commentary_token_team_losingn", &lg_tokens)] = 
+	    misc_int_to_char((unit->result[0] > unit->result[1]));
+	token_rep[option_int("string_lg_commentary_token_team_winningn", &lg_tokens)] = 
+	    misc_int_to_char((unit->result[0] < unit->result[1]));
     }
 
     if(unit->event.team != -1)
 	token_rep[option_int("string_lg_commentary_token_team", &lg_tokens)] = 
-	    g_strdup(fix->teams[unit->event.team]->name->str);
+	    misc_int_to_char(unit->event.team);
 }
 
 /** Set the player tokens. */

src/misc.c

@@ -383,6 +383,18 @@ misc_parse_comparison(const gchar *s, gint *result)
 	       *result = *result < value;
 	    }
 	    break;
+      case 'L':
+            if (*(s+1) == 'E')
+	    {
+	       s = misc_parse_expression(s+2, &value);
+	       *result = *result <= value;
+	    }
+	    else 
+	    {
+               s = misc_parse_expression(s+1, &value);
+	       *result = *result < value;
+	    }
+	    break;
        case '=':
 	       s = misc_parse_expression(s+1, &value);
 	       *result = *result == value;
@@ -399,6 +411,18 @@ misc_parse_comparison(const gchar *s, gint *result)
 	       *result = *result > value;
 	    }
 	    break;
+       case 'G': 
+	   if (*(s+1) == 'E')
+	   {
+	       s = misc_parse_expression(s+2, &value);
+	       *result = *result >= value;
+	    }
+	    else 
+	    {
+               s = misc_parse_expression(s+1, &value);
+	       *result = *result > value;
+	    }
+	    break;
        case '!':
 	   if(*(s + 1) == '=')
 	   {

src/transfer.c

@@ -159,11 +159,13 @@ void
 transfer_evaluate_offers(void)
 {
     gint i, j;
-    gboolean notify = FALSE;
+    gboolean notify;
 
     for(i=transfer_list->len - 1;i>=0;i--)
 	if(trans(i).offers->len > 0)
 	{
+	    notify = FALSE;
+
 	    if(team_is_user(trans(i).tm) == -1)
 	    {
 		for(j=trans(i).offers->len - 1; j >= 0; j--)

support_files/bygfoot_constants

@@ -144,7 +144,7 @@ float_game_stadium_capacity_reduce_factor 15000
 # position weights determining what kind of player
 # gets picked in the live game for an event (depending
 # on the area the live game is in
-float_game_player_weight_attack_def	2500
+float_game_player_weight_attack_def	2250
 float_game_player_weight_attack_mid	4000
 float_game_player_weight_attack_fwd	12000
 

support_files/bygfoot_help

@@ -13,8 +13,10 @@ string_contrib_entry Mark Calderbank (England)
 string_contrib_entry Tobe & Arne Deprez (Belgium)
 string_contrib_entry Celso Goya (Brazil)
 string_contrib_entry Arnaud Le Rouzic (France)
+string_contrib_entry Michal Rudolf (Poland)
 string_contrib_entry Cristian Spoiala (Romania)
 
 string_contrib_title Translations
+string_contrib_entry Alexandre Beraud (French)
 string_contrib_entry Győző Both (German)
 string_contrib_entry Tobe & Arne Deprez (Dutch)