Highlight the best lap

[slotcarman.git] / SCX / Car.pm

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 3f2b7a3b7f4cb2f1460dbf4fb5413e02525ba1b3..2bb67617e2222aaa9f164bc80d7d8e3c7d089ce9 100644 (file)
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -3,7 +3,6 @@
 package SCX::Car;
 
 use strict;
-use Time::HiRes qw(gettimeofday);
 
 sub new {
        my ($class, $args) = @_;
@@ -16,7 +15,6 @@ sub new {
                fuel     => 0,
                lap      => 0,
                laptime  => 0,
-               avg_lap  => 0,
                car_img  => $args->{car_img},
                id       => $args->{id},
                track    => $args->{track},
@@ -69,7 +67,16 @@ sub set_throttle {
 sub set_fuel {
        my ($self, $val) = @_;
 
+       my $prev = $self->{fuel};
        return if $self->same('fuel', $val);
+       if (defined $val && defined $prev && $val < 8) {
+               if ($val == $prev + 1 && !$self->{in_pit_lane}) {
+                       print STDERR $self->track->{now}, ' car ',
+                               $self->{id}, ' missed pit lane entry', "\n";
+                       $self->enter_pit_lane;
+               }
+       }
+
        $self->gui->set_fuel($self->{order}, $val);
 }
 
@@ -92,9 +99,7 @@ sub set_lap {
        my ($self, $lap_nr) = @_;
 
        if (!$lap_nr) {
-               $self->{avg_lap} = undef;
                $self->{lap} = $lap_nr;
-               $self->gui->set_avg_lap($self->{order}, undef);
                $self->gui->set_lap($self->{order}, $lap_nr);
                return;
        }
@@ -109,10 +114,6 @@ sub set_lap {
        $self->gui->set_lap($self->{order}, $lap_nr);
        if ($self->track->{race_running} && $self->{lap} > 1) {
                my $now = $self->{last_finish_time};
-               my $avg = ($now - $self->track->{race_running_since})
-                       / ($self->{lap} - 1);
-               $self->{avg_lap} = $avg;
-               $self->gui->set_avg_lap($self->{order}, $self->{avg_lap});
        }
 }
 
@@ -120,28 +121,38 @@ sub set_laptime {
        my ($self, $lap_time) = @_;
 
        if (!defined $lap_time) {
-               $self->gui->set_best_lap($self->{order}, undef);
                $self->{best_lap} = undef;
+               $self->{global_best_lap} = undef;
+               $self->print_best_lap;
        }
 
        return if $self->same('laptime', $lap_time);
 
        $self->gui->set_laptime($self->{order}, $lap_time);
 
-       if (defined $lap_time) {
-               if ($lap_time > 1.0 && !$self->{in_pit_lane}
-                       && (!defined $self->{best_lap}
-                               || $self->{best_lap} > $lap_time
-                       )) {
-
-                       $self->{best_lap} = $lap_time;
-                       my $global = $self->{track}->check_best_lap($lap_time,
-                               $self->{driver}
-                       );
-                       $self->gui->set_best_lap($self->{order}, $lap_time,
-                               $global);
-               }
-       }
+       return if !defined $lap_time || $lap_time <= 1.0
+               || $self->{in_pit_lane};
+
+       return if $self->{finished};
+
+       return if defined $self->{best_lap} && $self->{best_lap} <= $lap_time;
+
+       $self->{best_lap} = $lap_time;
+       $self->print_best_lap;
+       $self->{track}->notify_best_lap($self->{id}, $lap_time,
+               $self->{driver});
+}
+
+sub print_best_lap {
+       my ($self) = @_;
+       $self->gui->set_best_lap($self->{order}, $self->{best_lap},
+               $self->{global_best_lap});
+}
+
+sub set_global_best {
+       my ($self, $val) = @_;
+
+       $self->{global_best_lap} = $val ? 1 : undef;
 }
 
 sub set_driver {
@@ -180,13 +191,12 @@ sub set_order {
                $self->{button});
        $self->gui->set_lap($self->{order}, $self->{lap});
        $self->gui->set_laptime($self->{order}, $self->{laptime});
-       $self->gui->set_best_lap($self->{order}, $self->{best_lap});
-       $self->gui->set_avg_lap($self->{order}, $self->{avg_lap});
        $self->gui->set_fuel($self->{order}, $self->{fuel});
        $self->gui->set_car_id($self->{order}, $self->{id} + 1);
        $self->gui->set_distance($self->{order},
                $self->{time_diff}, $self->{lap_diff}, $self->{grey_diff});
        $self->print_state;
+       $self->print_best_lap;
 }
 
 sub print_state {
@@ -219,6 +229,7 @@ sub reset {
        $self->{lap_diff} = undef;
        $self->{total_time} = undef;
        $self->{grey_diff} = undef;
+       $self->print_state;
 }
 
 sub finish_line {
@@ -246,6 +257,12 @@ sub finish_line {
 
        if ($self->track->{race_running}) {
                $self->set_lap($self->{lap} + 1);
+       } elsif ($self->track->{qualification_running} && !$self->{finished}) {
+               $self->set_lap($self->{lap} + 1);
+               if ($self->{lap} > $self->track->{race_rounds}) {
+                       $self->{finished} = 1;
+                       $self->print_state;
+               }
        }
 
        return 1;
@@ -283,6 +300,26 @@ sub recalc_distance {
        }
 }
 
+sub recalc_qual_distance {
+       my ($self, $time_first) = @_;
+
+       return if !defined $self->{best_lap} || $self->{best_lap} <= 0;
+
+       $self->{total_time} = undef;
+       $self->{time_diff} = undef;
+       $self->{grey_diff} = undef;
+       $self->{lap_diff} = undef;
+
+       if ($self->{best_lap} == $time_first) {
+               $self->{total_time} = $self->{best_lap};
+       } else {
+               $self->{time_diff} = $self->{best_lap} - $time_first;
+       }
+
+       $self->gui->set_distance($self->{order}, $self->{total_time},
+               $self->{lap_diff}, $self->{time_diff}, $self->{grey_diff});
+}
+
 sub greyout_distance {
        my ($self) = @_;