ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/kgsueme/kgsueme/game.pl
(Generate patch)

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.35 by pcg, Tue Jun 3 04:46:47 2003 UTC vs.
Revision 1.56 by pcg, Thu Jun 12 23:24:53 2003 UTC

1use utf8;
2
1package game::goclock; 3package game::goclock;
4
5# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
6# is completely borked.
2 7
3use Time::HiRes (); 8use Time::HiRes ();
4 9
5use KGS::Constants; 10use KGS::Constants;
6 11
16 $self->{format} = sub { "ERROR" }; 21 $self->{format} = sub { "ERROR" };
17 22
18 $self; 23 $self;
19} 24}
20 25
21sub format_time($) { 26sub configure {
22 my ($time) = @_;
23
24 $time > 60*60
25 ? sprintf "%d:%02d:%02d", $time / (60 * 60), $time / 60 % 60, $time % 60
26 : sprintf "%d:%02d", $time / 60 % 60, $time % 60;
27}
28
29sub set_rules {
30 my ($self, $timesys, $main, $interval, $count) = @_; 27 my ($self, $timesys, $main, $interval, $count) = @_;
31 28
32 if ($timesys == TIMESYS_ABSOLUTE) { 29 if ($timesys == TIMESYS_ABSOLUTE) {
33 $self->{set} = sub { $self->{time} = $_[0] }; 30 $self->{set} = sub { $self->{time} = $_[0] };
34 $self->{format} = sub { format_time $_[0] }; 31 $self->{format} = sub { util::format_time $_[0] };
35 32
36 } elsif ($timesys == TIMESYS_BYO_YOMI) { 33 } elsif ($timesys == TIMESYS_BYO_YOMI) {
37 my $low = $interval * $count; 34 my $low = $interval * $count;
38 35
39 $self->{set} = sub { $self->{time} = $_[0] }; 36 $self->{set} = sub { $self->{time} = $_[0] };
40 37
41 $self->{format} = sub { 38 $self->{format} = sub {
42 if ($_[0] > $low) { 39 if ($_[0] > $low) {
43 format_time $_[0] - $low; 40 util::format_time $_[0] - $low;
44 } else { 41 } else {
45 sprintf "%s (%d)", 42 sprintf "%s (%d)",
46 format_time int ($_[0] % $interval) || $interval, 43 util::format_time int (($_[0] - 1) % $interval + 1),
47 $_[0] / $interval; 44 ($_[0] - 1) / $interval;
48 } 45 }
49 }; 46 };
50 47
51 } elsif ($timesys == TIMESYS_CANADIAN) { 48 } elsif ($timesys == TIMESYS_CANADIAN) {
52 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] }; 49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
53 50
54 $self->{format} = sub { 51 $self->{format} = sub {
55 if (!$self->{moves}) { 52 if (!$self->{moves}) {
56 format_time $_[0] - $low; 53 util::format_time $_[0] - $low;
57 } else { 54 } else {
58 my $time = int($_[0] % $interval) || $interval; 55 my $time = int (($_[0] - 1) % $interval + 1);
56
59 sprintf "%s/%d {%d}", 57 sprintf "%s/%d [%d]",
60 format_time $time, 58 util::format_time $time,
61 $self->{moves}, 59 $self->{moves},
62 int ($time / ($self->{moves} || 1)); 60 $time / ($self->{moves} || 1);
63 61
64 } 62 }
65 }; 63 };
66 64
67 } else { 65 } else {
72} 70}
73 71
74sub refresh { 72sub refresh {
75 my ($self, $timestamp) = @_; 73 my ($self, $timestamp) = @_;
76 my $timer = $self->{time} + $self->{start} - $timestamp; 74 my $timer = $self->{time} + $self->{start} - $timestamp;
75
76 # we round the timer value slightly... the protocol isn't exact anyways,
77 # and this gives smoother timers ;)
78 my @format = $self->{format}->(int ($timer + 0.4));
77 $self->{widget}->set_text ($self->{format}->($timer)); 79 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4)));
78 80
79 $timer - int $timer; 81 $timer - int $timer;
80} 82}
81 83
82sub set_time { 84sub set_time {
83 my ($self, $time) = @_; 85 my ($self, $time) = @_;
84 86
85 # we ignore requests to re-set the time of a running clock. 87 # we ignore requests to re-set the time of a running clock.
86 # this is the easiest way to ensure that commentary etc. 88 # this is the easiest way to ensure that commentary etc.
87 # doesn't re-set the clock. yes, this is frickle design, 89 # doesn't re-set the clock. yes, this is frickle design,
88 # but I think the protoocl is to blame here, which gives 90 # but I think the protocol is to blame here, which gives
89 # very little time information. (cgoban2 also has had quite 91 # very little time information. (cgoban2 also has had quite
90 # a lot of small time update problems...) 92 # a lot of small time update problems...)
91 unless ($self->{timeout}) { 93 unless ($self->{timeout}) {
92 $self->{set}->($time->[0], $time->[1]); 94 $self->{set}->($time->[0], $time->[1]);
93 $self->refresh ($self->{start}); 95 $self->refresh ($self->{start});
94 } 96 }
95} 97}
96 98
97sub start { 99sub start {
98 my ($self) = @_; 100 my ($self, $when) = @_;
99 101
100 return if $self->{timeout}; 102 $self->stop;
101 103
102 # this is correct, since we assume the last message triggered a start 104 $self->{start} = $when;
103 $self->{start} = $KGS::Protocol::NOW;
104 105
105 my $timeout; $timeout = sub { 106 my $timeout; $timeout = sub {
106 # -100 means we run the timer a bit earlier to avoid 10.99 => 10s roundings.
107 # we "could" cheat by precalculating the time, but I feel uneasy about both
108 # ways to cheat.
109 my $next = int ($self->refresh (Time::HiRes::time) * 1000) - 100; 107 my $next = $self->refresh (Time::HiRes::time) * 1000;
110 $next += 1000 if $next < 0; 108 $next += 1000 if $next < 0;
111 $self->{timeout} = add Glib::Timeout $next, $timeout; 109 $self->{timeout} = add Glib::Timeout $next, $timeout;
112 0; 110 0;
113 }; 111 };
114 112
146 $vbox->add ($self->{imagebox} = new Gtk2::VBox); 144 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
147 145
148 $self; 146 $self;
149} 147}
150 148
151sub set_rules { 149sub configure {
152 my ($self, $rules) = @_; 150 my ($self, $user, $rules) = @_;
153 151
154 if ($self->{name}->get_text ne $rules->{player}[$self->{colour}]) { 152 if ($self->{name}->get_text ne $user->as_string) {
155 $self->{name}->set_text ($rules->{player}[$self->{colour}]); 153 $self->{name}->set_text ($user->as_string);
156 154
157 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 155 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
158 $self->{imagebox}->add (gtk::image_from_data undef); 156 $self->{imagebox}->add (gtk::image_from_data undef);
159 $self->{imagebox}->show_all; 157 $self->{imagebox}->show_all;
160 158
159 if ($user->has_pic) {
161 # the big picture... 160 # the big picture...
162 appwin::userpic ($rules->{player}[$self->{colour}], sub { 161 appwin::userpic ($user->{name}, sub {
163 return unless $self->{imagebox}; 162 return unless $self->{imagebox};
164 if ($_[0]) { 163 if ($_[0]) {
165 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children; 164 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
166 $self->{imagebox}->add (gtk::image_from_data $_[0]); 165 $self->{imagebox}->add (gtk::image_from_data $_[0]);
167 $self->{imagebox}->show_all; 166 $self->{imagebox}->show_all;
167 }
168 } 168 });
169 }); 169 }
170 }
171 170 }
171
172 $self->{clock}->set_rules (@{$rules->{rules}}{qw(timesys time interval count)}); 172 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
173} 173}
174 174
175sub set_state { 175sub set_state {
176 my ($self, $captures, $timer, $running) = @_; 176 my ($self, $captures, $timer, $when) = @_;
177 177
178 $self->{clock}->stop unless $running; 178 $self->{clock}->stop unless $when;
179 $self->{clock}->set_time ($timer); 179 $self->{clock}->set_time ($timer);
180 $self->{clock}->start if $running; 180 $self->{clock}->start ($when) if $when;
181 181
182 $self->{info}->set_text ("$captures pris."); 182 $self->{info}->set_text ("$captures pris.");
183} 183}
184 184
185package game; 185package game;
199 $self = $self->SUPER::new(@_); 199 $self = $self->SUPER::new(@_);
200 200
201 $self->listen($self->{conn}); 201 $self->listen($self->{conn});
202 202
203 $self->{window} = new Gtk2::Window 'toplevel'; 203 $self->{window} = new Gtk2::Window 'toplevel';
204 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
205 $self->{window}->set_title("KGS Game $title");
206 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 204 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
207 205
208 $self->{window}->signal_connect(delete_event => sub { 206 $self->{window}->signal_connect(delete_event => sub {
209 $self->part; 207 $self->part;
210 $self->destroy; 208 $self->destroy;
212 }); 210 });
213 211
214 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 212 $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
215 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 213 gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
216 214
215 # LEFT PANE
216
217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 1); 217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0);
218 218
219 $self->{boardbox} = new Gtk2::VBox; 219 $self->{boardbox} = new Gtk2::VBox;
220 220
221 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); 221 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
222 222
230 230
231 { 231 {
232 $frame->add(my $vbox = new Gtk2::VBox); 232 $frame->add(my $vbox = new Gtk2::VBox);
233 $vbox->add($self->{title} = new Gtk2::Label $title); 233 $vbox->add($self->{title} = new Gtk2::Label $title);
234 234
235 $self->{moveadj} = new Gtk2::Adjustment 0, 0, 0, 1, 1, 0; 235 $self->{moveadj} = new Gtk2::Adjustment 1, 1, 1, 1, 1, 0;
236 236
237 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 237 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
238 $scale->set_draw_value (0); 238 $scale->set_draw_value (0);
239 $scale->set_digits (0); 239 $scale->set_digits (0);
240 240
251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
253 253
254 # RIGHT PANE 254 # RIGHT PANE
255 255
256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); 256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
257 $self->{hpane}->set(position_set => 1); 257 $self->{hpane}->set(position_set => 1);
258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
259 259
260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
261 $sw->set_policy("automatic", "always"); 261 $sw->set_policy("automatic", "always");
373 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height, 373 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
374 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 374 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
375 ); 375 );
376 } 376 }
377 377
378 # first the big stones (handicap stones different for effect) 378 # first the big stones (handicap stones could be different)
379 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], 379 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
380 [MARK_W, $mark & MARK_MOVE ? 255 : 192], 380 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
381 [MARK_GRAY_B, 128], 381 [MARK_GRAY_B, 128],
382 [MARK_GRAY_W, 128]) { 382 [MARK_GRAY_W, 128]) {
383 my ($mask, $alpha) = @$_; 383 my ($mask, $alpha) = @$_;
384 if ($mark & $mask) { 384 if ($mark & $mask) {
385 $stone->composite ( 385 $stone->composite (
572 } 572 }
573 } 573 }
574 574
575 $self->{pixbuf} = $pixbuf; 575 $self->{pixbuf} = $pixbuf;
576 576
577 # hoshi-points(!)#d#
578 # caching of empty board gfx(!)#d#
579
580 for my $x (1 .. $size) { 577 for my $x (1 .. $size) {
581 for my $y (1 .. $size) { 578 for my $y (1 .. $size) {
582 my $rand = ($x ^ $y ^ 0x5555); 579 my $rand = ($x ^ $y ^ 0x5555);
583 580
584 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs); 581 my ($dx, $dy) = ($k[$x] - $ofs, $k[$y] - $ofs);
649 646
650sub update_board { 647sub update_board {
651 my ($self) = @_; 648 my ($self) = @_;
652 return unless $self->{path}; 649 return unless $self->{path};
653 650
651 #$self->{update_board_cb} ||= add Glib::Idle sub {
654 my $move = int $self->{moveadj}->get_value; 652 my $move = int $self->{moveadj}->get_value;
655 653
656 my $running = $move == @{$self->{path}}; 654 my $running = $move == @{$self->{path}};
657 655
658 $self->{board_label}->set_text ("Move $move"); 656 $self->{board_label}->set_text ("Move " . ($move - 1));
659 657
660 $self->{board} = new KGS::Game::Board $self->{size}; 658 $self->{board} = new KGS::Game::Board $self->{size};
661 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]); 659 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
662 660
663 $self->{userpanel}[WHITE]->set_state ($self->{board}{captures}[WHITE], 661 for my $colour (WHITE, BLACK) {
664 $self->{board}{timer}[WHITE], 662 $self->{userpanel}[$colour]->set_state (
665 $running && $self->{board}{last} == BLACK); 663 $self->{board}{captures}[$colour],
666 $self->{userpanel}[BLACK]->set_state ($self->{board}{captures}[BLACK], 664 $self->{board}{timer}[$colour],
667 $self->{board}{timer}[BLACK], 665 ($running && $self->{lastmove_colour} == !$colour)
668 $running && $self->{board}{last} == WHITE); 666 ? $self->{lastmove_time} : 0
667 );
668 }
669 669
670 $self->redraw ($self->repaint_board); 670 $self->redraw ($self->repaint_board);
671
672 # delete $self->{update_board_cb};
673 #}
671} 674}
672 675
673sub event_update_tree { 676sub event_update_tree {
674 my ($self) = @_; 677 my ($self) = @_;
675 678
676 $self->{path} = $self->get_path; 679 $self->{path} = $self->get_path;
677
678 $self->{userpanel}[WHITE]->set_rules ($self->{path}[0]); # should be onload only
679 $self->{userpanel}[BLACK]->set_rules ($self->{path}[0]); # should be onload only
680 680
681 if ($self->{moveadj}) { 681 if ($self->{moveadj}) {
682 my $upper = $self->{moveadj}->upper; 682 my $upper = $self->{moveadj}->upper;
683 my $pos = $self->{moveadj}->get_value; 683 my $pos = $self->{moveadj}->get_value;
684 my $move = scalar @{$self->{path}};
684 685
685 $self->{moveadj}->upper (scalar @{$self->{path}}); 686 $self->{moveadj}->upper ($move);
686 687
687 $self->{moveadj}->changed; 688 $self->{moveadj}->changed;
688 if ($pos == $upper) { 689 if ($pos == $upper) {
689 $self->{moveadj}->set_value (scalar @{$self->{path}}); 690 $self->{moveadj}->value ($move);
690 } else {
691 $self->{moveadj}->value_changed; 691 $self->{moveadj}->value_changed;
692 } 692 }
693 } 693 }
694} 694}
695 695
702 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>" 702 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>"
703 if $newnode; 703 if $newnode;
704 704
705 for (split /\n/, $comment) { 705 for (split /\n/, $comment) {
706 $text .= "\n"; 706 $text .= "\n";
707 if ($_ =~ s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) { 707 if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
708 $text .= "<user>" . (util::toxml $1) . "</user>:"; 708 $text .= "<user>" . (util::toxml $1) . "</user>:";
709 } 709 }
710
711 # coords only for 19x19 so far
712 $_ = util::toxml $_;
713 s{
714 (
715 \b
716 (?:[bw])?
717 [, ]{0,2}
718 [a-hj-t] # valid for upto 19x19
719 \s?
720 [1-9]?[0-9]
721 \b
722 )
723 }{
724 "<coord>$1</coord>";
725 }sgexi;
726
710 $text .= $_; 727 $text .= $_;
711 } 728 }
712 729
713 $self->{text}->append_text ($text); 730 $self->{text}->append_text ($text);
714} 731}
719} 736}
720 737
721sub event_part { 738sub event_part {
722 my ($self) = @_; 739 my ($self) = @_;
723 $self->SUPER::event_part; 740 $self->SUPER::event_part;
741 $self->destroy;
724} 742}
725 743
726sub event_move { 744sub event_move {
727 my ($self, $pass) = @_; 745 my ($self, $pass) = @_;
728 sound::play 1, $pass ? "pass" : "move"; 746 sound::play 1, $pass ? "pass" : "move";
729} 747}
730 748
731sub event_update_game { 749sub event_update_game {
732 my ($self) = @_; 750 my ($self) = @_;
733 $self->SUPER::event_update_game; 751 $self->SUPER::event_update_game;
734 warn "GAME UPDATE ".join (":", %$self);
735 warn "SAVED ".$self->is_saved;
736 warn "SCORED ".$self->is_scored;
737 warn "ADJ ".$self->is_adjourned;
738 warn "VALID ".$self->is_valid;
739 warn "MOVES ".$self->moves;
740 warn "TYPE ".$self->type;
741 752
753 my $title = $self->{channel} ? $self->owner->as_string . " " . $self->opponent_string : "Game Window";
754 $self->{window}->set_title("KGS Game $title");
755 $self->{title}->set_text ($title);
756
757 $self->{user}[BLACK] = $self->{user1};
758 $self->{user}[WHITE] = $self->{user2};
759
760 # show board
761
742 $self->{left}->remove ($_) for $self->{left}->get_children; 762 $self->{left}->remove ($_) for $self->{left}->get_children;
743 if ($self->is_valid) { 763 if ($self->is_valid) {
744 $self->{left}->add ($self->{boardbox}); 764 $self->{left}->add ($self->{boardbox});
745 (delete $self->{challenge})->destroy if $self->{challenge}; 765 (delete $self->{challenge})->destroy if $self->{challenge};
746 } else { 766 } else {
747 $self->{left}->add ($self->{challenge}->widget); 767 $self->{left}->add ($self->{challenge}->widget);
748 } 768 }
749 $self->{left}->show_all; 769 $self->{left}->show_all;
770
771 # view text
772
773 my @ga;
774 $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
775 . " (" . (util::toxml $gameopt{$self->option}) . ")";
776 $ga[1] = "\nFlags:";
777 $ga[1] .= " valid" if $self->is_valid;
778 $ga[1] .= " adjourned" if $self->is_adjourned;
779 $ga[1] .= " scored" if $self->is_scored;
780 $ga[1] .= " saved" if $self->is_saved;
781
782 $ga[2] = "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
783
784 $ga[3] = "\nPlayers: <user>" . (util::toxml $self->{user2}->as_string) . "</user>"
785 . " vs. <user>" . (util::toxml $self->{user1}->as_string) . "</user>"
786 if $self->is_valid;
787
788 if ($self->is_valid) {
789 $ga[4] = "\nHandicap: " . $self->{handicap};
790 $ga[5] = "\nKomi: " . $self->{komi};
791 $ga[6] = "\nSize: " . $self->size_string;
792 }
793
794 if ($self->is_scored) {
795 $ga[7] = "\nResult: " . $self->score_string;
796 }
797
798 $text = "\n<infoblock><header>Game Update</header>";
799 for (0..7) {
800 if ($self->{gatext}[$_] ne $ga[$_]) {
801 $text .= $ga[$_];
802 }
803 }
804 $text .= "</infoblock>";
805
806 $self->{gatext} = \@ga;
807
808 $self->{text}->append_text ($text);
809}
810
811sub event_update_rules {
812 my ($self, $rules) = @_;
813
814 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
815 for BLACK, WHITE;
816
817 sound::play 3, "gamestart";
818
819 my $text = "\n<header>Game Rules</header>";
820
821 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
822
823 $text .= "\nTime: ";
824
825 if ($rules->{timesys} == TIMESYS_NONE) {
826 $text .= "UNLIMITED";
827 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
828 $text .= util::format_time $rules->{time};
829 $text .= " ABS";
830 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
831 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count};
832 $text .= sprintf " + %s (%d) BY", util::format_time $rules->{interval}, $rules->{count};
833 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
834 $text .= util::format_time $rules->{time};
835 $text .= sprintf " + %s/%d CAN", util::format_time $rules->{interval}, $rules->{count};
836 }
837
838 $self->{text}->append_text ("<infoblock>$text</infoblock>");
839}
840
841sub inject_resign_game {
842 my ($self, $msg) = @_;
843
844 sound::play 3, "resign";
845
846 $self->{text}->append_text ("\n<infoblock><header>Resign</header>"
847 . "\n<user>"
848 . (util::toxml $self->{user}[$msg->{player}]->as_string)
849 . "</user> resigned.</infoblock>");
850}
851
852sub inject_final_result {
853 my ($self, $msg) = @_;
854
855 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>"
856 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
857 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
858 . "</infoblock>"
859 );
750} 860}
751 861
752sub destroy { 862sub destroy {
753 my ($self) = @_; 863 my ($self) = @_;
754 (delete $self->{userpanel}[WHITE])->destroy if $self->{userpanel}[WHITE]; 864 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
755 (delete $self->{userpanel}[BLACK])->destroy if $self->{userpanel}[BLACK]; 865 for BLACK, WHITE;
756 $self->SUPER::destroy; 866 $self->SUPER::destroy;
757 delete $appwin::gamelist->{game}{$self->{channel}}; 867 delete $appwin::gamelist->{game}{$self->{channel}};
758} 868}
759 869
7601; 8701;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines