X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=dart%2FDart.pm;h=8ceee1723b4d6ec9de2a725effb6fe3763a194d1;hb=8784283787d570fead3e8797eeaf1e1961204e6f;hp=3919110b1b50de7b0e7c261dbc2b1293f02103bd;hpb=e2babe3999a68a8a7fc77dd9260a8c88bd737ccb;p=svn42.git

diff --git a/dart/Dart.pm b/dart/Dart.pm
index 3919110..8ceee17 100644
--- a/dart/Dart.pm
+++ b/dart/Dart.pm
@@ -40,7 +40,7 @@ sub init
 sub reset_game
 {
   my $self=shift;
-  my @sort_player = sort { $a->{rank} <=> $b->{rank} } @{$self->{player}};
+  my @sort_player = sort { $b->{rank} <=> $a->{rank} } @{$self->{player}};
   $self->{player}=[];
   for my $player (@sort_player)
   {
@@ -90,6 +90,8 @@ sub run
       $self->callback('undo');
     } elsif ($mult eq 'reset') {
       $self->reset_game();
+    } elsif ($mult eq 'quit') {
+      return;
     }
     push @history, Clone::clone($self);
     $self->callback('before_shoot');
@@ -182,7 +184,7 @@ sub get_next_active_player
       $new_round=1;
     }
   }
-  while (not $players_ref->[$current_player]{active});
+  while (not $self->{player}->[$current_player]{active});
   return ($current_player,$new_round);
 }
 
@@ -196,28 +198,24 @@ sub next_round
 sub win
 {
   my $self=shift;
-  $self->deactivate_current_player($self->{player_count}-$self->{active_player_count}+1);
   $self->shout('win');
+  $self->deactivate_current_player($self->{player_count}-$self->{active_player_count}+1);
   if ($self->{active_player_count}==1)
   {
     $self->next_player();
     $self->lose();
-  } elsif (not $self->{active_player_count}) {
-    $self->end_game();
   }
 }
 
 sub lose
 {
   my $self=shift;
-  $self->deactivate_current_player($self->{active_player_count});
   $self->shout('lose');
+  $self->deactivate_current_player($self->{active_player_count});
   if ($self->{active_player_count}==1)
   {
     $self->next_player();
     $self->win();
-  } elsif (not $self->{active_player_count}) {
-    $self->end_game();
   }
 }