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.130 by root, Tue Jul 24 00:28:07 2007 UTC vs.
Revision 1.138 by root, Sat Jul 28 16:48:45 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 ywidget => 1, 26 ywidget => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (music => sub { 53 $self->connect_ext (music => sub {
54 my (%ev) = @_; 54 my ($ev) = @_;
55 55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); 56 &::audio_music_set ($self->{songs} = $ev->{play})
104 } 57 if $ev->{play};
105 }); 58 });
106 59
107 $self->connect_ext (capabilities => sub { 60 $self->connect_ext (capabilities => sub {
108 my (%cap) = @_; 61 my (%cap) = @_;
62
63 #$self->send ("setup sound 0"); # we use a different protocol
64
65 $self->send_exti_msg (fx_want => {
66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
67 #5 => !!$::CFG->{audio_enable}, # FT_SOUND
68 });
109 69
110 if (my $ts = $cap{tileset}) { 70 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 71 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 72 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 73 $self->{tilesize} = $default->[3];
… …
225 185
226 my $w = $self->{widget}{$id} 186 my $w = $self->{widget}{$id}
227 or return; 187 or return;
228 188
229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
190 });
191
192 # message window
193 $self->connect_ext (channel_info => sub {
194 my ($info) = @_;
195 $self->{channels}->{$info->{id}} = $info;
196 $::MESSAGE_WINDOW->add_channel ($info);
230 }); 197 });
231 198
232 # destroy widgets on logout 199 # destroy widgets on logout
233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 200 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
234 for my $ws (values %{delete $self->{widgetset} || {}}) { 201 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
756} 723}
757 724
758sub face_find { 725sub face_find {
759 my ($self, $facenum, $face, $cb) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
760 727
761 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
762
763 my $id = CFPlus::DB::get_tile_id_sync $hash; 729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
764 730
765 $face->{id} = $id; 731 $face->{id} = $id;
766 $self->{faceid}[$facenum] = $id; 732 $self->{faceid}[$facenum] = $id;
767 733
768 $self->{map}->set_tileid ($facenum => $id); 734 $self->{map}->set_tileid ($facenum => $id);
769 735
770 CFPlus::DB::get tilecache => $id, $cb; 736 CFPlus::DB::get tilecache => $id, $cb;
737
738 } elsif ($face->{type} & 1) { # with metadata
739 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
740 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
741 }
771} 742}
772 743
773sub face_update { 744sub face_update {
774 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
775 746
747 if ($face->{type} == 0) { # FT_FACE
776 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
777 if $changed; 749 if $changed;
778 750
779 $self->set_texture ($face->{id} => delete $face->{image}); 751 $self->set_texture ($face->{id} => delete $face->{data});
752
753 } elsif ($face->{type} & 1) { # split metadata
754 my $cb = sub { };
755
756 if ($face->{type} == 3) { # FT_MUSIC
757 $cb = sub {
758 $self->{music_meta}{$facenum} = $face;
759
760 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed;
762
763 &::audio_music_set ($self->{songs});
764 };
765 }
766
767 my $path = CFPlus::DB::path_of_res $face->{name};
768
769 if ($changed) { # new data
770 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
771
772 CFPlus::DB::write_file $path, $data, sub {
773 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
774 $face->{meta} = $self->{json_coder}->decode ($meta_json);
775 $face->{path} = $path;
776
777 $cb->();
778 };
779 };
780 } else {
781 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
782 $face->{path} = $path;
783 $cb->();
784 }
785 }
780} 786}
781 787
782sub smooth_update { 788sub smooth_update {
783 my ($self, $facenum, $face) = @_; 789 my ($self, $facenum, $face) = @_;
784 790
… …
812 } 818 }
813} 819}
814 820
815sub sound_play { 821sub sound_play {
816 my ($self, $x, $y, $soundnum, $type) = @_; 822 my ($self, $x, $y, $soundnum, $type) = @_;
823 warn "sound play <@_>\n";#d#
817 824
818 $self->{sound_play}->($x, $y, $soundnum, $type); 825 #$self->{sound_play}->($x, $y, $soundnum, $type);
819} 826}
820 827
821my $LAST_QUERY; # server is stupid, stupid, stupid 828my $LAST_QUERY; # server is stupid, stupid, stupid
822 829
823sub query { 830sub query {
… …
888 $self->{$type} = $text; 895 $self->{$type} = $text;
889 } else { 896 } else {
890 $self->logprint ("msg: ", $text); 897 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood 898 return if $color < 0; # negative color == ignore if not understood
892 899
893 my $fg = $CF_COLOR[$color % @CF_COLOR]; 900 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
894 901
895 ## try to create single paragraphs of multiple lines sent by the server 902 ## try to create single paragraphs of multiple lines sent by the server
896 # no longer neecssary with TRT servers 903 # no longer neecssary with TRT servers
897 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 904 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
898 905
899 ::message ({ fg => $fg, markup => $_ }) 906 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
900 for split /\n/, $text; 907 for split /\n/, $text;
901 908
902 $self->{statusbox}->add ($text, 909 $self->{statusbox}->add ($text,
903 group => $text, 910 group => $text,
904 fg => $fg, 911 fg => $fg,
… …
1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1167 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1168 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1162 . "map size $self->{mapw}×$self->{maph}\n" 1169 . "map size $self->{mapw}×$self->{maph}\n"
1163 ); 1170 );
1164 1171
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
1166} 1172}
1167 1173
1168sub logged_in { 1174sub logged_in {
1169 my ($self) = @_; 1175 my ($self) = @_;
1170 1176
… …
1190 1196
1191 $self->send_command ("output-sync $::CFG->{output_sync}"); 1197 $self->send_command ("output-sync $::CFG->{output_sync}");
1192 $self->send_command ("output-count $::CFG->{output_count}"); 1198 $self->send_command ("output-count $::CFG->{output_count}");
1193 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1199 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1194 $self->send_command ("pickup $::CFG->{pickup}"); 1200 $self->send_command ("pickup $::CFG->{pickup}");
1195}
1196
1197sub buildat {
1198 my ($self, $builditem, $x, $y) = @_;
1199
1200 if ($self->{cfplus_ext}) {
1201 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1202 }
1203} 1201}
1204 1202
1205sub lookat { 1203sub lookat {
1206 my ($self, $x, $y) = @_; 1204 my ($self, $x, $y) = @_;
1207 1205

Diff Legend

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