… | |
… | |
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,#d# |
26 | xwidget1 => 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 (ambient_music => sub { |
|
|
54 | my ($songs) = @_; |
|
|
55 | &::audio_music_set_ambient ($songs); |
|
|
56 | }); |
|
|
57 | |
|
|
58 | $self->connect_ext (capabilities => sub { |
|
|
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 | }); |
|
|
67 | |
|
|
68 | if (my $ts = $cap{tileset}) { |
|
|
69 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
70 | $self->{tileset} = $default; |
|
|
71 | $self->{tilesize} = $default->[3]; |
|
|
72 | $self->setup_req (tileset => $default->[0]); |
|
|
73 | |
|
|
74 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
75 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
76 | |
|
|
77 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
78 | } |
|
|
79 | } |
|
|
80 | }); |
|
|
81 | |
|
|
82 | $self->{json_coder} |
53 | $self->{json_coder} |
83 | ->convert_blessed |
54 | ->convert_blessed |
84 | ->filter_json_single_key_object (__w_ => sub { |
55 | ->filter_json_single_key_object (__w_ => sub { |
85 | $self->{widget}{$_[0]} |
56 | $self->{widget}{$_[0]} |
86 | }); |
57 | }); |
87 | |
58 | |
88 | # widgetset new |
|
|
89 | $self->connect_ext (ws_n => sub { |
|
|
90 | my ($id) = @_; |
|
|
91 | |
|
|
92 | $self->{widgetset}{$id} = { |
|
|
93 | w => {}, |
|
|
94 | }; |
|
|
95 | }); |
|
|
96 | |
|
|
97 | # widgetset destroy |
|
|
98 | $self->connect_ext (ws_d => sub { |
|
|
99 | my ($id) = @_; |
|
|
100 | |
|
|
101 | my $ws = delete $self->{widgetset}{$id} |
|
|
102 | or return; |
|
|
103 | |
|
|
104 | $_->destroy |
|
|
105 | for values %{$ws->{w}}; |
|
|
106 | }); |
|
|
107 | |
|
|
108 | # widgetset create |
|
|
109 | $self->connect_ext (ws_c => sub { |
|
|
110 | my ($ws, $id, $class, $args) = @_; |
|
|
111 | |
|
|
112 | for my $ev (grep /^on_/, keys %$args) { |
|
|
113 | $args->{$ev} = sub { |
|
|
114 | my $id = shift->{s_id}; |
|
|
115 | $self->send_exti_msg (w_e => $id, $ev, \@_); |
|
|
116 | |
|
|
117 | 1 |
|
|
118 | }; |
|
|
119 | } |
|
|
120 | |
|
|
121 | if (my $widget = eval { |
|
|
122 | local $SIG{__DIE__}; |
|
|
123 | "CFPlus::UI::$class"->new ( |
|
|
124 | %$args, |
|
|
125 | s_ws => $ws, |
|
|
126 | s_id => $id, |
|
|
127 | ) |
|
|
128 | } |
|
|
129 | ) { |
|
|
130 | $self->{widget}{$id} |
|
|
131 | = $self->{widgetset}{$ws}{w}{$id} |
|
|
132 | = $widget; |
|
|
133 | |
|
|
134 | $widget->connect (on_destroy => sub { |
|
|
135 | my ($widget) = @_; |
|
|
136 | |
|
|
137 | delete $self->{widget}{$widget->{s_id}}; |
|
|
138 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
139 | }); |
|
|
140 | } else { |
|
|
141 | warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
|
|
142 | $self->send_exti_msg (w_e => $id, "destroy"); |
|
|
143 | } |
|
|
144 | }); |
|
|
145 | |
|
|
146 | # widget call |
|
|
147 | $self->connect_ext (w_c => sub { |
|
|
148 | my ($id, $rid, $method, $args) = @_; |
|
|
149 | |
|
|
150 | my $w = $self->{widget}{$id} |
|
|
151 | or return; |
|
|
152 | |
|
|
153 | $args ||= []; |
|
|
154 | |
|
|
155 | if ($rid) { |
|
|
156 | $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]); |
|
|
157 | } else { |
|
|
158 | $w->$method (@$args); |
|
|
159 | } |
|
|
160 | }); |
|
|
161 | |
|
|
162 | # widget set |
|
|
163 | $self->connect_ext (w_s => sub { |
|
|
164 | my ($id, $attr) = @_; |
|
|
165 | |
|
|
166 | my $w = $self->{widget}{$id} |
|
|
167 | or return; |
|
|
168 | |
|
|
169 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
170 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
171 | if (defined $value) { |
|
|
172 | $w->{$member} = $value; |
|
|
173 | } else { |
|
|
174 | delete $w->{$member}; |
|
|
175 | } |
|
|
176 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
177 | } |
|
|
178 | }); |
|
|
179 | |
|
|
180 | # widget get |
|
|
181 | $self->connect_ext (w_g => sub { |
|
|
182 | my ($id, $rid, $attr) = @_; |
|
|
183 | |
|
|
184 | my $w = $self->{widget}{$id} |
|
|
185 | or return; |
|
|
186 | |
|
|
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); |
|
|
195 | }); |
|
|
196 | |
|
|
197 | # destroy widgets on logout |
59 | # destroy widgets on logout |
198 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
60 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
199 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
61 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
200 | $_->destroy |
62 | $_->destroy |
201 | for values %{delete $ws->{w} || {}}; |
63 | for values %{delete $ws->{w} || {}}; |
… | |
… | |
223 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
85 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
224 | |
86 | |
225 | $self |
87 | $self |
226 | } |
88 | } |
227 | |
89 | |
|
|
90 | sub update_fx_want { |
|
|
91 | my ($self) = @_; |
|
|
92 | |
|
|
93 | $self->send_exti_msg (fx_want => { |
|
|
94 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
95 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
96 | 6 => 1, # FT_RSRC |
|
|
97 | }); |
|
|
98 | } |
|
|
99 | |
|
|
100 | sub ext_capabilities { |
|
|
101 | my ($self, %cap) = @_; |
|
|
102 | |
|
|
103 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
104 | $self->update_fx_want; |
|
|
105 | |
|
|
106 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
107 | my ($exp_table) = @_; |
|
|
108 | |
|
|
109 | $self->register_face_handler ($exp_table, sub { |
|
|
110 | my ($face) = @_; |
|
|
111 | |
|
|
112 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
113 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
114 | }); |
|
|
115 | |
|
|
116 | () |
|
|
117 | }); |
|
|
118 | |
|
|
119 | if (my $ts = $cap{tileset}) { |
|
|
120 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
121 | $self->{tileset} = $default; |
|
|
122 | $self->{tilesize} = $default->[3]; |
|
|
123 | $self->setup_req (tileset => $default->[0]); |
|
|
124 | |
|
|
125 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
126 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
127 | |
|
|
128 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
129 | } |
|
|
130 | } |
|
|
131 | } |
|
|
132 | |
|
|
133 | sub ext_ambient_music { |
|
|
134 | my ($self, $songs) = @_; |
|
|
135 | &::audio_music_set_ambient ($songs); |
|
|
136 | } |
|
|
137 | |
|
|
138 | ############################################################################# |
|
|
139 | |
|
|
140 | sub widget_associate { |
|
|
141 | my ($self, $ws, $id, $widget) = @_; |
|
|
142 | |
|
|
143 | if ($widget) { |
|
|
144 | $widget->{s_id} = $id; |
|
|
145 | $self->{widget}{$id} = $widget; |
|
|
146 | |
|
|
147 | if ($ws) { |
|
|
148 | $widget->{s_ws} = $ws; |
|
|
149 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
150 | } |
|
|
151 | |
|
|
152 | $widget->connect (on_destroy => sub { |
|
|
153 | my ($widget) = @_; |
|
|
154 | |
|
|
155 | delete $self->{widget}{$widget->{s_id}}; |
|
|
156 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
157 | if exists $widget->{s_ws}; |
|
|
158 | }); |
|
|
159 | |
|
|
160 | 1 |
|
|
161 | } else { |
|
|
162 | $self->send_exti_msg (w_e => $id, undef); |
|
|
163 | |
|
|
164 | 0 |
|
|
165 | } |
|
|
166 | } |
|
|
167 | |
|
|
168 | # widgetset new |
|
|
169 | sub ext_ws_n { |
|
|
170 | my ($self, $id) = @_; |
|
|
171 | |
|
|
172 | $self->{widgetset}{$id} = { |
|
|
173 | w => {}, |
|
|
174 | }; |
|
|
175 | } |
|
|
176 | |
|
|
177 | # widgetset destroy |
|
|
178 | sub ext_ws_d { |
|
|
179 | my ($self, $id) = @_; |
|
|
180 | |
|
|
181 | my $ws = delete $self->{widgetset}{$id} |
|
|
182 | or return; |
|
|
183 | |
|
|
184 | $_->destroy |
|
|
185 | for values %{$ws->{w}}; |
|
|
186 | } |
|
|
187 | |
|
|
188 | # widgetset create |
|
|
189 | sub ext_ws_c { |
|
|
190 | my ($self, $ws, $id, $class, $args) = @_; |
|
|
191 | |
|
|
192 | for my $ev (grep /^on_/, keys %$args) { |
|
|
193 | my $rid = $args->{$ev}; |
|
|
194 | $args->{$ev} = sub { |
|
|
195 | my $id = shift->{s_id}; |
|
|
196 | $self->send_exti_msg (w_e => $id, $rid, @_); |
|
|
197 | |
|
|
198 | 1 |
|
|
199 | }; |
|
|
200 | } |
|
|
201 | |
|
|
202 | $self->widget_associate ( |
|
|
203 | $ws, $id => scalar eval { |
|
|
204 | local $SIG{__DIE__}; |
|
|
205 | "CFPlus::UI::$class"->new (%$args) |
|
|
206 | } |
|
|
207 | ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
|
|
208 | } |
|
|
209 | |
|
|
210 | # widgetset associate |
|
|
211 | sub ext_ws_a { |
|
|
212 | my ($self, %ass) = @_; |
|
|
213 | |
|
|
214 | # everything that has a name, wether conceivably useful or not |
|
|
215 | my %wkw = ( |
|
|
216 | root => $CFPlus::UI::ROOT, |
|
|
217 | tooltip => $CFPlus::UI::TOOLTIP, |
|
|
218 | |
|
|
219 | mapwidget => $::MAPWIDGET, |
|
|
220 | buttonbar => $::BUTTONBAR, |
|
|
221 | metaserver => $::METASERVER, |
|
|
222 | buttonbar => $::BUTTONBAR, |
|
|
223 | login_button => $::LOGIN_BUTTON, |
|
|
224 | quit_dialog => $::QUIT_DIALOG, |
|
|
225 | host_entry => $::HOST_ENTRY, |
|
|
226 | metaserver => $::METASERVER, |
|
|
227 | server_info => $::SERVER_INFO, |
|
|
228 | |
|
|
229 | setup_dialog => $::SETUP_DIALOG, |
|
|
230 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
231 | setup_server => $::SETUP_SERVER, |
|
|
232 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
233 | |
|
|
234 | pl_notebook => $::PL_NOTEBOOK, |
|
|
235 | pl_window => $::PL_WINDOW, |
|
|
236 | inventory_page => $::INVENTORY_PAGE, |
|
|
237 | stats_page => $::STATS_PAGE, |
|
|
238 | skill_page => $::SKILL_PAGE, |
|
|
239 | spell_page => $::SPELL_PAGE, |
|
|
240 | spell_list => $::SPELL_LIST, |
|
|
241 | |
|
|
242 | floorbox => $::FLOORBOX, |
|
|
243 | help_window => $::HELP_WINDOW, |
|
|
244 | message_window => $::MESSAGE_WINDOW, |
|
|
245 | statusbox => $::SDTATUSBOX, |
|
|
246 | |
|
|
247 | inv => $::INV, |
|
|
248 | invr => $::INVR, |
|
|
249 | invr_hb => $::INVR_HB, |
|
|
250 | ); |
|
|
251 | |
|
|
252 | while (my ($id, $name) = each %ass) { |
|
|
253 | $self->widget_associate (undef, $id => $wkw{$name}) |
|
|
254 | or warn "server failed to associate non-existent well-known widget $name\n"; |
|
|
255 | } |
|
|
256 | } |
|
|
257 | |
|
|
258 | # widget call |
|
|
259 | sub ext_w_c { |
|
|
260 | my ($self, $id, $rid, $method, @args) = @_; |
|
|
261 | |
|
|
262 | my $w = $self->{widget}{$id} |
|
|
263 | or return; |
|
|
264 | |
|
|
265 | if ($rid) { |
|
|
266 | $self->send_exti_msg (w_r => $rid, $w->$method (@args)); |
|
|
267 | } else { |
|
|
268 | $w->$method (@args); |
|
|
269 | } |
|
|
270 | } |
|
|
271 | |
|
|
272 | # widget set |
|
|
273 | sub ext_w_s { |
|
|
274 | my ($self, $id, $attr) = @_; |
|
|
275 | |
|
|
276 | my $w = $self->{widget}{$id} |
|
|
277 | or return; |
|
|
278 | |
|
|
279 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
280 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
281 | if (defined $value) { |
|
|
282 | $w->{$member} = $value; |
|
|
283 | } else { |
|
|
284 | delete $w->{$member}; |
|
|
285 | } |
|
|
286 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
287 | } |
|
|
288 | } |
|
|
289 | |
|
|
290 | # widget get |
|
|
291 | sub ext_w_g { |
|
|
292 | my ($self, $id, $rid, $attr) = @_; |
|
|
293 | |
|
|
294 | my $w = $self->{widget}{$id} |
|
|
295 | or return; |
|
|
296 | |
|
|
297 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
|
|
298 | } |
|
|
299 | |
|
|
300 | # message window |
|
|
301 | sub ext_channel_info { |
|
|
302 | my ($self, $info) = @_; |
|
|
303 | $self->{channels}->{$info->{id}} = $info; |
|
|
304 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
305 | } |
|
|
306 | |
|
|
307 | ############################################################################# |
|
|
308 | |
228 | sub logprint { |
309 | sub logprint { |
229 | my ($self, @a) = @_; |
310 | my ($self, @a) = @_; |
230 | |
311 | |
231 | $self->{log_fh} ||= do { |
312 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
232 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
233 | |
|
|
234 | open my $fh, ">>:utf8", $path |
|
|
235 | or die "Couldn't open logfile $path: $!"; |
|
|
236 | |
|
|
237 | $fh->autoflush (1); |
|
|
238 | |
|
|
239 | $fh; |
|
|
240 | }; |
|
|
241 | |
|
|
242 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
243 | |
|
|
244 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
245 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
246 | |
|
|
247 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
248 | } |
313 | } |
249 | |
314 | |
250 | sub _stat_numdiff { |
315 | sub _stat_numdiff { |
251 | my ($self, $name, $old, $new) = @_; |
316 | my ($self, $name, $old, $new) = @_; |
252 | |
317 | |
… | |
… | |
385 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
450 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
386 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
451 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
387 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
452 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
388 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
453 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
389 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
454 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
|
|
455 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
390 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
456 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
391 | my $title = $stats->{+CS_STAT_TITLE}; |
457 | my $title = $stats->{+CS_STAT_TITLE}; |
392 | $title =~ s/^Player: //; |
458 | $title =~ s/^Player: //; |
393 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
459 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
394 | |
460 | |
… | |
… | |
412 | for keys %RES_TBL; |
478 | for keys %RES_TBL; |
413 | |
479 | |
414 | my $sktbl = $::STATWIDS->{skill_tbl}; |
480 | my $sktbl = $::STATWIDS->{skill_tbl}; |
415 | my @skills = keys %{ $self->{skill_info} }; |
481 | my @skills = keys %{ $self->{skill_info} }; |
416 | |
482 | |
417 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
483 | my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
484 | map [$_, $self->{skill_info}{$_}], |
|
|
485 | grep exists $stats->{$_}, |
|
|
486 | @skills; |
|
|
487 | |
|
|
488 | if ($self->{stat_order} ne join ",", map $_->[0], @order) { |
|
|
489 | $self->{stat_order} = join ",", map $_->[0], @order; |
|
|
490 | |
418 | $sktbl->clear; |
491 | $sktbl->clear; |
419 | |
492 | |
420 | my @add; |
493 | my $sw = $self->{skillwid}{""} ||= [ |
421 | |
|
|
422 | push @add, |
|
|
423 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
494 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
424 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
495 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
496 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
425 | 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
497 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
426 | 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
498 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
427 | 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
499 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
500 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
428 | 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
501 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
429 | ; |
502 | ]; |
|
|
503 | |
|
|
504 | my @add = @$sw; |
430 | |
505 | |
431 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
506 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
432 | |
507 | |
433 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
508 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
434 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
509 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
435 | |
510 | |
436 | my ($x, $y) = (0, 1); |
511 | my ($x, $y) = (0, 1); |
437 | for ( |
512 | for (@order) { |
438 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
439 | map [$_, $self->{skill_info}{$_}], |
|
|
440 | grep exists $stats->{$_}, |
|
|
441 | @skills |
|
|
442 | ) { |
|
|
443 | my ($idx, $name) = @$_; |
513 | my ($idx, $name) = @$_; |
444 | |
514 | |
445 | my $spell_cb = sub { |
515 | my $spell_cb = sub { |
446 | my ($widget, $ev) = @_; |
516 | my ($widget, $ev) = @_; |
447 | |
517 | |
… | |
… | |
462 | } |
532 | } |
463 | |
533 | |
464 | 1 |
534 | 1 |
465 | }; |
535 | }; |
466 | |
536 | |
|
|
537 | my $sw = $self->{skillwid}{$idx} ||= [ |
|
|
538 | # exp |
|
|
539 | (new CFPlus::UI::Label |
|
|
540 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
|
|
541 | |
|
|
542 | # level |
|
|
543 | (new CFPlus::UI::Label |
|
|
544 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
|
|
545 | |
|
|
546 | # progress |
|
|
547 | (new CFPlus::UI::ExperienceProgress), |
|
|
548 | |
|
|
549 | # label |
|
|
550 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
551 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
552 | ]; |
|
|
553 | |
467 | push @add, |
554 | push @add, |
468 | $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
555 | $x * 4 + 0, $y, $sw->[0], |
469 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
556 | $x * 4 + 1, $y, $sw->[1], |
470 | $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
557 | $x * 4 + 2, $y, $sw->[2], |
471 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
558 | $x * 4 + 3, $y, $sw->[3], |
472 | $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
473 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
474 | ; |
559 | ; |
475 | |
560 | |
476 | $x++ and ($x, $y) = (0, $y + 1); |
561 | $x++ and ($x, $y) = (0, $y + 1); |
477 | } |
562 | } |
478 | |
563 | |
479 | $sktbl->add_at (@add); |
564 | $sktbl->add_at (@add); |
480 | } |
565 | } |
481 | |
566 | |
482 | for (grep exists $stats->{$_}, @skills) { |
567 | for (@order) { |
483 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
568 | my ($idx, $name) = @$_; |
484 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
569 | my $val = $stats->{$idx}; |
|
|
570 | |
|
|
571 | next if $prev->{$idx}[1] == $val->[1]; |
|
|
572 | |
|
|
573 | my $sw = $self->{skillwid}{$idx}; |
|
|
574 | $sw->[0]->set_text (::formsep ($val->[1])); |
|
|
575 | $sw->[1]->set_text ($val->[0] * 1); |
|
|
576 | $sw->[2]->set_value (@$val); |
|
|
577 | |
|
|
578 | #$::GAUGES->{sklprg}->set_label ($name); |
|
|
579 | $::GAUGES->{sklprg}->set_value (@$val); |
485 | } |
580 | } |
486 | } |
581 | } |
487 | |
582 | |
488 | sub macro_send { |
583 | sub macro_send { |
489 | my ($self, $macro) = @_; |
584 | my ($self, $macro) = @_; |
… | |
… | |
517 | } |
612 | } |
518 | |
613 | |
519 | sub feed_map1a { |
614 | sub feed_map1a { |
520 | my ($self, $data) = @_; |
615 | my ($self, $data) = @_; |
521 | |
616 | |
522 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
617 | my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
|
|
618 | my $delay; |
|
|
619 | |
|
|
620 | for my $tile (@$missing) { |
|
|
621 | next if $self->{delay}{$tile}; |
|
|
622 | |
|
|
623 | $delay = 1; |
|
|
624 | |
|
|
625 | if (my $tex = $::CONN->{texture}[$tile]) { |
|
|
626 | $tex->upload; |
|
|
627 | } else { |
|
|
628 | $self->{delay}{$tile} = 1; |
|
|
629 | |
|
|
630 | # we assume the face is in-flight and will eventually come |
|
|
631 | push @{$self->{tile_cb}{$tile}}, sub { |
|
|
632 | delete $self->{delay}{$tile}; |
|
|
633 | $_[0]->upload; |
|
|
634 | }; |
|
|
635 | } |
|
|
636 | } |
|
|
637 | |
|
|
638 | if ($delay) { |
|
|
639 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
|
|
640 | Event->timer (after => 0.03, cb => sub { |
|
|
641 | $_[0]->w->cancel; |
|
|
642 | $self->{map_widget}->update |
|
|
643 | if $self->{map_widget}; |
|
|
644 | }); |
|
|
645 | } else { |
523 | $self->{map_widget}->update; |
646 | $self->{map_widget}->update; |
|
|
647 | } |
524 | } |
648 | } |
525 | |
649 | |
526 | sub magicmap { |
650 | sub magicmap { |
527 | my ($self, $w, $h, $x, $y, $data) = @_; |
651 | my ($self, $w, $h, $x, $y, $data) = @_; |
528 | |
652 | |
… | |
… | |
535 | my $map_info = delete $self->{map_info} |
659 | my $map_info = delete $self->{map_info} |
536 | or return; |
660 | or return; |
537 | |
661 | |
538 | my ($hash, $x, $y, $w, $h) = @$map_info; |
662 | my ($hash, $x, $y, $w, $h) = @$map_info; |
539 | |
663 | |
540 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
664 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
|
|
665 | $self->{map_cache_new}{$hash} = \$data; |
541 | CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; |
666 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
542 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
|
|
543 | } |
667 | } |
544 | |
668 | |
545 | sub map_clear { |
669 | sub map_clear { |
546 | my ($self) = @_; |
670 | my ($self) = @_; |
547 | |
671 | |
… | |
… | |
553 | } |
677 | } |
554 | |
678 | |
555 | sub bg_fetch { |
679 | sub bg_fetch { |
556 | my ($self) = @_; |
680 | my ($self) = @_; |
557 | |
681 | |
558 | my $id; |
682 | my $tile; |
559 | |
683 | |
560 | do { |
684 | do { |
561 | $id = pop @{$self->{bg_fetch}} |
685 | $tile = pop @{$self->{bg_fetch}} |
562 | or return; |
686 | or return; |
563 | } while $self->{texture}[$id]; |
687 | } while $self->{texture}[$tile]; |
564 | |
688 | |
565 | CFPlus::DB::get tilecache => $id, sub { |
689 | CFPlus::DB::get tilecache => $tile, sub { |
566 | my ($data) = @_; |
690 | my ($data) = @_; |
567 | |
691 | |
568 | return unless $self->{map}; # stop when destroyed |
692 | return unless $self->{map}; # stop when destroyed |
569 | |
693 | |
570 | $self->set_texture ($id => $data) |
|
|
571 | if defined $data; |
694 | if (defined $data) { |
|
|
695 | $self->have_tile ($tile, $data); |
|
|
696 | $self->{texture}[$tile]->upload; |
|
|
697 | } |
572 | |
698 | |
573 | $self->bg_fetch; |
699 | $self->bg_fetch; |
574 | }; |
700 | }; |
575 | } |
701 | } |
576 | |
702 | |
577 | sub load_map($$$) { |
703 | sub load_map($$$) { |
578 | my ($self, $hash, $x, $y) = @_; |
704 | my ($self, $hash, $x, $y) = @_; |
579 | |
705 | |
580 | my $gen = $self->{map_change_gen}; |
706 | my $gen = $self->{map_change_gen}; |
581 | |
707 | |
582 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
708 | my $cb = sub { |
583 | return unless $gen == $self->{map_change_gen}; |
709 | return unless $gen == $self->{map_change_gen}; |
584 | |
710 | |
585 | my ($data) = @_; |
711 | my ($data) = @_; |
586 | |
712 | |
587 | if (defined $data) { |
713 | if (defined $data) { |
|
|
714 | $self->{map_cache_new}{$hash} = \$data; |
|
|
715 | |
588 | $data = Compress::LZF::decompress $data; |
716 | my $data = Compress::LZF::decompress $data; |
589 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
|
|
590 | |
717 | |
591 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
718 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
592 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
719 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
593 | $self->bg_fetch unless $inprogress; |
720 | $self->bg_fetch unless $inprogress; |
594 | } |
721 | } |
595 | }; |
722 | }; |
|
|
723 | |
|
|
724 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
|
|
725 | $cb->($$rdata); |
|
|
726 | } else { |
|
|
727 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
|
|
728 | } |
596 | } |
729 | } |
597 | |
730 | |
598 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
731 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
599 | # (server resource,s latency, bandwidth), so this hack is warranted. |
732 | # (server resource,s latency, bandwidth), so this hack is warranted. |
600 | # the right fix is to make real tiled maps with an overview file |
733 | # the right fix is to make real tiled maps with an overview file |
… | |
… | |
693 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
826 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
694 | |
827 | |
695 | $self->flush_map; |
828 | $self->flush_map; |
696 | |
829 | |
697 | ++$self->{map_change_gen}; |
830 | ++$self->{map_change_gen}; |
|
|
831 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
698 | |
832 | |
699 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
833 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
700 | |
834 | |
701 | my $mapmapw = $self->{mapmap}->{w}; |
835 | my $mapmapw = $self->{mapmap}->{w}; |
702 | my $mapmaph = $self->{mapmap}->{h}; |
836 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
724 | my ($self, $facenum, $face, $cb) = @_; |
858 | my ($self, $facenum, $face, $cb) = @_; |
725 | |
859 | |
726 | if ($face->{type} == 0) { # FT_FACE |
860 | if ($face->{type} == 0) { # FT_FACE |
727 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
861 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
728 | |
862 | |
729 | $face->{id} = $id; |
863 | $face->{id} = $id; |
730 | $self->{faceid}[$facenum] = $id; |
|
|
731 | |
|
|
732 | $self->{map}->set_tileid ($facenum => $id); |
864 | $self->{map}->set_tileid ($facenum => $id); |
733 | |
865 | |
734 | CFPlus::DB::get tilecache => $id, $cb; |
866 | CFPlus::DB::get tilecache => $id, $cb; |
735 | |
867 | |
736 | } elsif ($face->{type} & 1) { # with metadata |
868 | } elsif ($face->{type} & 1) { # with metadata |
737 | #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
|
|
738 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
869 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
|
|
870 | |
|
|
871 | } else { # no metadata |
|
|
872 | CFPlus::DB::get res_data => $face->{name}, $cb; |
739 | } |
873 | } |
740 | } |
874 | } |
741 | |
875 | |
742 | sub face_update { |
876 | sub face_update { |
743 | my ($self, $facenum, $face, $changed) = @_; |
877 | my ($self, $facenum, $face, $changed) = @_; |
744 | |
878 | |
745 | if ($face->{type} == 0) { # FT_FACE |
879 | if ($face->{type} == 0) { |
|
|
880 | # image, FT_FACE |
746 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
881 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
747 | if $changed; |
882 | if $changed; |
748 | |
883 | |
749 | $self->set_texture ($face->{id} => delete $face->{data}); |
884 | $self->have_tile ($face->{id}, delete $face->{data}); |
750 | |
885 | |
751 | } elsif ($face->{type} & 1) { # split metadata |
886 | } elsif ($face->{type} & 1) { |
752 | my $cb = sub { }; |
887 | # split metadata case, FT_MUSIC, FT_SOUND |
|
|
888 | if ($changed) { # new data |
|
|
889 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
|
|
890 | $face->{data} = $meta; |
|
|
891 | |
|
|
892 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
893 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
|
|
894 | } |
|
|
895 | |
|
|
896 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
|
|
897 | |
|
|
898 | ::add_license ($face); |
753 | |
899 | |
754 | if ($face->{type} == 3) { # FT_MUSIC |
900 | if ($face->{type} == 3) { # FT_MUSIC |
755 | $cb = sub { |
|
|
756 | $self->{music_meta}{$facenum} = $face; |
|
|
757 | |
|
|
758 | ::message ({ markup => "downloaded song #$facenum" }) |
901 | ::message ({ markup => "downloaded song #$facenum" }) |
759 | if $changed; |
902 | if $changed; |
760 | |
903 | |
761 | &::audio_music_push ($facenum); |
904 | &::audio_music_push ($facenum); |
762 | }; |
|
|
763 | } elsif ($face->{type} == 5) { # FT_SOUND |
905 | } elsif ($face->{type} == 5) { # FT_SOUND |
764 | $cb = sub { |
|
|
765 | $self->{sound_meta}{$facenum} = $face; |
|
|
766 | |
|
|
767 | ::message ({ markup => "downloaded sound #$facenum" }) |
906 | ::message ({ markup => "downloaded sound #$facenum" }) |
768 | if $changed; |
907 | if $changed; |
769 | |
908 | |
770 | &::audio_sound_push ($facenum); |
909 | &::audio_sound_push ($facenum); |
771 | }; |
910 | } |
772 | } |
|
|
773 | |
911 | |
774 | if ($changed) { # new data |
912 | } else { |
775 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
913 | # flat resource case, FT_RSRC |
776 | |
|
|
777 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
914 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
778 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
915 | if $changed; |
779 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
916 | } |
780 | ::add_license ($face); |
|
|
781 | $cb->(); |
|
|
782 | }; |
|
|
783 | |
917 | |
784 | } else { |
918 | if (my $cbs = $self->{face_cb}{$facenum}) { |
785 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
919 | $_->($face, $changed) for @$cbs; |
786 | ::add_license ($face); |
|
|
787 | $cb->(); |
|
|
788 | } |
|
|
789 | } |
920 | } |
790 | } |
921 | } |
791 | |
922 | |
792 | sub smooth_update { |
923 | sub smooth_update { |
793 | my ($self, $facenum, $face) = @_; |
924 | my ($self, $facenum, $face) = @_; |
794 | |
925 | |
795 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
926 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
796 | } |
927 | } |
797 | |
928 | |
798 | sub set_texture { |
929 | sub have_tile { |
799 | my ($self, $id, $data) = @_; |
930 | my ($self, $tile, $data) = @_; |
800 | |
931 | |
801 | return unless $self->{map}; |
932 | return unless $self->{map}; |
802 | |
933 | |
803 | $self->{texture}[$id] = my $tex = |
934 | my $tex = $self->{texture}[$tile] ||= |
804 | new_from_image CFPlus::Texture |
935 | new CFPlus::Texture |
|
|
936 | tile => $tile, |
|
|
937 | image => $data, delete_image => 1, |
805 | $data, minify => 1, mipmap => 1; |
938 | minify => 1, mipmap => 1; |
806 | |
939 | |
807 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
940 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
808 | $self->{map_widget}->update; |
941 | $_->($tex) for @$cbs; |
809 | |
942 | } |
810 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
|
|
811 | } |
943 | } |
812 | |
944 | |
813 | sub connect_face_update { |
945 | # call in non-void context registers a temporary |
|
|
946 | # hook with handle, otherwise its permanent |
|
|
947 | sub on_face_change { |
814 | my ($self, $id, $cb) = @_; |
948 | my ($self, $num, $cb) = @_; |
815 | |
949 | |
816 | push @{$self->{face_cb}{$id}}, $cb; |
950 | push @{$self->{face_cb}{$num}}, $cb; |
817 | |
951 | |
|
|
952 | defined wantarray |
818 | CFPlus::guard { |
953 | ? CFPlus::guard { |
819 | @{$self->{face_cb}{$id}} |
954 | @{$self->{face_cb}{$num}} |
820 | = grep $_ != $cb, |
955 | = grep $_ != $cb, |
821 | @{$self->{face_cb}{$id}}; |
956 | @{$self->{face_cb}{$num}}; |
822 | } |
957 | } |
|
|
958 | : () |
|
|
959 | } |
|
|
960 | |
|
|
961 | # call in non-void context registers a temporary |
|
|
962 | # hook with handle, otherwise its permanent |
|
|
963 | sub register_face_handler { |
|
|
964 | my ($self, $num, $cb) = @_; |
|
|
965 | |
|
|
966 | return unless $num; |
|
|
967 | |
|
|
968 | # invoke if available right now |
|
|
969 | $cb->($self->{face}[$num], 0) |
|
|
970 | unless exists $self->{face}[$num]{loading}; |
|
|
971 | |
|
|
972 | # future changes |
|
|
973 | $self->on_face_change ($num => $cb) |
823 | } |
974 | } |
824 | |
975 | |
825 | sub sound_play { |
976 | sub sound_play { |
826 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
977 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
827 | |
978 | |
… | |
… | |
899 | $self->{$type} = $text; |
1050 | $self->{$type} = $text; |
900 | } else { |
1051 | } else { |
901 | $self->logprint ("msg: ", $text); |
1052 | $self->logprint ("msg: ", $text); |
902 | return if $color < 0; # negative color == ignore if not understood |
1053 | return if $color < 0; # negative color == ignore if not understood |
903 | |
1054 | |
904 | my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; |
1055 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
905 | |
1056 | |
906 | ## try to create single paragraphs of multiple lines sent by the server |
1057 | ## try to create single paragraphs of multiple lines sent by the server |
907 | # no longer neecssary with TRT servers |
1058 | # no longer neecssary with TRT servers |
908 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1059 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
909 | |
1060 | |
910 | ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) |
1061 | ::message ({ |
|
|
1062 | fg => $fg, |
|
|
1063 | markup => $_, |
|
|
1064 | type => $type, |
|
|
1065 | extra => [@extra], |
|
|
1066 | color_flags => $color |
911 | for split /\n/, $text; |
1067 | }) for split /\n/, $text; |
912 | |
1068 | |
913 | $self->{statusbox}->add ($text, |
1069 | $self->{statusbox}->add ($text, |
914 | group => $text, |
1070 | group => $text, |
915 | fg => $fg, |
1071 | fg => $fg, |
916 | timeout => $color >= 2 ? 180 : 10, |
1072 | timeout => $color >= 2 ? 180 : 10, |
… | |
… | |
1010 | } |
1166 | } |
1011 | |
1167 | |
1012 | $::FLOORBOX->add_at (@add); |
1168 | $::FLOORBOX->add_at (@add); |
1013 | }); |
1169 | }); |
1014 | |
1170 | |
1015 | $::WANT_REFRESH++; |
1171 | $::WANT_REFRESH->start; |
1016 | } |
1172 | } |
1017 | |
1173 | |
1018 | sub set_opencont { |
1174 | sub set_opencont { |
1019 | my ($conn, $tag, $name) = @_; |
1175 | my ($conn, $tag, $name) = @_; |
1020 | $conn->{open_container} = $tag; |
1176 | $conn->{open_container} = $tag; |
1021 | update_floorbox; |
1177 | update_floorbox; |
1022 | |
1178 | |
1023 | $::INV_RIGHT_HB->clear (); |
1179 | $::INVR_HB->clear (); |
1024 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1180 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1025 | |
1181 | |
1026 | if ($tag != 0) { # Floor isn't closable, is it? |
1182 | if ($tag != 0) { # Floor isn't closable, is it? |
1027 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
1183 | $::INVR_HB->add (new CFPlus::UI::Button |
1028 | text => "Close container", |
1184 | text => "Close container", |
1029 | tooltip => "Close the currently open container (if one is open)", |
1185 | tooltip => "Close the currently open container (if one is open)", |
1030 | on_activate => sub { |
1186 | on_activate => sub { |
1031 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1187 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1032 | if $tag != 0; |
1188 | if $tag != 0; |
1033 | #if $CONN->{open_container} != 0; |
|
|
1034 | 0 |
1189 | 0 |
1035 | }, |
1190 | }, |
1036 | ); |
1191 | ); |
1037 | } |
1192 | } |
1038 | |
1193 | |