Fixes; success counter.

src/callback_func.c

@@ -77,6 +77,14 @@ callback_player_clicked(gint idx, GdkEventButton *event)
     if(event->type != GDK_BUTTON_PRESS)
 	return;
 
+    /*d*/
+    gint i;
+    for(i=0;i<ligs->len;i++)
+	printf("%d %s %d \n ", i, lig(i).name->str, lig(i).id);
+    printf("\n");
+    for(i=0;i<cps->len;i++)
+	printf("%d %s %d \n ", i, cp(i).name->str, cp(i).id);
+
     if(event->button == 1)
     {
 	if(selected_row[0] == -1)

src/cup.c

@@ -196,7 +196,7 @@ cup_get_choose_team_league_cup(const CupChooseTeam *ct,
 	*league = &lig(idx - 1);
 	*cup = NULL;
     }
-    else if(g_str_has_prefix(ct->sid->str, "cup"))
+    else if(g_str_has_prefix(ct->sid->str, "cup") && strlen(ct->sid->str) < 6)
     {
 	*cup = &cp(idx - 1);
 	*league = NULL;

src/league.c

@@ -499,3 +499,16 @@ query_league_prom_games_begin(const League *league)
     
     return TRUE;
 }
+
+/** Find out whether there are/were league matches. */
+gboolean
+query_league_matches_in_week(const League *league, gint week_number)
+{
+    gint i;
+
+    for(i=0;i<league->fixtures->len;i++)
+	if(g_array_index(league->fixtures, Fixture, i).week_number == week_number)
+	    return TRUE;
+
+    return FALSE;
+}

src/league.h

@@ -63,4 +63,7 @@ query_league_rank_in_prom_games(const League *league, gint rank);
 gboolean
 query_league_prom_games_begin(const League *league);
 
+gboolean
+query_league_matches_in_week(const League *league, gint week_number);
+
 #endif

src/start_end.c

@@ -146,8 +146,6 @@ start_load_cup_teams(void)
     for(i=0;i<cps->len;i++)
 	if(cp(i).type == CUP_TYPE_INTERNATIONAL)
 	{
-	    printf("nam %s \n ", cp(i).name->str);
-
 	    cup_load_choose_teams(&cp(i));
 	    cup_load_choose_team_user(&cp(i));
 	}
@@ -360,9 +358,6 @@ start_week(void)
 	(*start_func)();
 	start_func++;
     }
-
-    /*d*/
-    printf("succ %d \n ", usr(0).counters[COUNT_USER_SUCCESS]);
 }
 
 /** Age increase etc. of players.

src/user.c

@@ -259,16 +259,19 @@ user_weekly_update_counters(User *user)
 	    MAX(cnts[COUNT_USER_STADIUM_SAFETY] - (gint)rint(increase_safety * 100), 0);
     }
     
-    if(rank < rank_bounds[0])
+    if(query_league_matches_in_week(league_from_clid(user->tm->clid), week))
-	user->counters[COUNT_USER_SUCCESS] += (rank_bounds[0] - rank);
-    else if(rank > rank_bounds[1])
-	user->counters[COUNT_USER_SUCCESS] -= (rank - rank_bounds[1]);
-    else
     {
-	if(user->counters[COUNT_USER_SUCCESS] > 0)
+	if(rank < rank_bounds[0])
-	    user->counters[COUNT_USER_SUCCESS] -= const_int("int_user_success_mediocre_rank_change");
+	    user->counters[COUNT_USER_SUCCESS] += (rank_bounds[0] - rank);
+	else if(rank > rank_bounds[1])
+	    user->counters[COUNT_USER_SUCCESS] -= (rank - rank_bounds[1]);
 	else
-	    user->counters[COUNT_USER_SUCCESS] += const_int("int_user_success_mediocre_rank_change");
+	{
+	    if(user->counters[COUNT_USER_SUCCESS] > 0)
+		user->counters[COUNT_USER_SUCCESS] -= const_int("int_user_success_mediocre_rank_change");
+	    else
+		user->counters[COUNT_USER_SUCCESS] += const_int("int_user_success_mediocre_rank_change");
+	}
     }
 }
 

src/xml_loadsave_cup.c

@@ -15,6 +15,7 @@ enum
     TAG_CUP_TYPE,
     TAG_CUP_LAST_WEEK,
     TAG_CUP_SKILL_DIFF,    
+    TAG_CUP_OVERALL_TEAMS,    
     TAG_CUP_CHOOSE_TEAM_USER,
     TAG_CUP_CHOOSE_TEAM,
     TAG_CUP_CHOOSE_TEAM_SID,
@@ -100,6 +101,7 @@ xml_loadsave_cup_end_element    (GMarkupParseContext *context,
        tag == TAG_CUP_LAST_WEEK ||
        tag == TAG_CUP_TYPE ||
        tag == TAG_CUP_SKILL_DIFF ||
+       tag == TAG_CUP_OVERALL_TEAMS ||
        tag == TAG_CUP_NEXT_FIXTURE_UPDATE_WEEK ||
        tag == TAG_CUP_NEXT_FIXTURE_UPDATE_WEEK_ROUND ||
        tag == TAG_CUP_USER_TEAM ||
@@ -183,6 +185,8 @@ xml_loadsave_cup_text         (GMarkupParseContext *context,
 	new_cup->last_week = int_value;
     else if(state == TAG_CUP_SKILL_DIFF)
 	new_cup->skill_diff = int_value;
+    else if(state == TAG_CUP_OVERALL_TEAMS)
+	new_cup->overall_teams = int_value;
     else if(state == TAG_CUP_NEXT_FIXTURE_UPDATE_WEEK)
 	new_cup->next_fixture_update_week = int_value;
     else if(state == TAG_CUP_NEXT_FIXTURE_UPDATE_WEEK_ROUND)
@@ -283,6 +287,7 @@ xml_loadsave_cup_write(const gchar *prefix, const Cup *cup)
     xml_write_int(fil, cup->week_gap, TAG_WEEK_GAP, I0);
     xml_write_int(fil, cup->yellow_red, TAG_YELLOW_RED, I0);
     xml_write_int(fil, cup->skill_diff, TAG_CUP_SKILL_DIFF, I0);
+    xml_write_int(fil, cup->overall_teams, TAG_CUP_OVERALL_TEAMS, I0);
 
     xml_write_int(fil, cup->next_fixture_update_week, 
 		  TAG_CUP_NEXT_FIXTURE_UPDATE_WEEK, I0);

support_files/definitions/romania/country_romania.xml

@@ -14,7 +14,7 @@
     <cup>europe_uefa</cup>
   </cups>
   <supercups>
-<!--     <cup>supercup_league_vs_cup</cup> -->
+    <cup>supercup_romania</cup>
     <cup>supercup_europe_uefa</cup>
   </supercups>
 </country>

support_files/definitions/romania/cup_supercup_romania.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>	
+<cup>
+  <name>Supercupa României</name>
+  <short_name>SuperC_RO</short_name>
+  <sid>supercup_romania</sid>
+  <type>supercup</type>
+
+  <cup_rounds>
+    <cup_round>
+    <home_away>0</home_away>
+    <neutral>1</neutral>
+    </cup_round>
+  </cup_rounds>
+
+  <choose_teams>
+  
+  <choose_team>
+  <choose_team_sid>cupa_romaniei</choose_team_sid>
+  <start_idx>1</start_idx>
+  <end_idx>1</end_idx>
+  </choose_team>
+
+  <choose_team>
+  <choose_team_sid>romania1</choose_team_sid>
+  <start_idx>1</start_idx>
+  <end_idx>2</end_idx>
+  </choose_team>
+
+  </choose_teams>
+
+</cup>