More debugging.

[slotcarman.git] / SCX / Car.pm

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 21d6c682051f765ecf8e1ea85b9e56954351f93c..8446592f90b68dfb400d2b050c67c74341ac5ac8 100644 (file)
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -31,6 +31,11 @@ sub set_throttle {
                || (defined $self->{throttle} && defined $val
                        && $self->{throttle} == $val);
 
+       if ($self->{in_pit_lane} && defined $val && $val > 3) {
+               delete $self->{in_pit_lane};
+               $self->gui->leave_pit_lane;
+       }
+
        $self->{throttle} = $val;
        $self->gui->set_throttle($self->{order}, $val);
 }
@@ -60,7 +65,7 @@ sub set_model {
 
        return if (!defined $self->{car_icon} && !defined $name)
                || (defined $self->{car_icon} && defined $name
-                       && $self->{car_icon} ne $name);
+                       && $self->{car_icon} eq $name);
 
        $self->{car_icon} = $name;
        $self->gui->set_car_icon($self->{order}, $name);
@@ -71,10 +76,10 @@ sub set_lap {
 
        return if (!defined $self->{lap} && !defined $lap_nr)
                || (defined $self->{lap} && defined $lap_nr
-                       && $self->{lap} != $lap_nr);
+                       && $self->{lap} == $lap_nr);
 
        $self->{lap} = $lap_nr;
-       $self->gui->set_lap($self->{order}, $lap_nr || 'N/A');
+       $self->gui->set_lap($self->{order}, defined $lap_nr ? $lap_nr : 'N/A');
 }
 
 sub set_laptime {
@@ -82,22 +87,28 @@ sub set_laptime {
 
        if (defined $lap_time) {
                $lap_time = sprintf("%.2f", $lap_time);
-               if (!defined $self->{best_lap}
-                       || $self->{best_lap} > $lap_time) {
+               if ($lap_time > 1.0 && (
+                       !$self->{in_pit_lane} && !defined $self->{best_lap}
+                       || $self->{best_lap} > $lap_time
+                       )) {
 
                        $self->gui->set_best_lap($self->{order}, $lap_time);
                        $self->{best_lap} = $lap_time;
                }
                
+       } else {
+               $self->gui->set_best_lap($self->{order}, 'N/A');
+               $self->{best_lap} = undef;
        }
 
        return if (!defined $self->{laptime} && !defined $lap_time)
                || (defined $self->{laptime} && defined $lap_time
-                       && $self->{laptime} != $lap_time);
+                       && $self->{laptime} == $lap_time);
 
        $self->{laptime} = $lap_time;
 
-       $self->gui->set_laptime($self->{order}, $lap_time || 'N/A');
+       $self->gui->set_laptime($self->{order}, defined $lap_time
+               ? $lap_time : 'N/A');
 }
 
 sub set_driver {
@@ -105,11 +116,18 @@ sub set_driver {
 
        return if (!defined $self->{driver} && !defined $driver_name)
                || (defined $self->{driver} && defined $driver_name
-                       && $self->{driver} != $driver_name);
+                       && $self->{driver} == $driver_name);
 
        $self->{driver} = $driver_name;
        $self->gui->set_driver($self->{order}, $driver_name || 'N/A');
 }
 
+sub enter_pit_lane {
+       my ($self) = @_;
+
+       $self->{in_pit_lane} = 1;
+       $self->gui->enter_pit_lane;
+}
+
 1;