Drop average lap time counting

[slotcarman.git] / SCX / Car.pm

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 683a2cc77f22023c40249438a2d29ff4136694bc..1a74c6b3a342b8d9439fa0c3151dbf586dc7d8c9 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});
        }
 }
 
@@ -179,7 +180,6 @@ sub set_order {
        $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},
@@ -217,6 +217,7 @@ sub reset {
        $self->{lap_diff} = undef;
        $self->{total_time} = undef;
        $self->{grey_diff} = undef;
+       $self->print_state;
 }
 
 sub finish_line {