X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=SCX%2FCar.pm;h=8bb7bb9a00e8c5a1f15f596b19e0587dace11eeb;hb=d311baf05cce488606946a68ffee19980681030b;hp=8446592f90b68dfb400d2b050c67c74341ac5ac8;hpb=471218eeb91909ba9601ccee0e4d66b1902e1e9e;p=slotcarman.git

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 8446592..8bb7bb9 100644
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -3,27 +3,28 @@
 package SCX::Car;
 
 use strict;
+use Time::HiRes qw(gettimeofday);
 
 sub new {
 	my ($class, $args) = @_;
 
 	my $self = {
-		gui => $args->{gui},
+		gui      => $args->{gui},
 		throttle => -1,
-		fuel => -1,
-		order => $args->{order},
+		fuel     => -1,
+		id       => $args->{id},
+		track    => $args->{track},
 	};
 
 	bless $self, $class;
 
-	$self->set_throttle(undef);
-	$self->set_fuel(undef);
-
 	return $self;
 }
 
 sub gui { return shift->{gui}; }
 
+sub track { return shift->{track}; }
+
 sub set_throttle {
 	my ($self, $val) = @_;
 
@@ -31,11 +32,6 @@ 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);
 }
@@ -79,7 +75,16 @@ sub set_lap {
 			&& $self->{lap} == $lap_nr);
 
 	$self->{lap} = $lap_nr;
-	$self->gui->set_lap($self->{order}, defined $lap_nr ? $lap_nr : 'N/A');
+	$self->gui->set_lap($self->{order}, defined $lap_nr ? $lap_nr : '--');
+	if ($self->track->{race_running} && $self->{lap} > 1) {
+		my $now = gettimeofday;
+		my $avg = ($now - $self->track->{race_running_since})
+			/ ($self->{lap} - 1);
+		$self->{avg_lap} = $avg;
+		$self->gui->set_avg_lap($self->{order}, $avg);
+	} else {
+		$self->gui->set_avg_lap($self->{order}, '--');
+	}
 }
 
 sub set_laptime {
@@ -87,17 +92,20 @@ sub set_laptime {
 
 	if (defined $lap_time) {
 		$lap_time = sprintf("%.2f", $lap_time);
-		if ($lap_time > 1.0 && (
-			!$self->{in_pit_lane} && !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}, 'N/A');
+		$self->gui->set_best_lap($self->{order}, '--');
 		$self->{best_lap} = undef;
 	}
 
@@ -108,7 +116,7 @@ sub set_laptime {
 	$self->{laptime} = $lap_time;
 
 	$self->gui->set_laptime($self->{order}, defined $lap_time
-		? $lap_time : 'N/A');
+		? $lap_time : '--');
 }
 
 sub set_driver {
@@ -119,15 +127,46 @@ sub set_driver {
 			&& $self->{driver} == $driver_name);
 
 	$self->{driver} = $driver_name;
-	$self->gui->set_driver($self->{order}, $driver_name || 'N/A');
+	$self->gui->set_name($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_name($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_avg_lap($self->{order}, defined $self->{avg_lap}
+		? $self->{avg_lap} : '--');
+	$self->gui->set_fuel($self->{order}, $self->{fuel});
+}
+	
 1;