X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=SCX%2FCar.pm;h=86f78651cf9d328d1cf012818a15789a2f59a6ec;hb=0566bf423e11384604bbe13e50c601f27ab6168a;hp=91a244d129d83136d146329f133bade6233d8609;hpb=e5ecd9d0a9df93798930c678f4f4aa58e0e6a10a;p=slotcarman.git

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 91a244d..86f7865 100644
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -3,7 +3,6 @@
 package SCX::Car;
 
 use strict;
-use Time::HiRes qw(gettimeofday);
 
 sub new {
 	my ($class, $args) = @_;
@@ -17,15 +16,15 @@ sub new {
 		lap      => 0,
 		laptime  => 0,
 		avg_lap  => 0,
-		state    => 'greenflag',
 		car_img  => $args->{car_img},
 		id       => $args->{id},
-		order    => $args->{id},
 		track    => $args->{track},
 	};
 
 	bless $self, $class;
 
+	$self->set_order($self->{id});
+
 	return $self;
 }
 
@@ -128,21 +127,18 @@ sub set_laptime {
 
 	$self->gui->set_laptime($self->{order}, $lap_time);
 
-	if (defined $lap_time) {
-		if ($lap_time > 1.0 && !$self->{in_pit_lane}
-			&& $self->track->{race_running}
-			&& (!defined $self->{best_lap}
-				|| $self->{best_lap} > $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);
-		}
-	}
+	return if !defined $lap_time || $lap_time <= 1.0
+		|| $self->{in_pit_lane};
+
+	return if $self->{finished};
+
+	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->{driver});
+
+	$self->gui->set_best_lap($self->{order}, $lap_time, $global);
 }
 
 sub set_driver {
@@ -186,11 +182,8 @@ sub set_order {
 	$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->gui->set_state($self->{order}, $self->{state});
-	if ($self->{in_pit_lane}) {
-		$self->gui->enter_pit_lane;
-	}
+		$self->{time_diff}, $self->{lap_diff}, $self->{grey_diff});
+	$self->print_state;
 }
 
 sub print_state {
@@ -221,6 +214,8 @@ sub reset {
 	$self->{first_finish_time} = undef;
 	$self->{time_diff} = undef;
 	$self->{lap_diff} = undef;
+	$self->{total_time} = undef;
+	$self->{grey_diff} = undef;
 }
 
 sub finish_line {
@@ -248,22 +243,31 @@ sub finish_line {
 
 	if ($self->track->{race_running}) {
 		$self->set_lap($self->{lap} + 1);
+	} elsif ($self->track->{qualification_running} && !$self->{finished}) {
+		$self->set_lap($self->{lap} + 1);
+		if ($self->{lap} > $self->track->{race_rounds}) {
+			$self->{finished} = 1;
+			$self->print_state;
+		}
 	}
 
 	return 1;
 }
 
 sub recalc_distance {
-	my ($self, $lap_first, $time_first) = @_;
+	my ($self, $lap_first, $time_first, $finishing) = @_;
 
 	return if !defined $lap_first || !defined $self->{lap}
 		|| !defined $time_first || !defined $self->{first_finish_time};
 
-	my $time;
+	$self->{total_time} = undef;
+	$self->{lap_diff} = undef;
+	$self->{time_diff} = undef;
+	$self->{grey_diff} = undef;
 
 	if ($self->{lap} == $lap_first) {
 		if ($self->{first_finish_time} == $time_first) {
-			$time = $self->{first_finish_time}
+			$self->{total_time} = $self->{first_finish_time}
 				- $self->track->{race_running_since};
 		} else {
 			$self->{time_diff} = $self->{first_finish_time}
@@ -273,9 +277,42 @@ sub recalc_distance {
 		$self->{lap_diff} = $lap_first - $self->{lap};
 	}
 
-	$self->gui->set_distance($self->{order}, $time,
-		$self->{lap_diff}, $self->{time_diff});
+	$self->gui->set_distance($self->{order}, $self->{total_time},
+		$self->{lap_diff}, $self->{time_diff}, $self->{grey_diff});
+
+	if ($finishing) {
+		$self->{finished} = 1;
+		$self->print_state;
+	}
+}
+
+sub recalc_qual_distance {
+	my ($self, $time_first) = @_;
+
+	return if !defined $self->{best_lap} || $self->{best_lap} <= 0;
+
+	$self->{total_time} = undef;
+	$self->{time_diff} = undef;
 	$self->{grey_diff} = undef;
+	$self->{lap_diff} = undef;
+
+	if ($self->{best_lap} == $time_first) {
+		$self->{total_time} = $self->{best_lap};
+	} else {
+		$self->{time_diff} = $self->{best_lap} - $time_first;
+	}
+
+	$self->gui->set_distance($self->{order}, $self->{total_time},
+		$self->{lap_diff}, $self->{time_diff}, $self->{grey_diff});
+}
+
+sub greyout_distance {
+	my ($self) = @_;
+
+	return if $self->{grey_diff};
+	$self->{grey_diff} = 1;
+	$self->gui->set_distance($self->{order}, $self->{total_time},
+		$self->{lap_diff}, $self->{time_diff}, $self->{grey_diff});
 }
 
 1;