X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=SCX%2FCar.pm;h=683a2cc77f22023c40249438a2d29ff4136694bc;hb=8709f4aa800632f00a54eeb2c85e20b38fe9f6fa;hp=9f58b5b720f79edd614fc7c853914838403f200f;hpb=972687391b212153ee34a6ecf616fd1c1a53d01b;p=slotcarman.git

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 9f58b5b..683a2cc 100644
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -12,18 +12,20 @@ sub new {
 		gui      => $args->{gui},
 		driver   => $args->{driver} || '--',	
 		throttle => undef,
+		button   => undef,
 		fuel     => 0,
 		lap      => 0,
 		laptime  => 0,
 		avg_lap  => 0,
 		car_img  => $args->{car_img},
 		id       => $args->{id},
-		order    => $args->{id},
 		track    => $args->{track},
 	};
 
 	bless $self, $class;
 
+	$self->set_order($self->{id});
+
 	return $self;
 }
 
@@ -43,9 +45,10 @@ sub same {
 }
 
 sub set_throttle {
-	my ($self, $val, $time) = @_;
+	my ($self, $val, $button, $time) = @_;
 
-	return if $self->same('throttle', $val);
+	return if $self->same('throttle', $val)
+		&& $self->same('button', $button);
 
 	if ($self->track->{start_in_progress} && $val) {
 		$self->{early_start} = 1;
@@ -59,7 +62,7 @@ sub set_throttle {
 		}
 	}
 
-	$self->gui->set_throttle($self->{order}, $val);
+	$self->gui->set_throttle($self->{order}, $val, $button);
 }
 
 
@@ -97,6 +100,12 @@ sub set_lap {
 	}
 		
 	return if $self->same('lap', $lap_nr);
+	if (defined $self->{lap} && defined $self->track->{race_rounds}
+		&& $self->track->{race_rounds} > 0
+		&& $self->{lap} > $self->track->{race_rounds}) {
+		$self->{finished} = 1;
+		$self->print_state;
+	}
 	$self->gui->set_lap($self->{order}, $lap_nr);
 	if ($self->track->{race_running} && $self->{lap} > 1) {
 		my $now = $self->{last_finish_time};
@@ -119,21 +128,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 {
@@ -149,7 +155,7 @@ sub enter_pit_lane {
 	return if $self->{in_pit_lane};
 
 	$self->{in_pit_lane} = 1;
-	$self->gui->enter_pit_lane($self->{order});
+	$self->print_state;
 }
 
 sub leave_pit_lane {
@@ -158,7 +164,7 @@ sub leave_pit_lane {
 	return if !$self->{in_pit_lane};
 
 	$self->{in_pit_lane} = 0;
-	$self->gui->leave_pit_lane($self->{order});
+	$self->print_state;
 }
 
 sub set_order {
@@ -168,7 +174,8 @@ sub set_order {
 	
 	$self->gui->set_name($self->{order}, $self->{driver});
 	$self->gui->set_car_icon($self->{order}, $self->{car_img});
-	$self->gui->set_throttle($self->{order}, $self->{throttle});
+	$self->gui->set_throttle($self->{order}, $self->{throttle},
+		$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});
@@ -176,23 +183,40 @@ 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->{time_diff}, $self->{lap_diff}, $self->{grey_diff});
+	$self->print_state;
+}
+
+sub print_state {
+	my ($self) = @_;
+
 	if ($self->{in_pit_lane}) {
-		$self->gui->enter_pit_lane;
+		$self->{state} = 'pit';
+	} elsif ($self->{finished}) {
+		$self->{state} = 'finished';
+	} elsif ($self->{early_start}) {
+		$self->{state} = 'disqualified';
+	} else {
+		$self->{state} = 'greenflag';
 	}
-}
 
+	$self->gui->set_state($self->{order}, $self->{state});
+}
+	
 sub reset {
 	my ($self) = @_;
 
 	$self->set_lap(0);
 	$self->set_laptime(undef);
+	$self->{finished} = 0;
 	$self->{in_pit_lane} = 0;
 	$self->{early_start} = undef;
 	$self->{last_finish_time} = undef;
 	$self->{first_finish_time} = undef;
 	$self->{time_diff} = undef;
 	$self->{lap_diff} = undef;
+	$self->{total_time} = undef;
+	$self->{grey_diff} = undef;
 }
 
 sub finish_line {
@@ -220,22 +244,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}
@@ -245,8 +278,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;