| … | |
… | |
| 456 | } else { |
456 | } else { |
| 457 | # Chinese, Aga, NZ all have manual placement |
457 | # Chinese, Aga, NZ all have manual placement |
| 458 | if ($self->{curnode}{move} < $self->{handicap}) { |
458 | if ($self->{curnode}{move} < $self->{handicap}) { |
| 459 | $self->{whosemove} = COLOUR_BLACK; |
459 | $self->{whosemove} = COLOUR_BLACK; |
| 460 | } elsif ($self->{curnode}{move} == $self->{handicap}) { |
460 | } elsif ($self->{curnode}{move} == $self->{handicap}) { |
| 461 | $self->{whosemove} = COLOUR_WHITE; |
461 | $self->{whosemove} = $self->{handicap} ? COLOUR_WHITE : COLOUR_BLACK; |
| 462 | } else { |
462 | } else { |
| 463 | $self->{whosemove} = 1 - $self->{cur_board}{last}; |
463 | $self->{whosemove} = 1 - $self->{cur_board}{last}; |
| 464 | } |
464 | } |
| 465 | } |
465 | } |
| 466 | |
466 | |
| … | |
… | |
| 971 | sound::play 2, "info"; |
971 | sound::play 2, "info"; |
| 972 | |
972 | |
| 973 | $self->{challenge}{$id} = $info; |
973 | $self->{challenge}{$id} = $info; |
| 974 | $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay ( |
974 | $self->{challenge}{$id}{inlay} = $self->{chat}->new_switchable_inlay ( |
| 975 | exists $self->{challenge}{""} |
975 | exists $self->{challenge}{""} |
| 976 | ? "Challenge from $opponent->{name}" |
976 | ? "Challenge from " . $opponent->as_string |
| 977 | : "Challenge to $opponent->{name}", |
977 | : "Challenge to " . $opponent->as_string, |
| 978 | sub { |
978 | sub { |
| 979 | $self->{challenge}{$id}{inlay} = $_[0]; |
979 | $self->{challenge}{$id}{inlay} = $_[0]; |
| 980 | $self->draw_challenge ($id); |
980 | $self->draw_challenge ($id); |
| 981 | }, |
981 | }, |
| 982 | !exists $self->{challenge}{""} # only open when not offerer |
982 | !exists $self->{challenge}{""} # only open when not offerer |
