Subversion Repositories svn1-original

Rev

Rev 49 | Rev 51 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 49 Rev 50
Line 1116... Line 1116...
1116 
            /*
 1116 
            /*
1117 
            **  Ensure that non-equestrian leg data is not displayed
 1117 
            **  Ensure that non-equestrian leg data is not displayed
1118 
            */
 1118 
            */
1119 
            if ( j == config.equestrian_leg && (ptr->class == config.nonequestrian_class || ptr->flags.non_equestrian) )
 1119 
            if ( j == config.equestrian_leg && (ptr->class == config.nonequestrian_class || ptr->flags.non_equestrian) )
1120 
            {
 1120 
            {
1121 
                print( "  %-8s %4.4s %4.4s", "-- NE --", "-","-");
 1121 
                print( "  %-8s %4.4s %4.4s", "-- NE --", "NE","NE");
1122 
            }
 1122 
            }
1123 
            else
 1123 
            else
1124 
            {
 1124 
            {
1125 
                print( "  %-8s %4.4s %4.4s", time_a( team_buf.leg[j].elapsed ),
 1125 
                print( "  %-8s %4.4s %4.4s", time_a( team_buf.leg[j].elapsed ),
1126 
                       pr_place_ne( team_buf.leg[j].lc_place,  ptr->flags.bad_times, ptr->flags.non_equestrian ),
 1126 
                       pr_place_ne( team_buf.leg[j].lc_place,  ptr->flags.bad_times, ptr->flags.non_equestrian ),
Line 2199... Line 2199...
2199 
        if( mode == C_ELAPSED )
 2199 
        if( mode == C_ELAPSED )
2200 
            t = ptr->lege;
 2200 
            t = ptr->lege;
2201 
        else
 2201 
        else
2202 
            t = ptr->leg;
 2202 
            t = ptr->leg;
2203 
 
 2203 
 
- 
 
 2204 
 
- 
 
 2205 
        if ( leg >= 0 )
- 
 
 2206 
        {
- 
 
 2207 
            ptr->flags.bad_times = (ptr->flags.disqualified && ! ptr->flags.non_equestrian);
- 
 
 2208 
        }
- 
 
 2209 
        else
- 
 
 2210 
        {
2204 
        if( ( ptr->flags.bad_times = ptr->flags.disqualified ) == FALSE )
 2211 
            ptr->flags.bad_times = ptr->flags.disqualified;
- 
 
 2212 
        }
- 
 
 2213 
 
- 
 
 2214 
        if( ! ptr->flags.bad_times )
2205 
        {
 2215 
        {
2206 
            if( leg <= 0 )
 2216 
            if( leg <= 0 )
2207 
            {
 2217 
            {
2208 
                for( k = 0; k <= config.num_legs; k++ )
 2218 
                for( k = 0; k <= config.num_legs; k++ )
2209 
                {
 2219 
                {
Line 2748... Line 2758...
2748 
#if 1
 2758 
#if 1
2749 
    if( a->flags.bad_times || b->flags.bad_times )  /* Valid data has precedence */
 2759 
    if( a->flags.bad_times || b->flags.bad_times )  /* Valid data has precedence */
2750 
    {
 2760 
    {
2751 
        if( a->flags.bad_times && b->flags.bad_times )
 2761 
        if( a->flags.bad_times && b->flags.bad_times )
2752 
        {
 2762 
        {
2753 
            if( sort_mode == S_LE || sort_mode == S_L || 1 ) /* Sort NOT within a class */
 2763 
            if( a->flags.non_equestrian || b->flags.non_equestrian )
2754 
            {
 2764 
            {
2755 
                if( a->flags.non_equestrian || b->flags.non_equestrian )
 2765 
                if( a->flags.non_equestrian && b->flags.non_equestrian )
2756 
                {
 2766 
                {
2757 
                    if( a->flags.non_equestrian && b->flags.non_equestrian )
 - 
 
2758 
                    {
 2767 
                    /*
2759 
                        /*
 - 
 
2760 
                        **  Both are non equestrian
 2768 
                    **  Both are non equestrian
2761 
                        **  Let the time sort operate ...
 2769 
                    **  Let the time sort operate ...
2762 
                        */
 2770 
                    */
2763 
                        //return ( a->team - b->team );
 2771 
                    //return ( a->team - b->team );
2764 
                    }
 2772 
                }
2765 
                    else
 2773 
                else
2766 
                    {
 2774 
                {
- 
 
 2775 
                    /* One is equestrian */
2767 
                        /* Good times better than NE */
 2776 
                    /* Good times better than NE */
2768 
                        return ( a->flags.non_equestrian ? -1 : 1 );
 2777 
                    return ( a->flags.non_equestrian ? -1 : 1 );
2769 
                    }
 - 
 
2770 
                }
 2778 
                }
2771 
            }
 2779 
            }
2772 
            else
 2780 
            else
- 
 
 2781 
            {
- 
 
 2782 
                /* Neither is equestrian */
2773 
               return ( a->team - b->team );
 2783 
                return ( a->team - b->team );
- 
 
 2784 
            }
2774 
        }
 2785 
        }
2775 
        else
 2786 
        else
2776 
            return ( a->flags.bad_times ? 1 : -1 );
 2787 
            return ( a->flags.bad_times ? 1 : -1 );
2777 
    }
 2788 
    }
2778 
#else
 2789 
#else