Sound: joined sound files

[slotcarman.git] / SCX / Car.pm

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 878247a902c2af5304987405e5edd0a9e601ae87..5a1f90e7bb5b052653643d0e1b74c6870972f83d 100644 (file)
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -15,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},
@@ -76,6 +75,13 @@ sub set_fuel {
                                $self->{id}, ' missed pit lane entry', "\n";
                        $self->enter_pit_lane;
                }
+               if ($val == $prev - 1 && $val <= 2 && !$self->{in_pit_lane}) {
+                       $self->track->{sound}->box($self->{id});
+               }
+       }
+       if (defined $val && defined $prev && $val == 8 && $prev == 7
+               && $self->{in_pit_lane}) {
+                       $self->track->{sound}->filled($self->{id});
        }
 
        $self->gui->set_fuel($self->{order}, $val);
@@ -100,9 +106,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;
        }
@@ -117,10 +121,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});
        }
 }
 
@@ -128,8 +128,9 @@ 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);
@@ -144,10 +145,21 @@ sub set_laptime {
        return if defined $self->{best_lap} && $self->{best_lap} <= $lap_time;
 
        $self->{best_lap} = $lap_time;
-       my $global = $self->{track}->check_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->gui->set_best_lap($self->{order}, $lap_time, $global);
+       $self->{global_best_lap} = $val ? 1 : undef;
 }
 
 sub set_driver {
@@ -186,13 +198,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 {