Another attempt at pit lane handling.

[slotcarman.git] / SCX / Car.pm

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 21d6c682051f765ecf8e1ea85b9e56954351f93c..23caad6c4abfb8fd03bf8cd7d353e72d6812b7b4 100644 (file)
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -12,6 +12,7 @@ sub new {
                throttle => -1,
                fuel => -1,
                order => $args->{order},
+               track => $args->{track},
        };
 
        bless $self, $class;
@@ -24,6 +25,8 @@ sub new {
 
 sub gui { return shift->{gui}; }
 
+sub track { return shift->{track}; }
+
 sub set_throttle {
        my ($self, $val) = @_;
 
@@ -60,7 +63,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 +74,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 : '--');
 }
 
 sub set_laptime {
@@ -82,22 +85,31 @@ 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;
+                       my $global = $self->{track}->check_best_lap($lap_time,
+                               $self->{driver}
+                       );
+                       $self->gui->set_best_lap($self->{order}, $lap_time,
+                               $global);
                }
-               
+       } else {
+               $self->gui->set_best_lap($self->{order}, '--');
+               $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 : '--');
 }
 
 sub set_driver {
@@ -105,11 +117,47 @@ 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');
+       $self->gui->set_driver($self->{order}, $driver_name || '--');
+}
+
+sub enter_pit_lane {
+       my ($self) = @_;
+
+       return if $self->{in_pit_lane};
+
+       $self->{in_pit_lane} = 1;
+       $self->gui->enter_pit_lane;
 }
 
+sub leave_pit_lane {
+       my ($self) = @_;
+
+       return if !$self->{in_pit_lane};
+
+       $self->{in_pit_lane} = 0;
+       $self->gui->leave_pit_lane;
+}
+
+sub set_order {
+       my ($self, $pos) = @_;
+
+       $self->{order} = $pos;
+       
+       $self->gui->set_driver($self->{order}, $self->{driver}
+               || '--');
+       $self->gui->set_car_icon($self->{order}, $self->{car_icon});
+       $self->gui->set_throttle($self->{order}, $self->{throttle});
+       $self->gui->set_lap($self->{order}, defined $self->{lap}
+               ? $self->{lap} : '--');
+       $self->gui->set_laptime($self->{order}, defined $self->{laptime}
+               ? $self->{laptime} : '--');
+       $self->gui->set_best_lap($self->{order}, defined $self->{best_lap}
+               ? $self->{best_lap} : '--');
+       $self->gui->set_fuel($self->{order}, $self->{fuel});
+}
+       
 1;