X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=dart%2FDart.pm;h=2f389885f84f982c7d75bce2dc583f71cce21d73;hb=adc899317657443237e27bcf81fec5ba6f220f80;hp=bf501cbdef139379a8b5b00bcd0c9fcf601dbe76;hpb=6958c3826f9f0587d2e2071c9370eb0e87a6d167;p=svn42.git

diff --git a/dart/Dart.pm b/dart/Dart.pm
index bf501cb..2f38988 100644
--- a/dart/Dart.pm
+++ b/dart/Dart.pm
@@ -2,6 +2,7 @@
 package Dart;
 use strict;
 use base 'Exporter';
+use Clone;
 # new Dart(player_names=>[ 'lala', 'popo' ]);
 ## Player, Rank, Active, 
 
@@ -12,7 +13,7 @@ sub new
   my (%params) =@_;
   my $self  = bless {}, $class;
   die "Missing player_names" if not ref $params{player_names} eq 'ARRAY';
-  die "Missing player_names" if @{$params{player_names}};
+  die "Missing player_names" if not @{$params{player_names}};
   $self->{player}=[];
   $self->{current_player}=0;
   my $player_counter=0;
@@ -52,11 +53,15 @@ sub run
 {
   my $self=shift;
   my ($data_in_fh,$sound_out_fh)=@_;
+  my @history;
 #  $data_in_fh ||= STDIN;
 #  $sound_out_fh ||= STDOUT;
   $self->{sound_out_fh}=$sound_out_fh;
 
-  while ( my $shoot_data = <$data_in_fh>)
+  push @history, Clone::clone($self);
+  $self->callback('before_shoot');
+  #while ( my $shoot_data = <$data_in_fh>)
+  while ( my $shoot_data = <STDIN>)
   {
     #print STDERR $schuss;
     my ($mult,$number) = split /\s+/, $shoot_data;
@@ -67,7 +72,13 @@ sub run
       $self->shoot($mult,$number);
     } elsif ($mult eq 'btn') {
       $self->next_player();
+    } elsif ($mult eq 'undo' and $#history) {
+      pop @history;
+      $self= pop @history;
+      $self->callback('undo');
     }
+    push @history, Clone::clone($self);
+    $self->callback('before_shoot');
   }
 }
 
@@ -88,7 +99,10 @@ sub shoot
 sub shout_last_shoot
 {
   my $self=shift;
-  if ($self->{current_shoot}{mult} == 2) {
+  if ($self->{current_shoot}{mult} == 2 && $self->{current_shoot}{number} == 25) {
+    $self->shout("bullseye");
+    return;
+  } elsif ($self->{current_shoot}{mult} == 2 ) {
     $self->shout('double');
   } elsif ($self->{current_shoot}{mult} == 3) {
     $self->shout('triple');
@@ -102,7 +116,13 @@ sub shout
   my $self=shift;
   my ($what)=@_;
   my $fh = $self->{sound_out_fh};
-  print $fh "$what\n";
+  if ($what eq 25)
+  {
+    print "bull\n";
+  } else {
+    print "$what\n";
+  }
+#print $fh "$what\n";
 }
 
 sub get_current_player
@@ -115,7 +135,7 @@ sub get_player
 {
   my $self=shift;
   my ($player_idx)=@_;
-  die if $player_idx < 0 or $player_idx >= $self->{player_count};
+  die "Illegal Player Index $player_idx" if $player_idx < 0 or $player_idx >= $self->{player_count};
   return $self->{player}[$player_idx];
 }
 
@@ -124,7 +144,7 @@ sub next_player
   my $self=shift;
   $self->callback('before_next_player');
   $self->{current_shoot_count}=0;
-  ($self->{current_player},my $new_round)=get_next_active_player($self->{current_player});
+  ($self->{current_player},my $new_round)=get_next_active_player($self->{player},$self->{current_player});
   $self->shout("player");
   $self->shout($self->get_current_player()->{name});
   $self->next_round() if $new_round;