X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=SCX%2FCar.pm;h=c6e2aaaa5d974d96f24c712e8ad279dadac9528d;hb=041b40ba9d04693394c1472224cbb4285a0280c3;hp=75aa503c49167763e89eca986f2691f87ee1ca31;hpb=4d7f9bafe67a3ef964e0a3ccc319226e1f997a0e;p=slotcarman.git

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 75aa503..c6e2aaa 100644
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -50,6 +50,11 @@ sub set_throttle {
 		$self->{early_start} = 1;
 		$self->gui->set_driver('Early start!');
 	}
+
+	if ($self->{in_pit_lane} && defined $val && $val > 3) {
+		$self->leave_pit_lane;
+	}
+
 	$self->gui->set_throttle($self->{order}, $val);
 }
 
@@ -82,21 +87,24 @@ sub set_lap {
 	return if $self->same('lap', $lap_nr);
 	$self->gui->set_lap($self->{order}, defined $lap_nr ? $lap_nr : '--');
 	if ($self->track->{race_running} && $self->{lap} > 1) {
-		my $now = gettimeofday;
+		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}, $avg);
 	} else {
-		$self->gui->set_avg_lap($self->{order}, '--');
+		$self->gui->set_avg_lap($self->{order}, undef);
 	}
 }
 
 sub set_laptime {
 	my ($self, $lap_time) = @_;
 
+	return if $self->same('laptime', $lap_time);
+
+	$self->gui->set_laptime($self->{order}, $lap_time);
+
 	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
@@ -110,18 +118,9 @@ sub set_laptime {
 				$global);
 		}
 	} else {
-		$self->gui->set_best_lap($self->{order}, '--');
+		$self->gui->set_best_lap($self->{order}, $lap_time);
 		$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->gui->set_laptime($self->{order}, defined $lap_time
-		? $lap_time : '--');
 }
 
 sub set_driver {
@@ -157,16 +156,45 @@ sub set_order {
 	$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_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});
+	if ($self->{in_pit_lane}) {
+		$self->gui->enter_pit_lane;
+	}
 }
-	
+
+sub reset {
+	my ($self) = @_;
+
+	$self->set_lap(0);
+	$self->set_laptime(undef);
+	$self->{in_pit_lane} = 0;
+	$self->{early_start} = undef;
+}
+
+sub finish_line {
+	my ($self, $time, $regular) = @_;
+
+	return undef
+		if defined $self->{last_finish_time}
+		&& $time - $self->{last_finish_time} < 2;
+
+	if ($regular) {
+		if (defined $self->{last_finish_time}) {
+			$self->set_laptime($time - $self->{last_finish_time});
+		}
+	} else {
+		$self->enter_pit_lane;
+	}
+
+	$self->{last_finish_time} = $time;
+	$self->set_lap(++$self->{lap});
+
+	return 1;
+}
+
 1;