… | |
… | |
4 | use strict; |
4 | use strict; |
5 | |
5 | |
6 | use Crossfire::Protocol::Constants; |
6 | use Crossfire::Protocol::Constants; |
7 | |
7 | |
8 | use CFPlus; |
8 | use CFPlus; |
|
|
9 | use CFPlus::DB; |
9 | use CFPlus::UI; |
10 | use CFPlus::UI; |
10 | use CFPlus::Pod; |
11 | use CFPlus::Pod; |
11 | use CFPlus::Macro; |
12 | use CFPlus::Macro; |
12 | use CFPlus::Item; |
13 | use CFPlus::Item; |
13 | |
14 | |
14 | use Crossfire::Protocol::Base 0.95; |
|
|
15 | |
|
|
16 | use base 'Crossfire::Protocol::Base'; |
15 | use base 'Crossfire::Protocol::Base'; |
17 | |
16 | |
18 | sub new { |
17 | sub new { |
19 | my $class = shift; |
18 | my ($class, %arg) = @_; |
20 | |
19 | |
21 | my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); |
20 | my $self = $class->SUPER::new (%arg, |
|
|
21 | setup_req => { |
|
|
22 | extmap => 1, |
|
|
23 | excmd => 1, |
|
|
24 | #xwidget2 => 1,#d# |
|
|
25 | %{$arg{setup_req} || {}}, |
|
|
26 | msg => 0, |
|
|
27 | }, |
|
|
28 | ); |
22 | |
29 | |
23 | $self->{map_widget}->clr_commands; |
30 | $self->{map_widget}->clr_commands; |
24 | |
31 | |
25 | my @cmd_help = map { |
32 | my @cmd_help = map { |
26 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
33 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
… | |
… | |
37 | for @args; |
44 | for @args; |
38 | |
45 | |
39 | map ["$cmd$_", $text], |
46 | map ["$cmd$_", $text], |
40 | sort { (length $a) <=> (length $b) } |
47 | sort { (length $a) <=> (length $b) } |
41 | @args |
48 | @args |
42 | } sort { $a->{par} <=> $b->{par} } |
49 | } sort { $a->{par} <=> $b->{par} } |
43 | CFPlus::Pod::find command => "*"; |
50 | CFPlus::Pod::find command => "*"; |
44 | |
51 | |
45 | $self->connect_ext (event_capabilities => sub { |
52 | $self->{json_coder} |
|
|
53 | ->convert_blessed |
|
|
54 | ->filter_json_single_key_object ("\fw" => sub { |
|
|
55 | $self->{widget}{$_[0]} |
|
|
56 | }) |
|
|
57 | ->filter_json_single_key_object ("\fc" => sub { |
46 | my ($cap) = @_; |
58 | my ($id) = @_; |
47 | |
59 | sub { |
48 | if (my $ts = $cap->{tileset}) { |
60 | $self->send_exti_msg (w_e => $id, @_); |
49 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
50 | $self->{tileset} = $default; |
|
|
51 | $self->{tilesize} = $default->[3]; |
|
|
52 | $self->setup_req (tileset => $default->[0]); |
|
|
53 | |
|
|
54 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
55 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
56 | |
|
|
57 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
58 | } |
61 | } |
|
|
62 | }); |
|
|
63 | |
|
|
64 | # destroy widgets on logout |
|
|
65 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
66 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
67 | $_->destroy |
|
|
68 | for values %{delete $ws->{w} || {}}; |
59 | } |
69 | } |
60 | }); |
70 | }); |
61 | |
71 | |
62 | $self->{map_widget}->add_command (@$_) |
72 | $self->{map_widget}->add_command (@$_) |
63 | for @cmd_help; |
73 | for @cmd_help; |
64 | |
|
|
65 | $self->{noface} = new_from_file CFPlus::Texture |
|
|
66 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
67 | |
74 | |
68 | { |
75 | { |
69 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
76 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
70 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
77 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
71 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
78 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
72 | } |
79 | } |
73 | |
80 | |
|
|
81 | { |
|
|
82 | $self->{noface} = my $tex = new_from_file CFPlus::Texture |
|
|
83 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
84 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
85 | } |
|
|
86 | |
74 | $self->{open_container} = 0; |
87 | $self->{open_container} = 0; |
75 | |
88 | |
76 | # "global" |
|
|
77 | $self->{tilecache} = CFPlus::db_table "tilecache" |
|
|
78 | or die "tilecache: unable to open database table"; |
|
|
79 | $self->{facemap} = CFPlus::db_table "facemap" |
|
|
80 | or die "facemap: unable to open database table"; |
|
|
81 | |
|
|
82 | # per server |
89 | # per server |
83 | $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" |
90 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
84 | or die "mapcache_$self->{host}_$self->{port}: unable to open database table"; |
|
|
85 | |
91 | |
86 | $self |
92 | $self |
87 | } |
93 | } |
|
|
94 | |
|
|
95 | sub update_fx_want { |
|
|
96 | my ($self) = @_; |
|
|
97 | |
|
|
98 | $self->send_exti_msg (fx_want => { |
|
|
99 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
100 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
101 | 6 => 1, # FT_RSRC |
|
|
102 | }); |
|
|
103 | } |
|
|
104 | |
|
|
105 | sub ext_capabilities { |
|
|
106 | my ($self, %cap) = @_; |
|
|
107 | |
|
|
108 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
109 | $self->update_fx_want; |
|
|
110 | |
|
|
111 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
112 | my ($exp_table) = @_; |
|
|
113 | |
|
|
114 | $self->register_face_handler ($exp_table, sub { |
|
|
115 | my ($face) = @_; |
|
|
116 | |
|
|
117 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
118 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
119 | }); |
|
|
120 | |
|
|
121 | () |
|
|
122 | }); |
|
|
123 | |
|
|
124 | if (my $ts = $cap{tileset}) { |
|
|
125 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
126 | $self->{tileset} = $default; |
|
|
127 | $self->{tilesize} = $default->[3]; |
|
|
128 | $self->setup_req (tileset => $default->[0]); |
|
|
129 | |
|
|
130 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
131 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
132 | |
|
|
133 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
134 | } |
|
|
135 | } |
|
|
136 | } |
|
|
137 | |
|
|
138 | sub ext_ambient_music { |
|
|
139 | my ($self, $songs) = @_; |
|
|
140 | &::audio_music_set_ambient ($songs); |
|
|
141 | } |
|
|
142 | |
|
|
143 | ############################################################################# |
|
|
144 | |
|
|
145 | sub widget_associate { |
|
|
146 | my ($self, $ws, $id, $widget) = @_; |
|
|
147 | |
|
|
148 | $widget ||= new CFPlus::UI::Bin; |
|
|
149 | |
|
|
150 | $widget->{s_id} = $id; |
|
|
151 | $self->{widget}{$id} = $widget; |
|
|
152 | |
|
|
153 | if ($ws) { |
|
|
154 | $widget->{s_ws} = $ws; |
|
|
155 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
156 | } |
|
|
157 | |
|
|
158 | $widget->connect (on_destroy => sub { |
|
|
159 | my ($widget) = @_; |
|
|
160 | |
|
|
161 | delete $self->{widget}{$widget->{s_id}}; |
|
|
162 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
163 | if exists $widget->{s_ws}; |
|
|
164 | }); |
|
|
165 | } |
|
|
166 | |
|
|
167 | # widgetset new |
|
|
168 | sub ext_ws_n { |
|
|
169 | my ($self, $id) = @_; |
|
|
170 | |
|
|
171 | $self->{widgetset}{$id} = { |
|
|
172 | w => {}, |
|
|
173 | }; |
|
|
174 | } |
|
|
175 | |
|
|
176 | # widgetset destroy |
|
|
177 | sub ext_ws_d { |
|
|
178 | my ($self, $id) = @_; |
|
|
179 | |
|
|
180 | my $ws = delete $self->{widgetset}{$id} |
|
|
181 | or return; |
|
|
182 | |
|
|
183 | $_->destroy |
|
|
184 | for values %{$ws->{w}}; |
|
|
185 | } |
|
|
186 | |
|
|
187 | # widgetset create |
|
|
188 | sub ext_ws_c { |
|
|
189 | my ($self, $ws, $id, $class, $args) = @_; |
|
|
190 | |
|
|
191 | $self->widget_associate ( |
|
|
192 | $ws, $id => scalar eval { |
|
|
193 | local $SIG{__DIE__}; |
|
|
194 | "CFPlus::UI::$class"->new (%$args) |
|
|
195 | } |
|
|
196 | ); |
|
|
197 | } |
|
|
198 | |
|
|
199 | # widgetset associate |
|
|
200 | sub ext_ws_a { |
|
|
201 | my ($self, %ass) = @_; |
|
|
202 | |
|
|
203 | # everything that has a name, wether conceivably useful or not |
|
|
204 | my %wkw = ( |
|
|
205 | root => $CFPlus::UI::ROOT, |
|
|
206 | tooltip => $CFPlus::UI::TOOLTIP, |
|
|
207 | |
|
|
208 | mapwidget => $::MAPWIDGET, |
|
|
209 | buttonbar => $::BUTTONBAR, |
|
|
210 | metaserver => $::METASERVER, |
|
|
211 | buttonbar => $::BUTTONBAR, |
|
|
212 | login_button => $::LOGIN_BUTTON, |
|
|
213 | quit_dialog => $::QUIT_DIALOG, |
|
|
214 | host_entry => $::HOST_ENTRY, |
|
|
215 | metaserver => $::METASERVER, |
|
|
216 | server_info => $::SERVER_INFO, |
|
|
217 | |
|
|
218 | setup_dialog => $::SETUP_DIALOG, |
|
|
219 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
220 | setup_server => $::SETUP_SERVER, |
|
|
221 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
222 | |
|
|
223 | pl_notebook => $::PL_NOTEBOOK, |
|
|
224 | pl_window => $::PL_WINDOW, |
|
|
225 | inventory_page => $::INVENTORY_PAGE, |
|
|
226 | stats_page => $::STATS_PAGE, |
|
|
227 | skill_page => $::SKILL_PAGE, |
|
|
228 | spell_page => $::SPELL_PAGE, |
|
|
229 | spell_list => $::SPELL_LIST, |
|
|
230 | |
|
|
231 | floorbox => $::FLOORBOX, |
|
|
232 | help_window => $::HELP_WINDOW, |
|
|
233 | message_window => $::MESSAGE_WINDOW, |
|
|
234 | statusbox => $::SDTATUSBOX, |
|
|
235 | |
|
|
236 | inv => $::INV, |
|
|
237 | invr => $::INVR, |
|
|
238 | invr_hb => $::INVR_HB, |
|
|
239 | ); |
|
|
240 | |
|
|
241 | while (my ($id, $name) = each %ass) { |
|
|
242 | $self->widget_associate (undef, $id => $wkw{$name}); |
|
|
243 | } |
|
|
244 | } |
|
|
245 | |
|
|
246 | # widget call |
|
|
247 | sub ext_w_c { |
|
|
248 | my ($self, $id, $rcb, $method, @args) = @_; |
|
|
249 | |
|
|
250 | my $w = $self->{widget}{$id} |
|
|
251 | or return; |
|
|
252 | |
|
|
253 | if ($rcb) { |
|
|
254 | $rcb->($w->$method (@args)); |
|
|
255 | } else { |
|
|
256 | $w->$method (@args); |
|
|
257 | } |
|
|
258 | } |
|
|
259 | |
|
|
260 | # widget set |
|
|
261 | sub ext_w_s { |
|
|
262 | my ($self, $id, $attr) = @_; |
|
|
263 | |
|
|
264 | my $w = $self->{widget}{$id} |
|
|
265 | or return; |
|
|
266 | |
|
|
267 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
268 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
269 | if (defined $value) { |
|
|
270 | $w->{$member} = $value; |
|
|
271 | } else { |
|
|
272 | delete $w->{$member}; |
|
|
273 | } |
|
|
274 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
275 | } |
|
|
276 | } |
|
|
277 | |
|
|
278 | # widget get |
|
|
279 | sub ext_w_g { |
|
|
280 | my ($self, $id, $rid, @attr) = @_; |
|
|
281 | |
|
|
282 | my $w = $self->{widget}{$id} |
|
|
283 | or return; |
|
|
284 | |
|
|
285 | $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr); |
|
|
286 | } |
|
|
287 | |
|
|
288 | # message window |
|
|
289 | sub ext_channel_info { |
|
|
290 | my ($self, $info) = @_; |
|
|
291 | $self->{channels}->{$info->{id}} = $info; |
|
|
292 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
293 | } |
|
|
294 | |
|
|
295 | ############################################################################# |
88 | |
296 | |
89 | sub logprint { |
297 | sub logprint { |
90 | my ($self, @a) = @_; |
298 | my ($self, @a) = @_; |
91 | |
299 | |
92 | $self->{log_fh} ||= do { |
300 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
93 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
94 | |
|
|
95 | open my $fh, ">>:utf8", $path |
|
|
96 | or die "Couldn't open logfile $path: $!"; |
|
|
97 | |
|
|
98 | $fh->autoflush (1); |
|
|
99 | |
|
|
100 | $fh; |
|
|
101 | }; |
|
|
102 | |
|
|
103 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
104 | |
|
|
105 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
106 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
107 | |
|
|
108 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
109 | } |
301 | } |
110 | |
302 | |
111 | sub _stat_numdiff { |
303 | sub _stat_numdiff { |
112 | my ($self, $name, $old, $new) = @_; |
304 | my ($self, $name, $old, $new) = @_; |
113 | |
305 | |
… | |
… | |
197 | |
389 | |
198 | if ( |
390 | if ( |
199 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
391 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
200 | ) { |
392 | ) { |
201 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
393 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
202 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); |
394 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); |
203 | } |
395 | } |
204 | |
396 | |
205 | $self->update_stats_window ($stats, $prev); |
397 | $self->update_stats_window ($stats, $prev); |
206 | |
398 | |
207 | $self->{prev_stats} = { %$stats }; |
399 | $self->{prev_stats} = { %$stats }; |
… | |
… | |
246 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
438 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
247 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
439 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
248 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
440 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
249 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
441 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
250 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
442 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
251 | my $rng = $stats->{+CS_STAT_RANGE}; |
443 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
252 | $rng =~ s/^Range: //; # thank you so much dear server |
444 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
253 | $::GAUGES->{range} ->set_text ("Rng: " . $rng); |
|
|
254 | my $title = $stats->{+CS_STAT_TITLE}; |
445 | my $title = $stats->{+CS_STAT_TITLE}; |
255 | $title =~ s/^Player: //; |
446 | $title =~ s/^Player: //; |
256 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
447 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
257 | |
448 | |
258 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
449 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
… | |
… | |
275 | for keys %RES_TBL; |
466 | for keys %RES_TBL; |
276 | |
467 | |
277 | my $sktbl = $::STATWIDS->{skill_tbl}; |
468 | my $sktbl = $::STATWIDS->{skill_tbl}; |
278 | my @skills = keys %{ $self->{skill_info} }; |
469 | my @skills = keys %{ $self->{skill_info} }; |
279 | |
470 | |
280 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
471 | my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
472 | map [$_, $self->{skill_info}{$_}], |
|
|
473 | grep exists $stats->{$_}, |
|
|
474 | @skills; |
|
|
475 | |
|
|
476 | if ($self->{stat_order} ne join ",", map $_->[0], @order) { |
|
|
477 | $self->{stat_order} = join ",", map $_->[0], @order; |
|
|
478 | |
281 | $sktbl->clear; |
479 | $sktbl->clear; |
282 | |
480 | |
|
|
481 | my $sw = $self->{skillwid}{""} ||= [ |
283 | $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
482 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
284 | $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
483 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
484 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
285 | $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
485 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
286 | $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
486 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
287 | $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
487 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
488 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
288 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
489 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
|
|
490 | ]; |
|
|
491 | |
|
|
492 | my @add = @$sw; |
289 | |
493 | |
290 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
494 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
291 | |
495 | |
292 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
496 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
293 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
497 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
294 | |
498 | |
295 | my ($x, $y) = (0, 1); |
499 | my ($x, $y) = (0, 1); |
296 | for ( |
500 | for (@order) { |
297 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
298 | map [$_, $self->{skill_info}{$_}], |
|
|
299 | grep exists $stats->{$_}, |
|
|
300 | @skills |
|
|
301 | ) { |
|
|
302 | my ($idx, $name) = @$_; |
501 | my ($idx, $name) = @$_; |
303 | |
502 | |
304 | my $spell_cb = sub { |
503 | my $spell_cb = sub { |
305 | my ($widget, $ev) = @_; |
504 | my ($widget, $ev) = @_; |
306 | |
505 | |
… | |
… | |
321 | } |
520 | } |
322 | |
521 | |
323 | 1 |
522 | 1 |
324 | }; |
523 | }; |
325 | |
524 | |
326 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
525 | my $sw = $self->{skillwid}{$idx} ||= [ |
|
|
526 | # exp |
|
|
527 | (new CFPlus::UI::Label |
327 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); |
528 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
328 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
529 | |
|
|
530 | # level |
|
|
531 | (new CFPlus::UI::Label |
329 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); |
532 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
|
|
533 | |
|
|
534 | # progress |
|
|
535 | (new CFPlus::UI::ExperienceProgress), |
|
|
536 | |
|
|
537 | # label |
330 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
538 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
331 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
539 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
540 | ]; |
|
|
541 | |
|
|
542 | push @add, |
|
|
543 | $x * 4 + 0, $y, $sw->[0], |
|
|
544 | $x * 4 + 1, $y, $sw->[1], |
|
|
545 | $x * 4 + 2, $y, $sw->[2], |
|
|
546 | $x * 4 + 3, $y, $sw->[3], |
|
|
547 | ; |
332 | |
548 | |
333 | $x++ and ($x, $y) = (0, $y + 1); |
549 | $x++ and ($x, $y) = (0, $y + 1); |
334 | } |
550 | } |
335 | } |
|
|
336 | |
551 | |
337 | for (grep exists $stats->{$_}, @skills) { |
552 | $sktbl->add_at (@add); |
338 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
|
|
339 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
|
|
340 | } |
553 | } |
341 | } |
|
|
342 | |
554 | |
343 | sub macro_send { |
555 | for (@order) { |
344 | my ($self, $macro) = @_; |
556 | my ($idx, $name) = @$_; |
|
|
557 | my $val = $stats->{$idx}; |
345 | |
558 | |
346 | for my $cmd (@{ $macro->{action} }) { |
559 | next if $prev->{$idx}[1] eq $val->[1]; |
347 | $self->send_command ($cmd); |
560 | |
|
|
561 | my $sw = $self->{skillwid}{$idx}; |
|
|
562 | $sw->[0]->set_text (::formsep ($val->[1])); |
|
|
563 | $sw->[1]->set_text ($val->[0] * 1); |
|
|
564 | $sw->[2]->set_value (@$val); |
|
|
565 | |
|
|
566 | $::GAUGES->{sklprg}->set_label ("$name %d%%"); |
|
|
567 | $::GAUGES->{sklprg}->set_value (@$val); |
348 | } |
568 | } |
349 | } |
569 | } |
350 | |
570 | |
351 | sub user_send { |
571 | sub user_send { |
352 | my ($self, $command) = @_; |
572 | my ($self, $command) = @_; |
… | |
… | |
354 | $self->{record}->($command) |
574 | $self->{record}->($command) |
355 | if $self->{record}; |
575 | if $self->{record}; |
356 | |
576 | |
357 | $self->logprint ("send: ", $command); |
577 | $self->logprint ("send: ", $command); |
358 | $self->send_command ($command); |
578 | $self->send_command ($command); |
359 | ::status ($command); |
|
|
360 | } |
579 | } |
361 | |
580 | |
362 | sub record { |
581 | sub record { |
363 | my ($self, $cb) = @_; |
582 | my ($self, $cb) = @_; |
364 | |
583 | |
… | |
… | |
372 | } |
591 | } |
373 | |
592 | |
374 | sub feed_map1a { |
593 | sub feed_map1a { |
375 | my ($self, $data) = @_; |
594 | my ($self, $data) = @_; |
376 | |
595 | |
377 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
596 | my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
|
|
597 | my $delay; |
|
|
598 | |
|
|
599 | for my $tile (@$missing) { |
|
|
600 | next if $self->{delay}{$tile}; |
|
|
601 | |
|
|
602 | $delay = 1; |
|
|
603 | |
|
|
604 | if (my $tex = $::CONN->{texture}[$tile]) { |
|
|
605 | $tex->upload; |
|
|
606 | } else { |
|
|
607 | $self->{delay}{$tile} = 1; |
|
|
608 | |
|
|
609 | # we assume the face is in-flight and will eventually come |
|
|
610 | push @{$self->{tile_cb}{$tile}}, sub { |
|
|
611 | delete $self->{delay}{$tile}; |
|
|
612 | $_[0]->upload; |
|
|
613 | }; |
|
|
614 | } |
|
|
615 | } |
|
|
616 | |
|
|
617 | if ($delay) { |
|
|
618 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
|
|
619 | Event->timer (after => 0.03, cb => sub { |
|
|
620 | $_[0]->w->cancel; |
|
|
621 | $self->{map_widget}->update |
|
|
622 | if $self->{map_widget}; |
|
|
623 | }); |
|
|
624 | } else { |
378 | $self->{map_widget}->update; |
625 | $self->{map_widget}->update; |
|
|
626 | } |
379 | } |
627 | } |
380 | |
628 | |
381 | sub magicmap { |
629 | sub magicmap { |
382 | my ($self, $w, $h, $x, $y, $data) = @_; |
630 | my ($self, $w, $h, $x, $y, $data) = @_; |
383 | |
631 | |
… | |
… | |
390 | my $map_info = delete $self->{map_info} |
638 | my $map_info = delete $self->{map_info} |
391 | or return; |
639 | or return; |
392 | |
640 | |
393 | my ($hash, $x, $y, $w, $h) = @$map_info; |
641 | my ($hash, $x, $y, $w, $h) = @$map_info; |
394 | |
642 | |
395 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
643 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
396 | $self->{mapcache}->put ($hash => Compress::LZF::compress $data); |
644 | $self->{map_cache_new}{$hash} = \$data; |
397 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
645 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
398 | } |
646 | } |
399 | |
647 | |
400 | sub map_clear { |
648 | sub map_clear { |
401 | my ($self) = @_; |
649 | my ($self) = @_; |
402 | |
650 | |
… | |
… | |
405 | |
653 | |
406 | $self->{map}->clear; |
654 | $self->{map}->clear; |
407 | delete $self->{map_widget}{magicmap}; |
655 | delete $self->{map_widget}{magicmap}; |
408 | } |
656 | } |
409 | |
657 | |
|
|
658 | sub bg_fetch { |
|
|
659 | my ($self) = @_; |
|
|
660 | |
|
|
661 | my $tile; |
|
|
662 | |
|
|
663 | do { |
|
|
664 | $tile = pop @{$self->{bg_fetch}} |
|
|
665 | or return; |
|
|
666 | } while $self->{texture}[$tile]; |
|
|
667 | |
|
|
668 | CFPlus::DB::get tilecache => $tile, sub { |
|
|
669 | my ($data) = @_; |
|
|
670 | |
|
|
671 | return unless $self->{map}; # stop when destroyed |
|
|
672 | |
|
|
673 | if (defined $data) { |
|
|
674 | $self->have_tile ($tile, $data); |
|
|
675 | $self->{texture}[$tile]->upload; |
|
|
676 | } |
|
|
677 | |
|
|
678 | $self->bg_fetch; |
|
|
679 | }; |
|
|
680 | } |
410 | |
681 | |
411 | sub load_map($$$) { |
682 | sub load_map($$$) { |
412 | my ($self, $hash, $x, $y) = @_; |
683 | my ($self, $hash, $x, $y) = @_; |
413 | |
684 | |
414 | if (defined (my $data = $self->{mapcache}->get ($hash))) { |
685 | my $gen = $self->{map_change_gen}; |
|
|
686 | |
|
|
687 | my $cb = sub { |
|
|
688 | return unless $gen == $self->{map_change_gen}; |
|
|
689 | |
|
|
690 | my ($data) = @_; |
|
|
691 | |
|
|
692 | if (defined $data) { |
|
|
693 | $self->{map_cache_new}{$hash} = \$data; |
|
|
694 | |
415 | $data = Compress::LZF::decompress $data; |
695 | my $data = Compress::LZF::decompress $data; |
416 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
|
|
417 | for my $id ($self->{map}->set_rect ($x, $y, $data)) { |
|
|
418 | my $data = $self->{tilecache}->get ($id) |
|
|
419 | or next; |
|
|
420 | |
696 | |
421 | $self->set_texture ($id => $data); |
697 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
|
|
698 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
|
|
699 | $self->bg_fetch unless $inprogress; |
422 | } |
700 | } |
|
|
701 | }; |
|
|
702 | |
|
|
703 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
|
|
704 | $cb->($$rdata); |
|
|
705 | } else { |
|
|
706 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
423 | } |
707 | } |
424 | } |
708 | } |
425 | |
709 | |
426 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
710 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
427 | # (server resource,s latency, bandwidth), so this hack is warranted. |
711 | # (server resource,s latency, bandwidth), so this hack is warranted. |
… | |
… | |
492 | |
776 | |
493 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
777 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
494 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
778 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
495 | |
779 | |
496 | } else { |
780 | } else { |
|
|
781 | my $gen = $self->{map_change_gen}; |
497 | $self->send_mapinfo ("spatial $path$tile", sub { |
782 | $self->send_mapinfo ("spatial $path$tile", sub { |
|
|
783 | return unless $gen == $self->{map_change_gen}; |
|
|
784 | |
498 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
785 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
499 | |
786 | |
500 | return if $mode ne "spatial"; |
787 | return if $mode ne "spatial"; |
501 | |
788 | |
502 | $x += $self->{map}->ox; |
789 | $x += $self->{map}->ox; |
… | |
… | |
516 | |
803 | |
517 | sub map_change { |
804 | sub map_change { |
518 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
805 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
519 | |
806 | |
520 | $self->flush_map; |
807 | $self->flush_map; |
|
|
808 | |
|
|
809 | ++$self->{map_change_gen}; |
|
|
810 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
521 | |
811 | |
522 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
812 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
523 | |
813 | |
524 | my $mapmapw = $self->{mapmap}->{w}; |
814 | my $mapmapw = $self->{mapmap}->{w}; |
525 | my $mapmaph = $self->{mapmap}->{h}; |
815 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
542 | $self->load_map ($hash, $x, $y); |
832 | $self->load_map ($hash, $x, $y); |
543 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
833 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
544 | } |
834 | } |
545 | |
835 | |
546 | sub face_find { |
836 | sub face_find { |
547 | my ($self, $facenum, $face) = @_; |
837 | my ($self, $facenum, $face, $cb) = @_; |
548 | |
838 | |
549 | my $hash = "$face->{chksum},$face->{name}"; |
839 | if ($face->{type} == 0) { # FT_FACE |
|
|
840 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
550 | |
841 | |
551 | my $id = $self->{facemap}->get ($hash); |
|
|
552 | |
|
|
553 | unless ($id) { |
|
|
554 | # create new id for face |
|
|
555 | # I love transactions |
|
|
556 | for (1..100) { |
|
|
557 | my $txn = $CFPlus::DB_ENV->txn_begin; |
|
|
558 | my $status = $self->{facemap}->db_get (id => $id); |
|
|
559 | if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { |
|
|
560 | $id = ($id || 64) + 1; |
|
|
561 | if ($self->{facemap}->put (id => $id) == 0 |
|
|
562 | && $self->{facemap}->put ($hash => $id) == 0) { |
|
|
563 | $txn->txn_commit; |
|
|
564 | |
|
|
565 | goto gotid; |
|
|
566 | } |
|
|
567 | } |
|
|
568 | $txn->txn_abort; |
|
|
569 | } |
|
|
570 | |
|
|
571 | CFPlus::fatal "maximum number of transaction retries reached - database problems?"; |
|
|
572 | } |
|
|
573 | |
|
|
574 | gotid: |
|
|
575 | $face->{id} = $id; |
842 | $face->{id} = $id; |
576 | $self->{map}->set_face ($facenum => $id); |
843 | $self->{map}->set_tileid ($facenum => $id); |
577 | $self->{faceid}[$facenum] = $id;#d# |
|
|
578 | |
844 | |
579 | my $face = $self->{tilecache}->get ($id); |
845 | CFPlus::DB::get tilecache => $id, $cb; |
580 | |
846 | |
581 | if ($face) { |
847 | } elsif ($face->{type} & 1) { # with metadata |
582 | #$self->face_prefetch; |
848 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
583 | $face |
849 | |
584 | } else { |
850 | } else { # no metadata |
585 | my $tex = $self->{noface}; |
851 | CFPlus::DB::get res_data => $face->{name}, $cb; |
586 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
587 | undef |
|
|
588 | }; |
852 | } |
589 | } |
853 | } |
590 | |
854 | |
591 | sub face_update { |
855 | sub face_update { |
592 | my ($self, $facenum, $face, $changed) = @_; |
856 | my ($self, $facenum, $face, $changed) = @_; |
593 | |
857 | |
594 | $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; |
858 | if ($face->{type} == 0) { |
|
|
859 | # image, FT_FACE |
|
|
860 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
|
|
861 | if $changed; |
595 | |
862 | |
596 | $self->set_texture ($face->{id} => delete $face->{image}); |
863 | $self->have_tile ($face->{id}, delete $face->{data}); |
597 | } |
|
|
598 | |
864 | |
599 | sub set_texture { |
865 | } elsif ($face->{type} & 1) { |
|
|
866 | # split metadata case, FT_MUSIC, FT_SOUND |
|
|
867 | if ($changed) { # new data |
|
|
868 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
|
|
869 | $face->{data} = $meta; |
|
|
870 | |
|
|
871 | # rely on strict ordering here and also on later fetch |
|
|
872 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
873 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
|
|
874 | } |
|
|
875 | |
|
|
876 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
|
|
877 | ::add_license ($face); |
|
|
878 | ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
|
|
879 | if $changed; |
|
|
880 | |
|
|
881 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
882 | &::audio_music_push ($facenum); |
|
|
883 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
884 | &::audio_sound_push ($facenum); |
|
|
885 | } |
|
|
886 | |
|
|
887 | } else { |
|
|
888 | # flat resource case, FT_RSRC |
|
|
889 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
|
|
890 | if $changed; |
|
|
891 | } |
|
|
892 | |
|
|
893 | if (my $cbs = $self->{face_cb}{$facenum}) { |
|
|
894 | $_->($face, $changed) for @$cbs; |
|
|
895 | } |
|
|
896 | } |
|
|
897 | |
|
|
898 | sub smooth_update { |
|
|
899 | my ($self, $facenum, $face) = @_; |
|
|
900 | |
|
|
901 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
|
|
902 | } |
|
|
903 | |
|
|
904 | sub have_tile { |
600 | my ($self, $id, $data) = @_; |
905 | my ($self, $tile, $data) = @_; |
601 | |
906 | |
602 | $self->{texture}[$id] ||= do { |
907 | return unless $self->{map}; |
603 | my $tex = |
908 | |
|
|
909 | my $tex = $self->{texture}[$tile] ||= |
604 | new_from_image CFPlus::Texture |
910 | new CFPlus::Texture |
|
|
911 | tile => $tile, |
|
|
912 | image => $data, delete_image => 1, |
605 | $data, minify => 1, mipmap => 1; |
913 | minify => 1, mipmap => 1; |
606 | |
914 | |
607 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
915 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
608 | $self->{map_widget}->update; |
916 | $_->($tex) for @$cbs; |
609 | |
|
|
610 | $tex |
|
|
611 | }; |
917 | } |
|
|
918 | } |
|
|
919 | |
|
|
920 | # call in non-void context registers a temporary |
|
|
921 | # hook with handle, otherwise its permanent |
|
|
922 | sub on_face_change { |
|
|
923 | my ($self, $num, $cb) = @_; |
|
|
924 | |
|
|
925 | push @{$self->{face_cb}{$num}}, $cb; |
|
|
926 | |
|
|
927 | defined wantarray |
|
|
928 | ? CFPlus::guard { |
|
|
929 | @{$self->{face_cb}{$num}} |
|
|
930 | = grep $_ != $cb, |
|
|
931 | @{$self->{face_cb}{$num}}; |
|
|
932 | } |
|
|
933 | : () |
|
|
934 | } |
|
|
935 | |
|
|
936 | # call in non-void context registers a temporary |
|
|
937 | # hook with handle, otherwise its permanent |
|
|
938 | sub register_face_handler { |
|
|
939 | my ($self, $num, $cb) = @_; |
|
|
940 | |
|
|
941 | return unless $num; |
|
|
942 | |
|
|
943 | # invoke if available right now |
|
|
944 | $cb->($self->{face}[$num], 0) |
|
|
945 | unless exists $self->{face}[$num]{loading}; |
|
|
946 | |
|
|
947 | # future changes |
|
|
948 | $self->on_face_change ($num => $cb) |
612 | } |
949 | } |
613 | |
950 | |
614 | sub sound_play { |
951 | sub sound_play { |
615 | my ($self, $x, $y, $soundnum, $type) = @_; |
952 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
616 | |
953 | |
617 | $self->{sound_play}->($x, $y, $soundnum, $type); |
954 | &::audio_sound_play ($face, $dx, $dy, $vol) |
|
|
955 | unless $type & 1; # odd types are silent for future expansion |
618 | } |
956 | } |
619 | |
957 | |
620 | my $LAST_QUERY; # server is stupid, stupid, stupid |
958 | my $LAST_QUERY; # server is stupid, stupid, stupid |
621 | |
959 | |
622 | sub query { |
960 | sub query { |
… | |
… | |
626 | $LAST_QUERY = $prompt; |
964 | $LAST_QUERY = $prompt; |
627 | |
965 | |
628 | $self->{query}-> ($self, $flags, $prompt); |
966 | $self->{query}-> ($self, $flags, $prompt); |
629 | } |
967 | } |
630 | |
968 | |
631 | sub drawinfo { |
969 | sub sanitise_xml($) { |
632 | my ($self, $color, $text) = @_; |
970 | local $_ = shift; |
633 | |
971 | |
634 | my @color = ( |
972 | # we now weed out all tags we do not support |
|
|
973 | s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) |
|
|
974 | }{ |
|
|
975 | "<" |
|
|
976 | }gex; |
|
|
977 | |
|
|
978 | # now all entities |
|
|
979 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
980 | |
|
|
981 | # handle some elements |
|
|
982 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
983 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
984 | |
|
|
985 | $_ |
|
|
986 | } |
|
|
987 | |
|
|
988 | our %NAME_TO_COLOR = ( |
|
|
989 | black => 0, |
|
|
990 | white => 1, |
|
|
991 | darkblue => 2, |
|
|
992 | red => 3, |
|
|
993 | orange => 4, |
|
|
994 | lightblue => 5, |
|
|
995 | darkorange => 6, |
|
|
996 | green => 7, |
|
|
997 | darkgreen => 8, |
|
|
998 | grey => 9, |
|
|
999 | brown => 10, |
|
|
1000 | yellow => 11, |
|
|
1001 | tan => 12, |
|
|
1002 | ); |
|
|
1003 | |
|
|
1004 | our @CF_COLOR = ( |
635 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
1005 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
636 | [1.00, 1.00, 1.00], |
1006 | [1.00, 1.00, 1.00], |
637 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
1007 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
638 | [1.00, 0.00, 0.00], |
1008 | [1.00, 0.00, 0.00], |
639 | [1.00, 0.54, 0.00], |
1009 | [1.00, 0.54, 0.00], |
640 | [0.11, 0.56, 1.00], |
1010 | [0.11, 0.56, 1.00], |
641 | [0.93, 0.46, 0.00], |
1011 | [0.93, 0.46, 0.00], |
642 | [0.18, 0.54, 0.34], |
1012 | [0.18, 0.54, 0.34], |
643 | [0.56, 0.73, 0.56], |
1013 | [0.56, 0.73, 0.56], |
644 | [0.80, 0.80, 0.80], |
1014 | [0.80, 0.80, 0.80], |
645 | [0.75, 0.61, 0.20], |
1015 | [0.75, 0.61, 0.20], |
646 | [0.99, 0.77, 0.26], |
1016 | [0.99, 0.77, 0.26], |
647 | [0.74, 0.65, 0.41], |
1017 | [0.74, 0.65, 0.41], |
648 | ); |
1018 | ); |
649 | |
1019 | |
650 | my $fg = $color[$color % @color]; |
1020 | sub msg { |
|
|
1021 | my ($self, $color, $type, $text, @extra) = @_; |
651 | |
1022 | |
|
|
1023 | $text = sanitise_xml $text; |
|
|
1024 | |
|
|
1025 | if (my $cb = $self->{cb_msg}{$type}) { |
|
|
1026 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
|
|
1027 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
|
|
1028 | $type =~ s/-/_/g; |
|
|
1029 | $self->{$type} = $text; |
|
|
1030 | } else { |
652 | $self->logprint ("info: ", $text); |
1031 | $self->logprint ("msg: ", $text); |
|
|
1032 | return if $color < 0; # negative color == ignore if not understood |
653 | |
1033 | |
|
|
1034 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
|
|
1035 | |
654 | # try to create single paragraphs of multiple lines sent by the server |
1036 | ## try to create single paragraphs of multiple lines sent by the server |
|
|
1037 | # no longer neecssary with TRT servers |
655 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
1038 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
656 | |
1039 | |
657 | $text = CFPlus::asxml $text; |
|
|
658 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
|
|
659 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
|
|
660 | |
|
|
661 | ::message ({ fg => $fg, markup => $_ }) |
|
|
662 | for split /\n/, $text; |
1040 | for (split /\n/, $text) { |
|
|
1041 | ::message ({ |
|
|
1042 | fg => $fg, |
|
|
1043 | markup => $_, |
|
|
1044 | type => $type, |
|
|
1045 | extra => [@extra], |
|
|
1046 | color_flags => $color, #d# ugly, kill |
|
|
1047 | }); |
663 | |
1048 | |
|
|
1049 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
|
|
1050 | # actually, this is an ugly design. _we_ should control the channels, |
|
|
1051 | # not some random other widget, as the channels are clearly protocol-specific. |
|
|
1052 | # then we could also react to flags such as CLEAR without resorting to |
|
|
1053 | # hacks such as color_flags, above. |
|
|
1054 | } |
|
|
1055 | |
664 | $self->{statusbox}->add ($text, |
1056 | $self->{statusbox}->add ($text, |
665 | group => $text, |
1057 | group => $text, |
666 | fg => $fg, |
1058 | fg => $fg, |
667 | timeout => $color >= 2 ? 180 : 10, |
1059 | timeout => $color >= 2 ? 180 : 10, |
668 | tooltip_font => $::FONT_FIXED, |
1060 | tooltip_font => $::FONT_FIXED, |
669 | ); |
1061 | ) if $type eq "info"; |
670 | } |
1062 | } |
671 | |
|
|
672 | sub drawextinfo { |
|
|
673 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
674 | |
|
|
675 | $self->drawinfo ($color, $message); |
|
|
676 | } |
1063 | } |
677 | |
1064 | |
678 | sub spell_add { |
1065 | sub spell_add { |
679 | my ($self, $spell) = @_; |
1066 | my ($self, $spell) = @_; |
680 | |
1067 | |
… | |
… | |
728 | $self->{map_widget}->clr_commands; |
1115 | $self->{map_widget}->clr_commands; |
729 | |
1116 | |
730 | ::stop_game (); |
1117 | ::stop_game (); |
731 | } |
1118 | } |
732 | |
1119 | |
733 | sub image_info { |
|
|
734 | my ($self, $numfaces) = @_; |
|
|
735 | |
|
|
736 | $self->{num_faces} = $numfaces; |
|
|
737 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
738 | $self->face_prefetch; |
|
|
739 | } |
|
|
740 | |
|
|
741 | sub face_prefetch { |
|
|
742 | my ($self) = @_; |
|
|
743 | |
|
|
744 | return unless $::CFG->{face_prefetch}; |
|
|
745 | |
|
|
746 | if ($self->{num_faces}) { |
|
|
747 | return if @{ $self->{send_queue} || [] }; |
|
|
748 | my $todo = @{ $self->{face_prefetch} } |
|
|
749 | or return; |
|
|
750 | |
|
|
751 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
|
|
752 | |
|
|
753 | $self->send ("requestinfo image_sums $face $face"); |
|
|
754 | |
|
|
755 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
|
|
756 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
757 | } elsif (!exists $self->{num_faces}) { |
|
|
758 | $self->send ("requestinfo image_info"); |
|
|
759 | |
|
|
760 | $self->{num_faces} = 0; |
|
|
761 | |
|
|
762 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
|
|
763 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
764 | } |
|
|
765 | } |
|
|
766 | |
|
|
767 | sub update_floorbox { |
1120 | sub update_floorbox { |
768 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1121 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
769 | return unless $::CONN; |
1122 | return unless $::CONN; |
770 | |
1123 | |
771 | $::FLOORBOX->clear; |
1124 | $::FLOORBOX->clear; |
|
|
1125 | |
|
|
1126 | my @add; |
772 | |
1127 | |
773 | my $row; |
1128 | my $row; |
774 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1129 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
775 | if ($row < 6) { |
1130 | if ($row < 6) { |
776 | local $_->{face_widget}; # hack to force recreation of widget |
1131 | local $_->{face_widget}; # hack to force recreation of widget |
777 | local $_->{desc_widget}; # hack to force recreation of widget |
1132 | local $_->{desc_widget}; # hack to force recreation of widget |
778 | CFPlus::Item::update_widgets $_; |
1133 | CFPlus::Item::update_widgets $_; |
779 | |
1134 | |
|
|
1135 | push @add, |
780 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
1136 | 0, $row, $_->{face_widget}, |
781 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
1137 | 1, $row, $_->{desc_widget}; |
782 | |
1138 | |
783 | $row++; |
1139 | $row++; |
784 | } else { |
1140 | } else { |
785 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
1141 | push @add, 1, $row, new CFPlus::UI::Button |
786 | text => "More...", |
1142 | text => "More...", |
787 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1143 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
788 | ); |
1144 | ; |
789 | last; |
1145 | last; |
790 | } |
1146 | } |
791 | } |
1147 | } |
792 | if ($::CONN->{open_container}) { |
1148 | if ($::CONN->{open_container}) { |
793 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
1149 | push @add, 1, $row++, new CFPlus::UI::Button |
794 | text => "Close container", |
1150 | text => "Close container", |
795 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1151 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
796 | ); |
1152 | ; |
797 | } |
1153 | } |
|
|
1154 | |
|
|
1155 | $::FLOORBOX->add_at (@add); |
798 | }); |
1156 | }); |
799 | |
1157 | |
800 | $::WANT_REFRESH++; |
1158 | $::WANT_REFRESH->start; |
801 | } |
1159 | } |
802 | |
1160 | |
803 | sub set_opencont { |
1161 | sub set_opencont { |
804 | my ($conn, $tag, $name) = @_; |
1162 | my ($conn, $tag, $name) = @_; |
805 | $conn->{open_container} = $tag; |
1163 | $conn->{open_container} = $tag; |
806 | update_floorbox; |
1164 | update_floorbox; |
807 | |
1165 | |
808 | $::INV_RIGHT_HB->clear (); |
1166 | $::INVR_HB->clear (); |
809 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1167 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
810 | |
1168 | |
811 | if ($tag != 0) { # Floor isn't closable, is it? |
1169 | if ($tag != 0) { # Floor isn't closable, is it? |
812 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
1170 | $::INVR_HB->add (new CFPlus::UI::Button |
813 | text => "Close container", |
1171 | text => "Close container", |
814 | tooltip => "Close the currently open container (if one is open)", |
1172 | tooltip => "Close the currently open container (if one is open)", |
815 | on_activate => sub { |
1173 | on_activate => sub { |
816 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1174 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
817 | if $tag != 0; |
1175 | if $tag != 0; |
818 | #if $CONN->{open_container} != 0; |
|
|
819 | 0 |
1176 | 0 |
820 | }, |
1177 | }, |
821 | ); |
1178 | ); |
822 | } |
1179 | } |
823 | |
1180 | |
… | |
… | |
913 | $::SERVER_INFO->set_markup ( |
1270 | $::SERVER_INFO->set_markup ( |
914 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1271 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
915 | . "protocol version <tt>$self->{version}</tt>\n" |
1272 | . "protocol version <tt>$self->{version}</tt>\n" |
916 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1273 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
917 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1274 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
1275 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
918 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1276 | . "editing support $yesno[!!$self->{editor_support}]\n" |
919 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1277 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
1278 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
920 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1279 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
921 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1280 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
922 | . "map size $self->{mapw}×$self->{maph}\n" |
1281 | . "map size $self->{mapw}×$self->{maph}\n" |
923 | ); |
1282 | ); |
924 | |
1283 | |
925 | ::setup_build_button ($self->{editor_support}->{builder_ui}); |
|
|
926 | } |
1284 | } |
927 | |
1285 | |
928 | sub logged_in { |
1286 | sub logged_in { |
929 | my ($self) = @_; |
1287 | my ($self) = @_; |
930 | |
1288 | |
931 | $self->send_ext_req (cfplus_support => version => 1, sub { |
1289 | $self->send_ext_req (cfplus_support => version => 2, sub { |
|
|
1290 | my (%msg) = @_; |
|
|
1291 | |
932 | $self->{cfplus_ext} = $_[0]{version}; |
1292 | $self->{cfplus_ext} = $msg{version}; |
933 | $self->update_server_info; |
1293 | $self->update_server_info; |
934 | |
1294 | |
935 | if ($self->{cfplus_ext} >= 2) { |
1295 | if ($self->{cfplus_ext} >= 2) { |
936 | $self->send_ext_req ("editor_support", sub { |
1296 | $self->send_ext_req ("editor_support", sub { |
937 | $self->{editor_support} = $_[0]; |
1297 | $self->{editor_support} = { @_ }; |
938 | $self->update_server_info; |
1298 | $self->update_server_info; |
939 | |
1299 | |
940 | 0 |
1300 | 0 |
941 | }); |
1301 | }); |
942 | } |
1302 | } |
… | |
… | |
950 | $self->send_command ("output-count $::CFG->{output_count}"); |
1310 | $self->send_command ("output-count $::CFG->{output_count}"); |
951 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1311 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
952 | $self->send_command ("pickup $::CFG->{pickup}"); |
1312 | $self->send_command ("pickup $::CFG->{pickup}"); |
953 | } |
1313 | } |
954 | |
1314 | |
955 | sub buildat { |
|
|
956 | my ($self, $builditem, $x, $y) = @_; |
|
|
957 | |
|
|
958 | if ($self->{cfplus_ext}) { |
|
|
959 | $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); |
|
|
960 | } |
|
|
961 | } |
|
|
962 | |
|
|
963 | sub lookat { |
1315 | sub lookat { |
964 | my ($self, $x, $y) = @_; |
1316 | my ($self, $x, $y) = @_; |
965 | |
1317 | |
966 | if ($self->{cfplus_ext}) { |
1318 | if ($self->{cfplus_ext}) { |
967 | $self->send_ext_req (lookat => dx => $x, dy => $y, sub { |
1319 | $self->send_ext_req (lookat => $x, $y, sub { |
968 | my ($msg) = @_; |
1320 | my (%msg) = @_; |
969 | |
1321 | |
970 | if (exists $msg->{npc_dialog}) { |
1322 | if (exists $msg{npc_dialog}) { |
971 | # start npc chat dialog |
1323 | # start npc chat dialog |
972 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1324 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
973 | dx => $x, |
1325 | token => $msg{npc_dialog}, |
974 | dy => $y, |
|
|
975 | title => "$msg->{npc_dialog} (NPC)", |
1326 | title => "$msg{npc_dialog}[0] (NPC)", |
976 | conn => $self, |
1327 | conn => $self, |
977 | ; |
1328 | ; |
978 | } |
1329 | } |
979 | }); |
1330 | }); |
980 | } |
1331 | } |
… | |
… | |
987 | |
1338 | |
988 | (delete $self->{npc_dialog})->destroy |
1339 | (delete $self->{npc_dialog})->destroy |
989 | if $self->{npc_dialog}; |
1340 | if $self->{npc_dialog}; |
990 | |
1341 | |
991 | $self->SUPER::destroy; |
1342 | $self->SUPER::destroy; |
|
|
1343 | |
|
|
1344 | %$self = (); |
992 | } |
1345 | } |
993 | |
1346 | |
994 | package CFPlus::NPCDialog; |
1347 | package CFPlus::NPCDialog; |
995 | |
1348 | |
996 | our @ISA = 'CFPlus::UI::Toplevel'; |
1349 | our @ISA = 'CFPlus::UI::Toplevel'; |
… | |
… | |
1043 | on_activate => sub { $this->destroy; 1 }, |
1396 | on_activate => sub { $this->destroy; 1 }, |
1044 | ; |
1397 | ; |
1045 | |
1398 | |
1046 | $self->update_options; |
1399 | $self->update_options; |
1047 | |
1400 | |
1048 | $self->{id} = $self->{conn}->send_ext_req ( |
1401 | $self->{id} = "npc-channel-" . $self->{conn}->token; |
1049 | npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, |
1402 | $self->{conn}->connect_ext ($self->{id} => sub { |
1050 | sub { $this && $this->feed (@_) } |
1403 | $this->feed (@_) if $this; |
1051 | ); |
1404 | }); |
|
|
1405 | |
|
|
1406 | $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token}); |
1052 | |
1407 | |
1053 | $self->{entry}->grab_focus; |
1408 | $self->{entry}->grab_focus; |
1054 | |
1409 | |
1055 | $self->{textview}->add_paragraph ({ |
1410 | $self->{textview}->add_paragraph ({ |
1056 | fg => [1, 1, 0, 1], |
1411 | fg => [1, 1, 0, 1], |
… | |
… | |
1079 | ); |
1434 | ); |
1080 | } |
1435 | } |
1081 | } |
1436 | } |
1082 | |
1437 | |
1083 | sub feed { |
1438 | sub feed { |
1084 | my ($self, $msg) = @_; |
1439 | my ($self, $type, @arg) = @_; |
1085 | |
1440 | |
1086 | CFPlus::weaken $self; |
1441 | CFPlus::weaken $self; |
1087 | |
1442 | |
1088 | if ($msg->{msgtype} eq "reply") { |
1443 | if ($type eq "update") { |
|
|
1444 | my (%info) = @arg; |
|
|
1445 | |
1089 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1446 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1090 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1447 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1091 | |
|
|
1092 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
|
|
1093 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1094 | my @link; |
|
|
1095 | $text =~ s{ |
|
|
1096 | ($match) |
|
|
1097 | }{ |
|
|
1098 | my $kw = $1; |
|
|
1099 | |
|
|
1100 | push @link, new CFPlus::UI::Label |
|
|
1101 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1102 | can_hover => 1, |
|
|
1103 | can_events => 1, |
|
|
1104 | padding_x => 0, |
|
|
1105 | padding_y => 0, |
|
|
1106 | on_button_up => sub { |
|
|
1107 | $self->send ($kw); |
|
|
1108 | }; |
|
|
1109 | |
|
|
1110 | "\x{fffc}" |
|
|
1111 | }giex; |
|
|
1112 | |
1448 | |
|
|
1449 | if (exists $info{msg}) { |
|
|
1450 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
|
|
1451 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1452 | my @link; |
|
|
1453 | $text =~ s{ |
|
|
1454 | ($match) |
|
|
1455 | }{ |
|
|
1456 | my $kw = $1; |
|
|
1457 | |
|
|
1458 | push @link, new CFPlus::UI::Label |
|
|
1459 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1460 | can_hover => 1, |
|
|
1461 | can_events => 1, |
|
|
1462 | padding_x => 0, |
|
|
1463 | padding_y => 0, |
|
|
1464 | on_button_up => sub { |
|
|
1465 | $self->send ($kw); |
|
|
1466 | }; |
|
|
1467 | |
|
|
1468 | "\x{fffc}" |
|
|
1469 | }giex; |
|
|
1470 | |
1113 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1471 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1114 | $self->{textview}->scroll_to_bottom; |
1472 | $self->{textview}->scroll_to_bottom; |
|
|
1473 | } |
|
|
1474 | |
1115 | $self->update_options; |
1475 | $self->update_options; |
1116 | } else { |
1476 | } else { |
1117 | $self->destroy; |
1477 | $self->destroy; |
1118 | } |
1478 | } |
1119 | |
1479 | |
… | |
… | |
1124 | my ($self, $msg) = @_; |
1484 | my ($self, $msg) = @_; |
1125 | |
1485 | |
1126 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1486 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1127 | $self->{textview}->scroll_to_bottom; |
1487 | $self->{textview}->scroll_to_bottom; |
1128 | |
1488 | |
1129 | $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); |
1489 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1130 | } |
1490 | } |
1131 | |
1491 | |
1132 | sub destroy { |
1492 | sub destroy { |
1133 | my ($self) = @_; |
1493 | my ($self) = @_; |
1134 | |
1494 | |
1135 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1495 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1136 | |
1496 | |
1137 | if ($self->{conn}) { |
1497 | if ($self->{conn}) { |
1138 | $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; |
1498 | $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; |
1139 | delete $self->{conn}{npc_dialog}; |
1499 | delete $self->{conn}{npc_dialog}; |
1140 | $self->{conn}->disconnect_ext ($self->{id}); |
1500 | $self->{conn}->disconnect_ext ($self->{id}); |
1141 | } |
1501 | } |
1142 | |
1502 | |
1143 | $self->SUPER::destroy; |
1503 | $self->SUPER::destroy; |