… | |
… | |
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; |
… | |
… | |
48 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
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 (ambient_music => sub { |
54 | my (%ev) = @_; |
54 | my ($songs) = @_; |
55 | |
55 | &::audio_music_set_ambient ($songs); |
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]); |
|
|
104 | } |
|
|
105 | }); |
56 | }); |
106 | |
57 | |
107 | $self->connect_ext (capabilities => sub { |
58 | $self->connect_ext (capabilities => sub { |
108 | my (%cap) = @_; |
59 | my (%cap) = @_; |
|
|
60 | |
|
|
61 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
62 | |
|
|
63 | $self->send_exti_msg (fx_want => { |
|
|
64 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
65 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
66 | }); |
109 | |
67 | |
110 | if (my $ts = $cap{tileset}) { |
68 | if (my $ts = $cap{tileset}) { |
111 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
69 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
112 | $self->{tileset} = $default; |
70 | $self->{tileset} = $default; |
113 | $self->{tilesize} = $default->[3]; |
71 | $self->{tilesize} = $default->[3]; |
… | |
… | |
121 | } |
79 | } |
122 | }); |
80 | }); |
123 | |
81 | |
124 | $self->{json_coder} |
82 | $self->{json_coder} |
125 | ->convert_blessed |
83 | ->convert_blessed |
126 | ->filter_json_single_key_object (__widget_ref__ => sub { |
84 | ->filter_json_single_key_object (__w_ => sub { |
127 | $self->{widget}{$_[0]} |
85 | $self->{widget}{$_[0]} |
128 | }); |
86 | }); |
129 | |
87 | |
130 | # widgetset new |
88 | # widgetset new |
131 | $self->connect_ext (ws_n => sub { |
89 | $self->connect_ext (ws_n => sub { |
132 | my ($arg) = @_; |
90 | my ($id) = @_; |
133 | |
91 | |
134 | $self->{widgetset}{$arg{id}} = { |
92 | $self->{widgetset}{$id} = { |
135 | w => {}, |
93 | w => {}, |
136 | }; |
94 | }; |
137 | }); |
95 | }); |
138 | |
96 | |
139 | # widgetset destroy |
97 | # widgetset destroy |
140 | $self->connect_ext (ws_d => sub { |
98 | $self->connect_ext (ws_d => sub { |
141 | my ($arg) = @_; |
99 | my ($id) = @_; |
142 | |
100 | |
143 | my $ws = delete $self->{widgetset}{$arg{id}} |
101 | my $ws = delete $self->{widgetset}{$id} |
144 | or return; |
102 | or return; |
145 | |
103 | |
146 | $_->destroy |
104 | $_->destroy |
147 | for values %{$ws->{w}}; |
105 | for values %{$ws->{w}}; |
148 | }); |
106 | }); |
149 | |
107 | |
150 | # widgetset destroy |
108 | # widgetset create |
151 | $self->connect_ext (ws_c => sub { |
109 | $self->connect_ext (ws_c => sub { |
152 | my ($arg) = @_; |
110 | my ($ws, $id, $class, $args) = @_; |
153 | |
|
|
154 | my $args = $arg->{args} || {}; |
|
|
155 | |
111 | |
156 | for my $ev (grep /^on_/, keys %$args) { |
112 | for my $ev (grep /^on_/, keys %$args) { |
157 | $args->{$ev} = sub { |
113 | $args->{$ev} = sub { |
158 | my $id = shift->{s_id}; |
114 | my $id = shift->{s_id}; |
159 | $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); |
115 | $self->send_exti_msg (w_e => $id, $ev, \@_); |
160 | |
116 | |
161 | 1 |
117 | 1 |
162 | }; |
118 | }; |
163 | } |
119 | } |
164 | |
120 | |
165 | if (my $widget = eval { |
121 | if (my $widget = eval { |
166 | local $SIG{__DIE__}; |
122 | local $SIG{__DIE__}; |
167 | "CFPlus::UI::$arg->{class}"->new ( |
123 | "CFPlus::UI::$class"->new ( |
168 | %$args, |
124 | %$args, |
169 | s_ws => $arg->{ws}, |
125 | s_ws => $ws, |
170 | s_id => $arg->{id}, |
126 | s_id => $id, |
171 | ) |
127 | ) |
172 | } |
128 | } |
173 | ) { |
129 | ) { |
174 | $self->{widget}{$arg->{id}} |
130 | $self->{widget}{$id} |
175 | = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} |
131 | = $self->{widgetset}{$ws}{w}{$id} |
176 | = $widget; |
132 | = $widget; |
177 | |
133 | |
178 | $widget->connect (on_destroy => sub { |
134 | $widget->connect (on_destroy => sub { |
179 | my ($widget) = @_; |
135 | my ($widget) = @_; |
180 | |
136 | |
181 | delete $self->{widget}{$widget->{s_id}}; |
137 | delete $self->{widget}{$widget->{s_id}}; |
182 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
138 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
183 | }); |
139 | }); |
184 | } else { |
140 | } else { |
185 | warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; |
141 | warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
186 | $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); |
142 | $self->send_exti_msg (w_e => $id, "destroy"); |
187 | } |
143 | } |
188 | }); |
144 | }); |
189 | |
145 | |
190 | # widget call |
146 | # widget call |
191 | $self->connect_ext (w_c => sub { |
147 | $self->connect_ext (w_c => sub { |
192 | my ($arg) = @_; |
148 | my ($id, $rid, $method, $args) = @_; |
193 | |
149 | |
194 | my $w = $self->{widget}{$arg->{id}} |
150 | my $w = $self->{widget}{$id} |
195 | or return; |
151 | or return; |
196 | my $m = $arg->{name}; |
|
|
197 | |
152 | |
198 | my $a = $arg->{args} || []; |
153 | $args ||= []; |
199 | |
154 | |
200 | if (exists $arg->{rid}) { |
155 | if ($rid) { |
201 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); |
156 | $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]); |
202 | } else { |
157 | } else { |
203 | $w->$m (@$a); |
158 | $w->$method (@$args); |
204 | } |
159 | } |
205 | }); |
160 | }); |
206 | |
161 | |
207 | # widget set |
162 | # widget set |
208 | $self->connect_ext (w_s => sub { |
163 | $self->connect_ext (w_s => sub { |
209 | my ($arg) = @_; |
164 | my ($id, $attr) = @_; |
210 | |
165 | |
211 | my $w = $self->{widget}{$arg->{id}} |
166 | my $w = $self->{widget}{$id} |
212 | or return; |
167 | or return; |
213 | |
|
|
214 | my $attr = $arg->{attr}; |
|
|
215 | |
168 | |
216 | for (my $i = 0; $i < $#$attr; $i += 2) { |
169 | for (my $i = 0; $i < $#$attr; $i += 2) { |
217 | my ($member, $value) = @$attr[$i, $i+1]; |
170 | my ($member, $value) = @$attr[$i, $i+1]; |
218 | if (defined $value) { |
171 | if (defined $value) { |
219 | $w->{$member} = $value; |
172 | $w->{$member} = $value; |
… | |
… | |
224 | } |
177 | } |
225 | }); |
178 | }); |
226 | |
179 | |
227 | # widget get |
180 | # widget get |
228 | $self->connect_ext (w_g => sub { |
181 | $self->connect_ext (w_g => sub { |
229 | my ($arg) = @_; |
182 | my ($id, $rid, $attr) = @_; |
230 | |
183 | |
231 | my $w = $self->{widget}{$arg->{id}} |
184 | my $w = $self->{widget}{$id} |
232 | or return; |
185 | or return; |
233 | |
186 | |
234 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]); |
187 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
|
|
188 | }); |
|
|
189 | |
|
|
190 | # message window |
|
|
191 | $self->connect_ext (channel_info => sub { |
|
|
192 | my ($info) = @_; |
|
|
193 | $self->{channels}->{$info->{id}} = $info; |
|
|
194 | $::MESSAGE_WINDOW->add_channel ($info); |
235 | }); |
195 | }); |
236 | |
196 | |
237 | # destroy widgets on logout |
197 | # destroy widgets on logout |
238 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
198 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
239 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
199 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
… | |
… | |
266 | } |
226 | } |
267 | |
227 | |
268 | sub logprint { |
228 | sub logprint { |
269 | my ($self, @a) = @_; |
229 | my ($self, @a) = @_; |
270 | |
230 | |
271 | $self->{log_fh} ||= do { |
231 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
272 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
273 | |
|
|
274 | open my $fh, ">>:utf8", $path |
|
|
275 | or die "Couldn't open logfile $path: $!"; |
|
|
276 | |
|
|
277 | $fh->autoflush (1); |
|
|
278 | |
|
|
279 | $fh; |
|
|
280 | }; |
|
|
281 | |
|
|
282 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
283 | |
|
|
284 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
285 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
286 | |
|
|
287 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
288 | } |
232 | } |
289 | |
233 | |
290 | sub _stat_numdiff { |
234 | sub _stat_numdiff { |
291 | my ($self, $name, $old, $new) = @_; |
235 | my ($self, $name, $old, $new) = @_; |
292 | |
236 | |
… | |
… | |
600 | do { |
544 | do { |
601 | $id = pop @{$self->{bg_fetch}} |
545 | $id = pop @{$self->{bg_fetch}} |
602 | or return; |
546 | or return; |
603 | } while $self->{texture}[$id]; |
547 | } while $self->{texture}[$id]; |
604 | |
548 | |
605 | CFPlus::DB::get tilecache => $id, sub { |
549 | CFPlus::DB::exists tilecache => $id, sub { |
606 | my ($data) = @_; |
550 | my ($exists) = @_; |
607 | |
551 | |
608 | return unless $self->{map}; # stop when destroyed |
552 | return unless $self->{map}; # stop when destroyed |
609 | |
553 | |
610 | $self->set_texture ($id => $data) |
554 | $self->have_tile ($id) |
611 | if defined $data; |
555 | if $exists; |
612 | |
556 | |
613 | $self->bg_fetch; |
557 | $self->bg_fetch; |
614 | }; |
558 | }; |
615 | } |
559 | } |
616 | |
560 | |
… | |
… | |
761 | } |
705 | } |
762 | |
706 | |
763 | sub face_find { |
707 | sub face_find { |
764 | my ($self, $facenum, $face, $cb) = @_; |
708 | my ($self, $facenum, $face, $cb) = @_; |
765 | |
709 | |
766 | my $hash = "$face->{chksum},$face->{name}"; |
710 | if ($face->{type} == 0) { # FT_FACE |
767 | |
|
|
768 | my $id = CFPlus::DB::get_tile_id_sync $hash; |
711 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
769 | |
712 | |
770 | $face->{id} = $id; |
713 | $face->{id} = $id; |
771 | $self->{faceid}[$facenum] = $id; |
714 | $self->{faceid}[$facenum] = $id; |
772 | |
715 | |
773 | $self->{map}->set_tileid ($facenum => $id); |
716 | $self->{map}->set_tileid ($facenum => $id); |
774 | |
717 | |
775 | CFPlus::DB::get tilecache => $id, $cb; |
718 | CFPlus::DB::get tilecache => $id, $cb; |
|
|
719 | |
|
|
720 | } elsif ($face->{type} & 1) { # with metadata |
|
|
721 | #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
|
|
722 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
|
|
723 | } |
776 | } |
724 | } |
777 | |
725 | |
778 | sub face_update { |
726 | sub face_update { |
779 | my ($self, $facenum, $face, $changed) = @_; |
727 | my ($self, $facenum, $face, $changed) = @_; |
780 | |
728 | |
|
|
729 | if ($face->{type} == 0) { # FT_FACE |
781 | CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } |
730 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
782 | if $changed; |
731 | if $changed; |
783 | |
732 | |
784 | $self->set_texture ($face->{id} => delete $face->{image}); |
733 | $self->have_tile ($face->{id}); |
|
|
734 | |
|
|
735 | } elsif ($face->{type} & 1) { # split metadata |
|
|
736 | my $cb = sub { }; |
|
|
737 | |
|
|
738 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
739 | $cb = sub { |
|
|
740 | $self->{music_meta}{$facenum} = $face; |
|
|
741 | |
|
|
742 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
743 | if $changed; |
|
|
744 | |
|
|
745 | &::audio_music_push ($facenum); |
|
|
746 | }; |
|
|
747 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
748 | $cb = sub { |
|
|
749 | $self->{sound_meta}{$facenum} = $face; |
|
|
750 | |
|
|
751 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
752 | if $changed; |
|
|
753 | |
|
|
754 | &::audio_sound_push ($facenum); |
|
|
755 | }; |
|
|
756 | } |
|
|
757 | |
|
|
758 | if ($changed) { # new data |
|
|
759 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
|
|
760 | |
|
|
761 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
762 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
|
|
763 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
|
|
764 | ::add_license ($face); |
|
|
765 | $cb->(); |
|
|
766 | }; |
|
|
767 | |
|
|
768 | } else { |
|
|
769 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
770 | ::add_license ($face); |
|
|
771 | $cb->(); |
|
|
772 | } |
|
|
773 | } |
785 | } |
774 | } |
786 | |
775 | |
787 | sub smooth_update { |
776 | sub smooth_update { |
788 | my ($self, $facenum, $face) = @_; |
777 | my ($self, $facenum, $face) = @_; |
789 | |
778 | |
790 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
779 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
791 | } |
780 | } |
792 | |
781 | |
793 | sub set_texture { |
782 | sub have_tile { |
794 | my ($self, $id, $data) = @_; |
783 | my ($self, $tile) = @_; |
795 | |
784 | |
796 | return unless $self->{map}; |
785 | return unless $self->{map}; |
797 | |
786 | |
798 | $self->{texture}[$id] = my $tex = |
787 | $self->{texture}[$tile] ||= my $tex = |
799 | new_from_image CFPlus::Texture |
788 | new CFPlus::Texture |
800 | $data, minify => 1, mipmap => 1; |
789 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
801 | |
790 | |
802 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
803 | $self->{map_widget}->update; |
|
|
804 | |
|
|
805 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
791 | $_->() for @{(delete $self->{face_cb}{$tile}) || []}; |
806 | } |
792 | } |
807 | |
793 | |
808 | sub connect_face_update { |
794 | sub connect_face_update { |
809 | my ($self, $id, $cb) = @_; |
795 | my ($self, $id, $cb) = @_; |
810 | |
796 | |
… | |
… | |
816 | @{$self->{face_cb}{$id}}; |
802 | @{$self->{face_cb}{$id}}; |
817 | } |
803 | } |
818 | } |
804 | } |
819 | |
805 | |
820 | sub sound_play { |
806 | sub sound_play { |
821 | my ($self, $x, $y, $soundnum, $type) = @_; |
807 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
822 | |
808 | |
823 | $self->{sound_play}->($x, $y, $soundnum, $type); |
809 | &::audio_sound_play ($face, $dx, $dy, $vol) |
|
|
810 | unless $type & 1; # odd types are silent for future expansion |
824 | } |
811 | } |
825 | |
812 | |
826 | my $LAST_QUERY; # server is stupid, stupid, stupid |
813 | my $LAST_QUERY; # server is stupid, stupid, stupid |
827 | |
814 | |
828 | sub query { |
815 | sub query { |
… | |
… | |
893 | $self->{$type} = $text; |
880 | $self->{$type} = $text; |
894 | } else { |
881 | } else { |
895 | $self->logprint ("msg: ", $text); |
882 | $self->logprint ("msg: ", $text); |
896 | return if $color < 0; # negative color == ignore if not understood |
883 | return if $color < 0; # negative color == ignore if not understood |
897 | |
884 | |
898 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
885 | my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; |
899 | |
886 | |
900 | ## try to create single paragraphs of multiple lines sent by the server |
887 | ## try to create single paragraphs of multiple lines sent by the server |
901 | # no longer neecssary with TRT servers |
888 | # no longer neecssary with TRT servers |
902 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
889 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
903 | |
890 | |
904 | ::message ({ fg => $fg, markup => $_ }) |
891 | ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) |
905 | for split /\n/, $text; |
892 | for split /\n/, $text; |
906 | |
893 | |
907 | $self->{statusbox}->add ($text, |
894 | $self->{statusbox}->add ($text, |
908 | group => $text, |
895 | group => $text, |
909 | fg => $fg, |
896 | fg => $fg, |
… | |
… | |
964 | my ($self) = @_; |
951 | my ($self) = @_; |
965 | |
952 | |
966 | $self->{map_widget}->clr_commands; |
953 | $self->{map_widget}->clr_commands; |
967 | |
954 | |
968 | ::stop_game (); |
955 | ::stop_game (); |
969 | } |
|
|
970 | |
|
|
971 | sub image_info { |
|
|
972 | my ($self, $numfaces) = @_; |
|
|
973 | |
|
|
974 | $self->{num_faces} = $numfaces; |
|
|
975 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
976 | $self->face_prefetch; |
|
|
977 | } |
|
|
978 | |
|
|
979 | sub face_prefetch { |
|
|
980 | my ($self) = @_; |
|
|
981 | |
|
|
982 | return unless $::CFG->{face_prefetch}; |
|
|
983 | |
|
|
984 | if ($self->{num_faces}) { |
|
|
985 | return if @{ $self->{send_queue} || [] }; |
|
|
986 | my $todo = @{ $self->{face_prefetch} } |
|
|
987 | or return; |
|
|
988 | |
|
|
989 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
|
|
990 | |
|
|
991 | $self->send ("requestinfo image_sums $face $face"); |
|
|
992 | |
|
|
993 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
|
|
994 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
995 | } elsif (!exists $self->{num_faces}) { |
|
|
996 | $self->send ("requestinfo image_info"); |
|
|
997 | |
|
|
998 | $self->{num_faces} = 0; |
|
|
999 | |
|
|
1000 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
|
|
1001 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
1002 | } |
|
|
1003 | } |
956 | } |
1004 | |
957 | |
1005 | sub update_floorbox { |
958 | sub update_floorbox { |
1006 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
959 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1007 | return unless $::CONN; |
960 | return unless $::CONN; |
… | |
… | |
1165 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1118 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1166 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1119 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1167 | . "map size $self->{mapw}×$self->{maph}\n" |
1120 | . "map size $self->{mapw}×$self->{maph}\n" |
1168 | ); |
1121 | ); |
1169 | |
1122 | |
1170 | ::setup_build_button ($self->{editor_support}->{builder_ui}); |
|
|
1171 | } |
1123 | } |
1172 | |
1124 | |
1173 | sub logged_in { |
1125 | sub logged_in { |
1174 | my ($self) = @_; |
1126 | my ($self) = @_; |
1175 | |
1127 | |
… | |
… | |
1195 | |
1147 | |
1196 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
1148 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
1197 | $self->send_command ("output-count $::CFG->{output_count}"); |
1149 | $self->send_command ("output-count $::CFG->{output_count}"); |
1198 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1150 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1199 | $self->send_command ("pickup $::CFG->{pickup}"); |
1151 | $self->send_command ("pickup $::CFG->{pickup}"); |
1200 | } |
|
|
1201 | |
|
|
1202 | sub buildat { |
|
|
1203 | my ($self, $builditem, $x, $y) = @_; |
|
|
1204 | |
|
|
1205 | if ($self->{cfplus_ext}) { |
|
|
1206 | $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); |
|
|
1207 | } |
|
|
1208 | } |
1152 | } |
1209 | |
1153 | |
1210 | sub lookat { |
1154 | sub lookat { |
1211 | my ($self, $x, $y) = @_; |
1155 | my ($self, $x, $y) = @_; |
1212 | |
1156 | |