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.190 by root, Tue Mar 25 19:21:33 2008 UTC vs.
Revision 1.224 by root, Wed Nov 7 00:25:46 2012 UTC

1package DC::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict; 4
5use Guard ();
5 6
6use Deliantra::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use DC; 9use DC;
9use DC::DB; 10use DC::DB;
12use DC::Macro; 13use DC::Macro;
13use DC::Item; 14use DC::Item;
14 15
15use base 'Deliantra::Protocol::Base'; 16use base 'Deliantra::Protocol::Base';
16 17
18our $TEX_DIALOGUE = new_from_resource DC::Texture
19 "dialogue.png", minify => 1, mipmap => 1;
20
21our $TEX_NOFACE = new_from_resource DC::Texture
22 "noface.png", minify => 1, mipmap => 1, wrap => 1;
23
24sub MIN_TEXTURE_UNUSED() { 1 }#d#
25
17sub new { 26sub new {
18 my ($class, %arg) = @_; 27 my ($class, %arg) = @_;
19 28
20 my $self = $class->SUPER::new (%arg, 29 my $self = $class->SUPER::new (%arg,
21 setup_req => { 30 setup_req => {
22 extmap => 1, 31 extmap => 1,
23 excmd => 1,
24 widget => 2, 32 widget => 2,
25 %{$arg{setup_req} || {}}, 33 %{$arg{setup_req} || {}},
26 }, 34 },
27 ); 35 );
28 36
37 $self->update_fx_want;
38
39 my $exp_guard = $self->addme_guard;
40 my $skl_guard = $self->addme_guard;
41 my $spl_guard = $self->addme_guard;
42 $self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub {
43 my ($exp, $skl, $spl) = @_;
44
45 $self->register_face_handler ($exp, sub {
46 my ($face) = @_;
47
48 undef $exp_guard;
49 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
50 $_->() for values %{ $self->{on_exp_update} };
51 });
52
53 $self->register_face_handler ($skl, sub {
54 my ($face) = @_;
55
56 undef $skl_guard;
57 my $info = $self->{json_coder}->decode (delete $face->{data});
58 $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
59 });
60
61 $self->register_face_handler ($spl, sub {
62 my ($face) = @_;
63
64 undef $spl_guard;
65 my $info = $self->{json_coder}->decode (delete $face->{data});
66 $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info };
67 });
68
69 ()
70 });
71
29 $self->{map_widget}->clr_commands; 72 $self->{map_widget}->clr_commands;
30 73
31 my @cmd_help = map { 74 my @cmd_help = map {
32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 75 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
33 or die "unparseable command help: $_->{kw}[0]"; 76 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
34 77
35 my $cmd = $1; 78 my $cmd = $1;
36 my @args = split /\|/, $2; 79 my @args = split /\|/, $2;
37 @args = (".*") unless @args; 80 @args = (".*") unless @args;
38 81
43 for @args; 86 for @args;
44 87
45 map ["$cmd$_", $text], 88 map ["$cmd$_", $text],
46 sort { (length $a) <=> (length $b) } 89 sort { (length $a) <=> (length $b) }
47 @args 90 @args
48 } sort { $a->{par} <=> $b->{par} } 91 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
49 DC::Pod::find command => "*"; 92 DC::Pod::find command => "*";
50 93
51 $self->{json_coder} 94 $self->{json_coder}
52 ->convert_blessed 95 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub { 96 ->filter_json_single_key_object ("\fw" => sub {
64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 107 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
65 for my $ws (values %{delete $self->{widgetset} || {}}) { 108 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy 109 $_->destroy
67 for values %{delete $ws->{w} || {}}; 110 for values %{delete $ws->{w} || {}};
68 } 111 }
112
113 delete $self->{items};
114 $::INV->clear;
115 $::INVR->clear;
116 $::INVR_HB->clear;
117 $::FLOORBOX->clear;
69 }); 118 });
70 119
71 $self->{map_widget}->add_command (@$_) 120 $self->{map_widget}->add_command (@$_)
72 for @cmd_help; 121 for @cmd_help;
73 122
74 { 123 {
75 $self->{dialogue} = my $tex = new_from_file DC::Texture 124 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 125 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
78 } 126 }
79 127
80 { 128 {
81 $self->{noface} = my $tex = new_from_file DC::Texture 129 $self->{noface} = my $tex = $TEX_NOFACE;
82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 130 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
84 } 131 }
132
133# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
134# $self->{expire_w} = AE::timer 1, 1, sub {
135# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
136#
137# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
138# warn DC::SvREFCNT $self->{texture}[$_];
139# $self->{texture}[$_]->unload;
140# warn "expire texture $_\n";#d#
141# }
142#
143# ($self->{expire_count} += $count) < @{ $self->{texture} }
144# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
145# warn "count is $count\n";#d#
146# };
85 147
86 $self->{open_container} = 0; 148 $self->{open_container} = 0;
87 149
88 # per server 150 # per server
89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 151 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
101 }); 163 });
102} 164}
103 165
104sub ext_capabilities { 166sub ext_capabilities {
105 my ($self, %cap) = @_; 167 my ($self, %cap) = @_;
106
107 $self->update_fx_want;
108
109 $self->send_exti_req (resource => "exp_table", sub {
110 my ($exp_table) = @_;
111
112 $self->register_face_handler ($exp_table, sub {
113 my ($face) = @_;
114
115 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
116 $_->() for values %{ $self->{on_exp_update} || {} };
117 });
118
119 ()
120 });
121 168
122 if (my $ts = $cap{tileset}) { 169 if (my $ts = $cap{tileset}) {
123 if (my ($default) = grep $_->[2] & 1, @$ts) { 170 if (my ($default) = grep $_->[2] & 1, @$ts) {
124 $self->{tileset} = $default; 171 $self->{tileset} = $default;
125 $self->{tilesize} = $default->[3]; 172 $self->{tilesize} = $default->[3];
250 my %wkw = ( 297 my %wkw = (
251 root => $DC::UI::ROOT, 298 root => $DC::UI::ROOT,
252 tooltip => $DC::UI::TOOLTIP, 299 tooltip => $DC::UI::TOOLTIP,
253 300
254 mapwidget => $::MAPWIDGET, 301 mapwidget => $::MAPWIDGET,
302 menubar => $::MENUBAR,
303 menupopup => $::MENUPOPUP,
304 pickup_enable => $::PICKUP_ENABLE,
255 buttonbar => $::BUTTONBAR, 305 buttonbar => $::BUTTONBAR,
256 metaserver => $::METASERVER, 306 metaserver => $::METASERVER,
257 buttonbar => $::BUTTONBAR, 307 buttonbar => $::BUTTONBAR,
258 login_button => $::LOGIN_BUTTON, 308 login_button => $::LOGIN_BUTTON,
259 quit_dialog => $::QUIT_DIALOG, 309 quit_dialog => $::QUIT_DIALOG,
276 326
277 floorbox => $::FLOORBOX, 327 floorbox => $::FLOORBOX,
278 help_window => $::HELP_WINDOW, 328 help_window => $::HELP_WINDOW,
279 message_window => $::MESSAGE_WINDOW, 329 message_window => $::MESSAGE_WINDOW,
280 message_dist => $::MESSAGE_DIST, 330 message_dist => $::MESSAGE_DIST,
281 statusbox => $::SDTATUSBOX, 331 statusbox => $::STATUSBOX,
282 332
283 inv => $::INV, 333 inv => $::INV,
284 invr => $::INVR, 334 invr => $::INVR,
285 invr_hb => $::INVR_HB, 335 invr_hb => $::INVR_HB,
286 ); 336 );
370 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 420 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
371 : () 421 : ()
372 } 422 }
373 sort { $a <=> $b } keys %{$self->{spell_paths}}; 423 sort { $a <=> $b } keys %{$self->{spell_paths}};
374 424
375 join "", @diff 425 "\u$name: " . (join ", ", @diff)
376} 426}
377 427
378# all stats that are chacked against changes 428# all stats that are chacked against changes
379my @statchange = ( 429my @statchange = (
380 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 430 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
423 473
424 if (my @diffs = 474 if (my @diffs =
425 ( 475 (
426 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), 476 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
427 map { 477 map {
428 $stats->{$_} && $prev->{$_} 478 $stats->{$_} && $prev->{$_}
429 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 479 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
430 } sort { $a <=> $b } keys %{$self->{skill_info}} 480 } sort { $a <=> $b } keys %{$self->{skill_info}}
431 ) 481 )
432 ) { 482 ) {
433 my $msg = join " ", @diffs; 483 my $msg = join " ", @diffs;
435 } 485 }
436 486
437 if ( 487 if (
438 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 488 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
439 ) { 489 ) {
440 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 490 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
441 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); 491 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
442 } 492 }
443 493
444 $self->update_stats_window ($stats, $prev); 494 $self->update_stats_window ($stats, $prev);
445 495
483 533
484 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 534 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
485 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 535 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
486 $::GAUGES->{food} ->set_value ($fo, $fo_m); 536 $::GAUGES->{food} ->set_value ($fo, $fo_m);
487 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 537 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
488 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 538 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
489 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 539 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
490 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); 540 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
491 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 541 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
492 my $title = $stats->{+CS_STAT_TITLE}; 542 my $title = $stats->{+CS_STAT_TITLE};
493 $title =~ s/^Player: //; 543 $title =~ s/^Player: //;
494 $::STATWIDS->{title} ->set_text ("Title: " . $title); 544 $::STATWIDS->{title} ->set_text ("Title: " . $title);
495 545
507 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 557 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
508 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 558 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
509 559
510 $self->update_weight; 560 $self->update_weight;
511 561
512 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 562 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
513 for keys %RES_TBL; 563 for keys %RES_TBL;
514 564
515 my $sktbl = $::STATWIDS->{skill_tbl}; 565 my $sktbl = $::STATWIDS->{skill_tbl};
516 my @skills = keys %{ $self->{skill_info} }; 566 my @skills = keys %{ $self->{skill_info} };
517 567
536 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), 586 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
537 ]; 587 ];
538 588
539 my @add = @$sw; 589 my @add = @$sw;
540 590
541 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 591 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
542 592
543 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 593 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
544 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 594 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
545 595
546 my ($x, $y) = (0, 1); 596 my ($x, $y) = (0, 1);
608 my $sw = $self->{skillwid}{$idx}; 658 my $sw = $self->{skillwid}{$idx};
609 $sw->[0]->set_text (::formsep ($val->[1])); 659 $sw->[0]->set_text (::formsep ($val->[1]));
610 $sw->[1]->set_text ($val->[0] * 1); 660 $sw->[1]->set_text ($val->[0] * 1);
611 $sw->[2]->set_value (@$val); 661 $sw->[2]->set_value (@$val);
612 662
613 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 663 $::GAUGES->{skillexp}->set_label ("$name %d%%");
614 $::GAUGES->{sklprg}->set_value (@$val); 664 $::GAUGES->{skillexp}->set_value (@$val);
615 } 665 }
616} 666}
617 667
618sub user_send { 668sub user_send {
619 my ($self, $command) = @_; 669 my ($self, $command) = @_;
632} 682}
633 683
634sub map_scroll { 684sub map_scroll {
635 my ($self, $dx, $dy) = @_; 685 my ($self, $dx, $dy) = @_;
636 686
637 $self->{map}->scroll ($dx, $dy); 687 $self->{map_widget}->scroll ($dx, $dy);
638} 688}
639 689
640sub feed_map1a { 690sub feed_map1a {
641 my ($self, $data) = @_; 691 my ($self, $data) = @_;
642 692
643 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 693 my $missing = $self->{map}->map1a_update ($data);
644 my $delay; 694 my $delay;
645 695
646 for my $tile (@$missing) { 696 for my $tile (@$missing) {
647 next if $self->{delay}{$tile}; 697 next if $self->{delay}{$tile};
648 698
649 $delay = 1; 699 $delay = 1;
650 700
651 if (my $tex = $::CONN->{texture}[$tile]) { 701 if (my $tex = $self->{texture}[$tile]) {
652 $tex->upload; 702 $tex->upload;
653 } else { 703 } else {
654 $self->{delay}{$tile} = 1; 704 $self->{delay}{$tile} = 1;
655 705
656 # we assume the face is in-flight and will eventually come 706 # we assume the face is in-flight and will eventually arrive
657 push @{$self->{tile_cb}{$tile}}, sub { 707 push @{$self->{tile_cb}{$tile}}, sub {
658 delete $self->{delay}{$tile}; 708 delete $self->{delay}{$tile};
659 $_[0]->upload; 709 $_[0]->upload;
660 }; 710 };
661 } 711 }
662 } 712 }
663 713
664 if ($delay) { 714 if ($delay) {
665 # delay the map drawing a tiny bit in the hope of getting the missing fetched 715 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
666 EV::once undef, 0, 0.03, sub { 716 EV::once undef, 0, 0.03, sub {
667 $self->{map_widget}->update 717 $self->{map_widget}->update
668 if $self->{map_widget}; 718 if $self->{map_widget};
669 }; 719 };
670 } else { 720 } else {
679} 729}
680 730
681sub flush_map { 731sub flush_map {
682 my ($self) = @_; 732 my ($self) = @_;
683 733
684 my $map_info = delete $self->{map_info} 734 return unless $self->{map_info};
685 or return;
686 735
736 for my $map_info (values %{ $self->{map_cache} || {} }) {
687 my ($hash, $x, $y, $w, $h) = @$map_info; 737 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
688 738
689 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 739 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
690 $self->{map_cache_new}{$hash} = \$data; 740
741 if ($data ne $$rdata) {
742 $map_info->[1] = \$data;
743 my $cdata = Compress::LZF::compress $data;
691 DC::DB::put $self->{mapcache} => $hash => $data, sub { }; 744 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
745 }
746 }
692} 747}
693 748
694sub map_clear { 749sub map_clear {
695 my ($self) = @_; 750 my ($self) = @_;
696 751
697 $self->flush_map; 752 $self->flush_map;
753 delete $self->{map_info};
698 delete $self->{neigh_map}; 754 delete $self->{neigh_map};
699 755
700 $self->{map}->clear; 756 $self->{map}->clear;
701 delete $self->{map_widget}{magicmap}; 757 delete $self->{map_widget}{magicmap};
702} 758}
723 779
724 $self->bg_fetch; 780 $self->bg_fetch;
725 }; 781 };
726} 782}
727 783
728sub load_map($$$) { 784sub load_map($$$$$$) {
729 my ($self, $hash, $x, $y) = @_; 785 my ($self, $hash, $x, $y, $w, $h) = @_;
730 786
731 my $gen = $self->{map_change_gen}; 787 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
732 788
733 my $cb = sub { 789 my $cb = sub {
734 return unless $gen == $self->{map_change_gen}; 790 $map_info->[1] = \$_[0];
735 791
736 my ($data) = @_;
737
738 if (defined $data) {
739 $self->{map_cache_new}{$hash} = \$data;
740
741 my $data = Compress::LZF::decompress $data;
742
743 my $inprogress = @{ $self->{bg_fetch} || [] }; 792 my $inprogress = @{ $self->{bg_fetch} || [] };
744 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 793 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
745 $self->bg_fetch unless $inprogress; 794 $self->bg_fetch unless $inprogress;
746 }
747 }; 795 };
748 796
749 if (my $rdata = $self->{map_cache_old}{$hash}) { 797 if (my $map_info = $self->{map_cache_old}{$hash}) {
750 $cb->($$rdata); 798 $cb->(${ $map_info->[1] });
751 } else { 799 } else {
800 my $gen = $self->{map_change_gen};
801
752 DC::DB::get $self->{mapcache} => $hash, $cb; 802 DC::DB::get $self->{mapcache} => $hash, sub {
803 return unless $gen == $self->{map_change_gen};
804 return unless defined $_[0];
805 $cb->(Compress::LZF::decompress $_[0]);
806 };
753 } 807 }
754} 808}
755 809
756# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 810# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
757# (server resource,s latency, bandwidth), so this hack is warranted. 811# (server resources, latency, bandwidth), so this hack is warranted.
758# the right fix is to make real tiled maps with an overview file 812# the right fix is to make real tiled maps with an overview file
759sub send_mapinfo { 813sub send_mapinfo {
760 my ($self, $data, $cb) = @_; 814 my ($self, $data, $cb) = @_;
761 815
762 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 816 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
787} 841}
788 842
789# this method does a "flood fill" into every tile direction 843# this method does a "flood fill" into every tile direction
790# it assumes that tiles are arranged in a rectangular grid, 844# it assumes that tiles are arranged in a rectangular grid,
791# i.e. a map is the same as the left of the right map etc. 845# i.e. a map is the same as the left of the right map etc.
792# failure to comply are harmless and result in display errors 846# failure to comply is harmless and results in display errors
793# at worst. 847# at worst.
794sub flood_fill { 848sub flood_fill {
795 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 849 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
796 850
797 # the server does not allow map paths > 6 851 # the server does not allow map paths > 6
833 return if $mode ne "spatial"; 887 return if $mode ne "spatial";
834 888
835 $x += $self->{map}->ox; 889 $x += $self->{map}->ox;
836 $y += $self->{map}->oy; 890 $y += $self->{map}->oy;
837 891
838 $self->load_map ($hash, $x, $y) 892 $self->load_map ($hash, $x, $y, $w, $h)
839 unless $self->{neigh_map}{$hash}[5]++;#d# 893 unless $self->{neigh_map}{$hash}[5]++;#d#
840 894
841 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 895 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
842 896
843 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 897 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
851 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 905 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
852 906
853 $self->flush_map; 907 $self->flush_map;
854 908
855 ++$self->{map_change_gen}; 909 ++$self->{map_change_gen};
856 $self->{map_cache_old} = delete $self->{map_cache_new}; 910 $self->{map_cache_old} = delete $self->{map_cache};
857 911
858 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 912 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
859 913
860 my $mapmapw = $self->{mapmap}->{w}; 914 my $mapmapw = $self->{mapmap}->{w};
861 my $mapmaph = $self->{mapmap}->{h}; 915 my $mapmaph = $self->{mapmap}->{h};
873 $self->{map_info} = [$hash, $x, $y, $w, $h]; 927 $self->{map_info} = [$hash, $x, $y, $w, $h];
874 928
875 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 929 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
876 $::STATWIDS->{map}->set_text ("Map: " . $map); 930 $::STATWIDS->{map}->set_text ("Map: " . $map);
877 931
878 $self->load_map ($hash, $x, $y); 932 $self->load_map ($hash, $x, $y, $w, $h);
879 $self->flood_fill (0, 0, 0, "", $hash, $flags); 933 $self->flood_fill (0, 0, 0, "", $hash, $flags);
880} 934}
881 935
882sub face_find { 936sub face_find {
883 my ($self, $facenum, $face, $cb) = @_; 937 my ($self, $facenum, $face, $cb) = @_;
954 1008
955 my $tex = $self->{texture}[$tile] ||= 1009 my $tex = $self->{texture}[$tile] ||=
956 new DC::Texture 1010 new DC::Texture
957 tile => $tile, 1011 tile => $tile,
958 image => $data, delete_image => 1, 1012 image => $data, delete_image => 1,
959 minify => 1, mipmap => 1; 1013 minify => 1;
960 1014
961 if (my $cbs = delete $self->{tile_cb}{$tile}) { 1015 if (my $cbs = delete $self->{tile_cb}{$tile}) {
962 $_->($tex) for @$cbs; 1016 $_->($tex) for @$cbs;
963 } 1017 }
964} 1018}
969 my ($self, $num, $cb) = @_; 1023 my ($self, $num, $cb) = @_;
970 1024
971 push @{$self->{face_cb}{$num}}, $cb; 1025 push @{$self->{face_cb}{$num}}, $cb;
972 1026
973 defined wantarray 1027 defined wantarray
974 ? DC::guard { 1028 ? Guard::guard {
975 @{$self->{face_cb}{$num}} 1029 @{$self->{face_cb}{$num}}
976 = grep $_ != $cb, 1030 = grep $_ != $cb,
977 @{$self->{face_cb}{$num}}; 1031 @{$self->{face_cb}{$num}};
978 } 1032 }
979 : () 1033 : ()
1007 my ($self, $flags, $prompt) = @_; 1061 my ($self, $flags, $prompt) = @_;
1008 1062
1009 $prompt = $LAST_QUERY unless length $prompt; 1063 $prompt = $LAST_QUERY unless length $prompt;
1010 $LAST_QUERY = $prompt; 1064 $LAST_QUERY = $prompt;
1011 1065
1012 $self->{query}-> ($self, $flags, $prompt); 1066 $self->{query}->($self, $flags, $prompt);
1013} 1067}
1014 1068
1015sub sanitise_xml($) { 1069sub sanitise_xml($) {
1016 local $_ = shift; 1070 local $_ = shift;
1017 1071
1025 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1079 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1026 1080
1027 # handle some elements 1081 # handle some elements
1028 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1082 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
1029 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1083 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1084
1085 s/\s+$//;
1030 1086
1031 $_ 1087 $_
1032} 1088}
1033 1089
1034our %NAME_TO_COLOR = ( 1090our %NAME_TO_COLOR = (
1047 tan => 12, 1103 tan => 12,
1048); 1104);
1049 1105
1050our @CF_COLOR = ( 1106our @CF_COLOR = (
1051 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1107 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1052 [1.00, 1.00, 1.00], 1108 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1053 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1109 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55],
1054 [1.00, 0.00, 0.00], 1110 [1.00, 0.00, 0.00],
1055 [1.00, 0.54, 0.00], 1111 [1.00, 0.54, 0.00],
1056 [0.11, 0.56, 1.00], 1112 [0.11, 0.56, 1.00],
1057 [0.93, 0.46, 0.00], 1113 [0.93, 0.46, 0.00],
1058 [0.18, 0.54, 0.34], 1114 [0.18, 0.54, 0.34],
1077 $self->logprint ("msg: ", $text); 1133 $self->logprint ("msg: ", $text);
1078 return if $color < 0; # negative color == ignore if not understood 1134 return if $color < 0; # negative color == ignore if not understood
1079 1135
1080 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; 1136 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1081 1137
1082 ## try to create single paragraphs of multiple lines sent by the server
1083 # no longer neecssary with TRT servers
1084 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1085
1086 for (split /\n/, $text) {
1087 ::message ({ 1138 ::message ({
1088 fg => $fg, 1139 fg => $fg,
1089 markup => $_, 1140 markup => $text,
1090 type => $type, 1141 type => $type,
1091 extra => [@extra], 1142 extra => [@extra],
1092 color_flags => $color, #d# ugly, kill 1143 color_flags => $color, #d# ugly, kill
1093 }); 1144 });
1094 1145
1095 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1146# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1096 # actually, this is an ugly design. _we_ should control the channels, 1147# # actually, this is an ugly design. _we_ should control the channels,
1097 # not some random other widget, as the channels are clearly protocol-specific. 1148# # not some random other widget, as the channels are clearly protocol-specific.
1098 # then we could also react to flags such as CLEAR without resorting to 1149# # then we could also react to flags such as CLEAR without resorting to
1099 # hacks such as color_flags, above. 1150# # hacks such as color_flags, above.
1100 }
1101 1151
1102 $self->{statusbox}->add ($text, 1152 $self->{statusbox}->add ($text,
1103 group => $text, 1153 group => $text,
1104 fg => $fg, 1154 fg => $fg,
1105 timeout => $color >= 2 ? 180 : 10, 1155 timeout => $color >= 2 ? 180 : 10,
1170 $::FLOORBOX->clear; 1220 $::FLOORBOX->clear;
1171 1221
1172 my @add; 1222 my @add;
1173 1223
1174 my $row; 1224 my $row;
1175 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1225 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1226 next if $_->{tag} & 0x80000000;
1176 if ($row < 6) { 1227 if ($row < 6) {
1177 local $_->{face_widget}; # hack to force recreation of widget 1228 local $_->{face_widget}; # hack to force recreation of widget
1178 local $_->{desc_widget}; # hack to force recreation of widget 1229 local $_->{desc_widget}; # hack to force recreation of widget
1179 DC::Item::update_widgets $_; 1230 DC::Item::update_widgets $_;
1180 1231
1207sub set_opencont { 1258sub set_opencont {
1208 my ($conn, $tag, $name) = @_; 1259 my ($conn, $tag, $name) = @_;
1209 $conn->{open_container} = $tag; 1260 $conn->{open_container} = $tag;
1210 update_floorbox; 1261 update_floorbox;
1211 1262
1212 $::INVR_HB->clear (); 1263 $::INVR_HB->clear;
1213 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); 1264 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1214 1265
1215 if ($tag != 0) { # Floor isn't closable, is it? 1266 if ($tag != 0) { # Floor isn't closable, is it?
1216 $::INVR_HB->add (new DC::UI::Button 1267 $::INVR_HB->add (new DC::UI::Button
1217 text => "Close container", 1268 text => "Close container",
1273} 1324}
1274 1325
1275sub item_update { 1326sub item_update {
1276 my ($self, $item) = @_; 1327 my ($self, $item) = @_;
1277 1328
1278 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1329 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1279 1330
1280 DC::Item::update_widgets $item; 1331 DC::Item::update_widgets $item;
1281 1332
1282 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1333 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1283 set_opencont ($::CONN, 0, "Floor"); 1334 set_opencont ($::CONN, 0, "Floor");
1284 1335
1285 } elsif ($item->{flags} & F_OPEN) { 1336 } elsif ($item->{flags} & F_OPEN) {
1286 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); 1337 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1311sub update_server_info { 1362sub update_server_info {
1312 my ($self) = @_; 1363 my ($self) = @_;
1313 1364
1314 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1365 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1315 1366
1367 my $version = JSON::XS->new->encode ($self->{s_version});
1368
1316 $::SERVER_INFO->set_markup ( 1369 $::SERVER_INFO->set_markup (
1317 "server <tt>$self->{host}:$self->{port}</tt>\n" 1370 "server <tt>$self->{host}:$self->{port}</tt>\n"
1318 . "protocol version <tt>$self->{version}</tt>\n" 1371 . "protocol version <tt>$version</tt>\n"
1319 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1320 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1321 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1322 . "editing support $yesno[!!$self->{editor_support}]\n" 1372 . "editing support $yesno[!!$self->{editor_support}]\n"
1323 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1324 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1325 . "client support $yesno[$self->{cfplus_ext} > 0]" 1373 . "client support $yesno[$self->{cfplus_ext} > 0]"
1326 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1374 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1327 . "map size $self->{mapw}×$self->{maph}\n" 1375 . "map size $self->{mapw}×$self->{maph}\n"
1328 ); 1376 );
1329 1377
1351 }); 1399 });
1352 1400
1353 $self->update_server_info; 1401 $self->update_server_info;
1354 1402
1355 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1403 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1356 $self->send_command ("pickup $::CFG->{pickup}"); 1404 $self->send_pickup ($::CFG->{pickup});
1357} 1405}
1358 1406
1359sub lookat { 1407sub lookat {
1360 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1361 1409
1363 $self->send_ext_req (lookat => $x, $y, sub { 1411 $self->send_ext_req (lookat => $x, $y, sub {
1364 my (%msg) = @_; 1412 my (%msg) = @_;
1365 1413
1366 if (exists $msg{npc_dialog}) { 1414 if (exists $msg{npc_dialog}) {
1367 # start npc chat dialog 1415 # start npc chat dialog
1368 $self->{npc_dialog} = new DC::NPCDialog:: 1416 $self->{w}{npc_dialog} = new DC::NPCDialog::
1369 token => $msg{npc_dialog}, 1417 token => $msg{npc_dialog},
1370 title => "$msg{npc_dialog}[0] (NPC)", 1418 title => "$msg{npc_dialog}[0] (NPC)",
1371 conn => $self, 1419 conn => $self,
1372 ; 1420 ;
1373 } 1421 }
1378} 1426}
1379 1427
1380sub destroy { 1428sub destroy {
1381 my ($self) = @_; 1429 my ($self) = @_;
1382 1430
1383 (delete $self->{npc_dialog})->destroy 1431 $_->destroy
1384 if $self->{npc_dialog}; 1432 for values %{ $self->{w} };
1385 1433
1386 $self->SUPER::destroy; 1434 $self->SUPER::destroy;
1387 1435
1388 %$self = (); 1436 %$self = ();
1389} 1437}
1525} 1573}
1526 1574
1527sub send { 1575sub send {
1528 my ($self, $msg) = @_; 1576 my ($self, $msg) = @_;
1529 1577
1530 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); 1578 $self->{textview}->add_paragraph ({
1579 markup =>
1580 "\n<span foreground='#ffff00'><b>"
1581 . (DC::asxml $msg)
1582 . "</b></span>"
1583 });
1531 $self->{textview}->scroll_to_bottom; 1584 $self->{textview}->scroll_to_bottom;
1532 1585
1533 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1586 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1534} 1587}
1535 1588
1538 1591
1539 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1592 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1540 1593
1541 if ($self->{conn}) { 1594 if ($self->{conn}) {
1542 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; 1595 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1543 delete $self->{conn}{npc_dialog}; 1596 delete $self->{conn}{w}{npc_dialog};
1544 $self->{conn}->disconnect_ext ($self->{id}); 1597 $self->{conn}->disconnect_ext ($self->{id});
1545 } 1598 }
1546 1599
1547 $self->SUPER::destroy; 1600 $self->SUPER::destroy;
1548} 1601}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines