ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.82 by root, Sat Aug 19 02:53:48 2006 UTC vs.
Revision 1.102 by root, Wed Apr 18 18:16:16 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 %{$arg{setup_req} || {}},
26 },
27 );
18 28
19 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
20 30
21 my @cmd_help = map { 31 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 43 for @args;
34 44
35 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
37 @args 47 @args
38 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*"; 49 CFPlus::Pod::find command => "*";
40 50
51 $self->connect_ext (event_capabilities => sub {
52 my ($cap) = @_;
53
54 if (my $ts = $cap->{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]);
59
60 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize};
62
63 $self->setup_req (mapsize => "${w}x${h}");
64 }
65 }
66 });
67
41 $self->{map_widget}->add_command (@$_) 68 $self->{map_widget}->add_command (@$_)
42 for @cmd_help; 69 for @cmd_help;
43 70
71 {
72 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
73 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
74 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
75 }
76
77 {
44 $self->{noface} = new_from_file CFPlus::Texture 78 $self->{noface} = my $tex = new_from_file CFPlus::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 79 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
80 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
81 }
46 82
47 $self->{open_container} = 0; 83 $self->{open_container} = 0;
48 84
49 # "global"
50 $self->{tilecache} = CFPlus::db_table "tilecache"
51 or die "tilecache: unable to open database table";
52 $self->{facemap} = CFPlus::db_table "facemap"
53 or die "facemap: unable to open database table";
54
55 # per server 85 # per server
56 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 86 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
57 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
58 87
59 $self 88 $self
60} 89}
61 90
62sub logprint { 91sub logprint {
… …
280 if ($ev->{button} == 1) { 309 if ($ev->{button} == 1) {
281 $::CONN->user_send ("ready_skill $name"); 310 $::CONN->user_send ("ready_skill $name");
282 } elsif ($ev->{button} == 2) { 311 } elsif ($ev->{button} == 2) {
283 $::CONN->user_send ("use_skill $name"); 312 $::CONN->user_send ("use_skill $name");
284 } elsif ($ev->{button} == 3) { 313 } elsif ($ev->{button} == 3) {
314 my $shortname = CFPlus::shorten $name, 14;
285 (new CFPlus::UI::Menu 315 (new CFPlus::UI::Menu
286 items => [ 316 items => [
287 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 317 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
288 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 318 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
289 ], 319 ],
290 )->popup ($ev); 320 )->popup ($ev);
291 } else { 321 } else {
292 return 0; 322 return 0;
293 } 323 }
… …
310 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
311 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
312 } 342 }
313} 343}
314 344
345sub macro_send {
346 my ($self, $macro) = @_;
347
348 for my $cmd (@{ $macro->{action} }) {
349 $self->send_command ($cmd);
350 }
351}
352
315sub user_send { 353sub user_send {
316 my ($self, $command) = @_; 354 my ($self, $command) = @_;
317 355
356 $self->{record}->($command)
318 if ($self->{record}) { 357 if $self->{record};
319 push @{$self->{record}}, $command;
320 }
321 358
322 $self->logprint ("send: ", $command); 359 $self->logprint ("send: ", $command);
323 $self->send_command ($command); 360 $self->send_command ($command);
324 ::status ($command); 361 ::status ($command);
325} 362}
326 363
327sub start_record { 364sub record {
328 my ($self) = @_; 365 my ($self, $cb) = @_;
329 366
330 $self->{record} = []; 367 $self->{record} = $cb;
331}
332
333sub stop_record {
334 my ($self) = @_;
335 return delete $self->{record};
336} 368}
337 369
338sub map_scroll { 370sub map_scroll {
339 my ($self, $dx, $dy) = @_; 371 my ($self, $dx, $dy) = @_;
340 372
… …
361 or return; 393 or return;
362 394
363 my ($hash, $x, $y, $w, $h) = @$map_info; 395 my ($hash, $x, $y, $w, $h) = @$map_info;
364 396
365 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 397 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
366 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 398 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
367 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 399 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
368} 400}
369 401
370sub map_clear { 402sub map_clear {
371 my ($self) = @_; 403 my ($self) = @_;
… …
375 407
376 $self->{map}->clear; 408 $self->{map}->clear;
377 delete $self->{map_widget}{magicmap}; 409 delete $self->{map_widget}{magicmap};
378} 410}
379 411
412sub bg_fetch {
413 my ($self) = @_;
414
415 my $id;
416
417 do {
418 $id = pop @{$self->{bg_fetch}}
419 or return;
420 } while $self->{texture}[$id];
421
422 CFPlus::DB::get tilecache => $id, sub {
423 my ($data) = @_;
424
425 return unless $self->{map}; # stop when destroyed
426
427 $self->set_texture ($id => $data)
428 if defined $data;
429
430 $self->bg_fetch;
431 };
432}
380 433
381sub load_map($$$) { 434sub load_map($$$) {
382 my ($self, $hash, $x, $y) = @_; 435 my ($self, $hash, $x, $y) = @_;
383 436
384 if (defined (my $data = $self->{mapcache}->get ($hash))) { 437 my $gen = $self->{map_change_gen};
438
439 CFPlus::DB::get $self->{mapcache} => $hash, sub {
440 return unless $gen == $self->{map_change_gen};
441
442 my ($data) = @_;
443
444 if (defined $data) {
385 $data = Compress::LZF::decompress $data; 445 $data = Compress::LZF::decompress $data;
386 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 446 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
387 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
388 my $data = $self->{tilecache}->get ($id)
389 or next;
390 447
391 $self->set_texture ($id => $data); 448 my $inprogress = @{ $self->{bg_fetch} || [] };
449 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
450 $self->bg_fetch unless $inprogress;
392 } 451 }
393 } 452 };
394} 453}
395 454
396# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 455# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
397# (server resource,s latency, bandwidth), so this hack is warranted. 456# (server resource,s latency, bandwidth), so this hack is warranted.
398# the right fix is to make real tiled maps with an overview file 457# the right fix is to make real tiled maps with an overview file
… …
462 521
463 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 522 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
464 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 523 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
465 524
466 } else { 525 } else {
526 my $gen = $self->{map_change_gen};
467 $self->send_mapinfo ("spatial $path$tile", sub { 527 $self->send_mapinfo ("spatial $path$tile", sub {
528 return unless $gen == $self->{map_change_gen};
529
468 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 530 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
469 531
470 return if $mode ne "spatial"; 532 return if $mode ne "spatial";
471 533
472 $x += $self->{map}->ox; 534 $x += $self->{map}->ox;
… …
486 548
487sub map_change { 549sub map_change {
488 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 550 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
489 551
490 $self->flush_map; 552 $self->flush_map;
553
554 ++$self->{map_change_gen};
491 555
492 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 556 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
493 557
494 my $mapmapw = $self->{mapmap}->{w}; 558 my $mapmapw = $self->{mapmap}->{w};
495 my $mapmaph = $self->{mapmap}->{h}; 559 my $mapmaph = $self->{mapmap}->{h};
… …
512 $self->load_map ($hash, $x, $y); 576 $self->load_map ($hash, $x, $y);
513 $self->flood_fill (0, 0, 0, "", $hash, $flags); 577 $self->flood_fill (0, 0, 0, "", $hash, $flags);
514} 578}
515 579
516sub face_find { 580sub face_find {
517 my ($self, $facenum, $face) = @_; 581 my ($self, $facenum, $face, $cb) = @_;
518 582
519 my $hash = "$face->{chksum},$face->{name}"; 583 my $hash = "$face->{chksum},$face->{name}";
520 584
521 my $id = $self->{facemap}->get ($hash); 585 my $id = CFPlus::DB::get_tile_id_sync $hash;
522 586
523 unless ($id) {
524 # create new id for face
525 # I love transactions
526 for (1..100) {
527 my $txn = $CFPlus::DB_ENV->txn_begin;
528 my $status = $self->{facemap}->db_get (id => $id);
529 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
530 $id = ($id || 64) + 1;
531 if ($self->{facemap}->put (id => $id) == 0
532 && $self->{facemap}->put ($hash => $id) == 0) {
533 $txn->txn_commit;
534
535 goto gotid;
536 }
537 }
538 $txn->txn_abort;
539 }
540
541 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
542 }
543
544gotid:
545 $face->{id} = $id; 587 $face->{id} = $id;
546 $self->{map}->set_face ($facenum => $id);
547 $self->{faceid}[$facenum] = $id;#d# 588 $self->{faceid}[$facenum] = $id;
548 589
549 my $face = $self->{tilecache}->get ($id); 590 $self->{map}->set_tileid ($facenum => $id);
550 591
551 if ($face) { 592 CFPlus::DB::get tilecache => $id, $cb;
552 #$self->face_prefetch;
553 $face
554 } else {
555 my $tex = $self->{noface};
556 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
557 undef
558 };
559} 593}
560 594
561sub face_update { 595sub face_update {
562 my ($self, $facenum, $face, $changed) = @_; 596 my ($self, $facenum, $face, $changed) = @_;
563 597
564 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 598 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
599 if $changed;
565 600
566 $self->set_texture ($face->{id} => delete $face->{image}); 601 $self->set_texture ($face->{id} => delete $face->{image});
602}
603
604sub smooth_update {
605 my ($self, $facenum, $face) = @_;
606
607 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
567} 608}
568 609
569sub set_texture { 610sub set_texture {
570 my ($self, $id, $data) = @_; 611 my ($self, $id, $data) = @_;
571 612
572 $self->{texture}[$id] ||= do { 613 $self->{texture}[$id] = my $tex =
573 my $tex =
574 new_from_image CFPlus::Texture 614 new_from_image CFPlus::Texture
575 $data, minify => 1, mipmap => 1; 615 $data, minify => 1, mipmap => 1;
576 616
577 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
578 $self->{map_widget}->update; 618 $self->{map_widget}->update;
579
580 $tex
581 };
582} 619}
583 620
584sub sound_play { 621sub sound_play {
585 my ($self, $x, $y, $soundnum, $type) = @_; 622 my ($self, $x, $y, $soundnum, $type) = @_;
586 623
… …
615 [0.75, 0.61, 0.20], 652 [0.75, 0.61, 0.20],
616 [0.99, 0.77, 0.26], 653 [0.99, 0.77, 0.26],
617 [0.74, 0.65, 0.41], 654 [0.74, 0.65, 0.41],
618 ); 655 );
619 656
657 my $fg = $color[$color % @color];
658
620 $self->logprint ("info: ", $text); 659 $self->logprint ("info: ", $text);
621 660
622 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
623
624 # try to create single paragraphs of multiple lines sent by the server 661 ## try to create single paragraphs of multiple lines sent by the server
662 # no longer neecssary with TRT servers
625 $text =~ s/(?<=\S)\n(?=\w)/ /g; 663 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
626 664
627 $text = CFPlus::asxml $text; 665 $text = CFPlus::asxml $text;
628 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 666 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
629 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 667 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
630 668
631 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 669 ::message ({ fg => $fg, markup => $_ })
632 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 670 for split /\n/, $text;
633 $self->{logview}->scroll_to_bottom;
634 671
635 $self->{statusbox}->add ($text, 672 $self->{statusbox}->add ($text,
636 group => $text, 673 group => $text,
637 fg => $color[$color], 674 fg => $fg,
638 timeout => $color >= 2 ? 180 : 10, 675 timeout => $color >= 2 ? 180 : 10,
639 tooltip_font => $::FONT_FIXED, 676 tooltip_font => $::FONT_FIXED,
640 ); 677 );
641} 678}
642 679
… …
652 # try to create single paragraphs out of the multiple lines sent by the server 689 # try to create single paragraphs out of the multiple lines sent by the server
653 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 690 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
654 $spell->{message} =~ s/\n+$//; 691 $spell->{message} =~ s/\n+$//;
655 $spell->{message} ||= "Server did not provide a description for this spell."; 692 $spell->{message} ||= "Server did not provide a description for this spell.";
656 693
657 $::SPELL_PAGE->add_spell ($spell); 694 $::SPELL_LIST->add_spell ($spell);
658 695
659 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 696 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
660 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 697 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
661} 698}
662 699
663sub spell_delete { 700sub spell_delete {
664 my ($self, $spell) = @_; 701 my ($self, $spell) = @_;
665 702
666 $::SPELL_PAGE->remove_spell ($spell); 703 $::SPELL_LIST->remove_spell ($spell);
704}
705
706sub setup {
707 my ($self, $setup) = @_;
708
709 $self->{map_widget}->set_tilesize ($self->{tilesize});
710 $::MAP->resize ($self->{mapw}, $self->{maph});
667} 711}
668 712
669sub addme_success { 713sub addme_success {
670 my ($self) = @_; 714 my ($self) = @_;
671 715
… …
877 $::SERVER_INFO->set_markup ( 921 $::SERVER_INFO->set_markup (
878 "server <tt>$self->{host}:$self->{port}</tt>\n" 922 "server <tt>$self->{host}:$self->{port}</tt>\n"
879 . "protocol version <tt>$self->{version}</tt>\n" 923 . "protocol version <tt>$self->{version}</tt>\n"
880 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 924 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
881 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 925 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
926 . "editing support $yesno[!!$self->{editor_support}]\n"
882 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 927 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
883 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 928 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
884 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 929 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
885 . "map size $self->{mapw}×$self->{maph}\n" 930 . "map size $self->{mapw}×$self->{maph}\n"
886 ); 931 );
932
933 ::setup_build_button ($self->{editor_support}->{builder_ui});
887} 934}
888 935
889sub logged_in { 936sub logged_in {
890 my ($self) = @_; 937 my ($self) = @_;
891 938
892 $self->send_ext_req (cfplus_support => version => 1, sub { 939 $self->send_ext_req (cfplus_support => version => 1, sub {
893 $self->{cfplus_ext} = $_[0]{version}; 940 $self->{cfplus_ext} = $_[0]{version};
894 $self->update_server_info; 941 $self->update_server_info;
895 942
943 if ($self->{cfplus_ext} >= 2) {
944 $self->send_ext_req ("editor_support", sub {
945 $self->{editor_support} = $_[0];
946 $self->update_server_info;
947
948 0
949 });
950 }
951
896 0 952 0
897 }); 953 });
898 954
899 $self->update_server_info; 955 $self->update_server_info;
900 956
901 $self->send_command ("output-sync $::CFG->{output_sync}"); 957 $self->send_command ("output-sync $::CFG->{output_sync}");
902 $self->send_command ("output-count $::CFG->{output_count}"); 958 $self->send_command ("output-count $::CFG->{output_count}");
959 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
903 $self->send_command ("pickup $::CFG->{pickup}"); 960 $self->send_command ("pickup $::CFG->{pickup}");
961}
962
963sub buildat {
964 my ($self, $builditem, $x, $y) = @_;
965
966 if ($self->{cfplus_ext}) {
967 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
968 }
904} 969}
905 970
906sub lookat { 971sub lookat {
907 my ($self, $x, $y) = @_; 972 my ($self, $x, $y) = @_;
908 973
… …
951 kw => { hi => 0, yes => 0, no => 0 }, 1016 kw => { hi => 0, yes => 0, no => 0 },
952 has_close_button => 1, 1017 has_close_button => 1,
953 @_, 1018 @_,
954 ); 1019 );
955 1020
956 Scalar::Util::weaken (my $this = $self); 1021 CFPlus::weaken (my $this = $self);
957 1022
958 $self->connect (delete => sub { $this->destroy; 1 }); 1023 $self->connect (delete => sub { $this->destroy; 1 });
959 1024
960 # better use a pane... 1025 # better use a pane...
961 $self->add (my $hbox = new CFPlus::UI::HBox); 1026 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1005}; 1070};
1006 1071
1007sub update_options { 1072sub update_options {
1008 my ($self) = @_; 1073 my ($self) = @_;
1009 1074
1010 Scalar::Util::weaken $self; 1075 CFPlus::weaken $self;
1011 1076
1012 $self->{options}->clear; 1077 $self->{options}->clear;
1013 $self->{options}->add ($self->{bye_button}); 1078 $self->{options}->add ($self->{bye_button});
1014 1079
1015 for my $kw (sort keys %{ $self->{kw} }) { 1080 for my $kw (sort keys %{ $self->{kw} }) {
… …
1024} 1089}
1025 1090
1026sub feed { 1091sub feed {
1027 my ($self, $msg) = @_; 1092 my ($self, $msg) = @_;
1028 1093
1029 Scalar::Util::weaken $self; 1094 CFPlus::weaken $self;
1030 1095
1031 if ($msg->{msgtype} eq "reply") { 1096 if ($msg->{msgtype} eq "reply") {
1032 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1097 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1033 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1098 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1034 1099
… …
1085 1150
1086 $self->SUPER::destroy; 1151 $self->SUPER::destroy;
1087} 1152}
1088 1153
10891 11541
1155

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines