Refactorized GUI layer.

[slotcarman.git] / SCX / Car.pm

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 165d09ecb66d97f934a0ae9d90302d5e097ca977..8bb7bb9a00e8c5a1f15f596b19e0587dace11eeb 100644 (file)
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -3,23 +3,21 @@
 package SCX::Car;
 
 use strict;
 package SCX::Car;
 
 use strict;

+use Time::HiRes qw(gettimeofday);

 
 sub new {
        my ($class, $args) = @_;
 
        my $self = {
 
 sub new {
        my ($class, $args) = @_;
 
        my $self = {

-               gui => $args->{gui},
+               gui      => $args->{gui},

                throttle => -1,
                throttle => -1,

-               fuel => -1,
-               order => $args->{order},
-               track => $args->{track},
+               fuel     => -1,
+               id       => $args->{id},
+               track    => $args->{track},

        };
 
        bless $self, $class;
 
        };
 
        bless $self, $class;
 

-       $self->set_throttle(undef);
-       $self->set_fuel(undef);
-

        return $self;
 }
 
        return $self;
 }
 


@@ -129,7 +127,7 @@ sub set_driver {
                        && $self->{driver} == $driver_name);
 
        $self->{driver} = $driver_name;
                        && $self->{driver} == $driver_name);
 
        $self->{driver} = $driver_name;

-       $self->gui->set_driver($self->{order}, $driver_name || '--');
+       $self->gui->set_name($self->{order}, $driver_name || '--');

 }
 
 sub enter_pit_lane {
 }
 
 sub enter_pit_lane {


@@ -155,7 +153,7 @@ sub set_order {
 
        $self->{order} = $pos;
        
 
        $self->{order} = $pos;
        

-       $self->gui->set_driver($self->{order}, $self->{driver}
+       $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_car_icon($self->{order}, $self->{car_icon});
        $self->gui->set_throttle($self->{order}, $self->{throttle});