ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
Revision: 1.95
Committed: Wed Apr 4 02:43:30 2007 UTC (17 years, 2 months ago) by root
Branch: MAIN
Changes since 1.94: +18 -0 lines
Log Message:
support new tileset negotiation

File Contents

# User Rev Content
1 root 1.69 package CFPlus::Protocol;
2 root 1.1
3     use utf8;
4     use strict;
5    
6 root 1.2 use Crossfire::Protocol::Constants;
7    
8 root 1.69 use CFPlus;
9     use CFPlus::UI;
10     use CFPlus::Pod;
11 root 1.91 use CFPlus::Macro;
12     use CFPlus::Item;
13 root 1.1
14 root 1.87 use Crossfire::Protocol::Base 0.95;
15    
16 root 1.1 use base 'Crossfire::Protocol::Base';
17    
18     sub new {
19     my $class = shift;
20    
21 root 1.82 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
22 root 1.1
23     $self->{map_widget}->clr_commands;
24    
25 root 1.72 my @cmd_help = map {
26     $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27     or die "unparseable command help: $_->{kw}[0]";
28    
29     my $cmd = $1;
30     my @args = split /\|/, $2;
31     @args = (".*") unless @args;
32    
33     my (undef, @par) = CFPlus::Pod::section_of $_;
34     my $text = CFPlus::Pod::as_label @par;
35    
36     $_ = $_ eq ".*" ? "" : " $_"
37     for @args;
38    
39     map ["$cmd$_", $text],
40     sort { (length $a) <=> (length $b) }
41     @args
42 root 1.74 } sort { $a->{par} <=> $b->{par} }
43 root 1.77 CFPlus::Pod::find command => "*";
44 root 1.1
45 root 1.95 $self->connect_ext (event_capabilities => sub {
46     my ($cap) = @_;
47    
48     if (my $ts = $cap->{tileset}) {
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     }
59     }
60     });
61    
62 root 1.72 $self->{map_widget}->add_command (@$_)
63     for @cmd_help;
64 root 1.1
65 root 1.69 $self->{noface} = new_from_file CFPlus::Texture
66     CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
67 root 1.1
68 root 1.83 {
69     $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
70     CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
71     $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
72     }
73    
74 root 1.1 $self->{open_container} = 0;
75    
76     # "global"
77 root 1.79 $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 root 1.1
82     # per server
83 root 1.79 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
84     or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
85 root 1.1
86     $self
87     }
88    
89 elmex 1.34 sub logprint {
90     my ($self, @a) = @_;
91    
92 root 1.59 $self->{log_fh} ||= do {
93     my $path = "$Crossfire::VARDIR/log.$self->{host}";
94    
95     open my $fh, ">>:utf8", $path
96     or die "Couldn't open logfile $path: $!";
97 elmex 1.34
98 root 1.59 $fh->autoflush (1);
99    
100     $fh;
101     };
102 elmex 1.34
103 root 1.59 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
104 elmex 1.34
105     my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
106     $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
107    
108 root 1.59 print {$self->{log_fh}} "$ts ", @a, "\n";
109 elmex 1.34 }
110    
111 root 1.52 sub _stat_numdiff {
112 root 1.54 my ($self, $name, $old, $new) = @_;
113 root 1.52
114     my $diff = $new - $old;
115 root 1.54
116     $diff = 0.01 * int $diff * 100;
117    
118     0.1 >= abs $diff ? ()
119     : $diff < 0 ? "$name$diff" : "$name+$diff"
120 root 1.52 }
121    
122     sub _stat_skillmaskdiff {
123 root 1.54 my ($self, $name, $old, $new) = @_;
124 root 1.52
125 root 1.54 my $diff = $old ^ $new
126     or return;
127 root 1.52
128 root 1.53 my @diff = map
129     {
130     $diff & $_
131     ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
132     : ()
133     }
134     sort { $a <=> $b } keys %{$self->{spell_paths}};
135 root 1.52
136     join "", @diff
137     }
138    
139     # all stats that are chacked against changes
140     my @statchange = (
141     [&CS_STAT_STR => \&_stat_numdiff, "Str"],
142     [&CS_STAT_INT => \&_stat_numdiff, "Int"],
143     [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
144     [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
145     [&CS_STAT_CON => \&_stat_numdiff, "Con"],
146     [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
147     [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
148     [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
149     [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
150     [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
151     [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
152     [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
153     [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
154     [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
155     [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
156     [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
157     [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
158     [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
159     [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
160     [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
161     [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
162     [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
163     [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
164     [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
165     [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
166     [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
167     [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
168     [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
169     [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
170     [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
171     [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
172     [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
173     [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
174     [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
175     [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
176     [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
177     [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
178     );
179    
180 root 1.1 sub stats_update {
181     my ($self, $stats) = @_;
182    
183 root 1.59 my $prev = $self->{prev_stats} || { };
184    
185     if (my @diffs =
186     (
187     ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
188     map {
189     $stats->{$_} && $prev->{$_}
190     && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
191     } sort { $a <=> $b } keys %{$self->{skill_info}}
192     )
193     ) {
194     my $msg = join " ", @diffs;
195     $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
196     }
197    
198     if (
199     my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
200     ) {
201     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);
203     }
204    
205     $self->update_stats_window ($stats, $prev);
206    
207     $self->{prev_stats} = { %$stats };
208     }
209    
210     my %RES_TBL = (
211     phys => CS_STAT_RES_PHYS,
212     magic => CS_STAT_RES_MAG,
213     fire => CS_STAT_RES_FIRE,
214     elec => CS_STAT_RES_ELEC,
215     cold => CS_STAT_RES_COLD,
216     conf => CS_STAT_RES_CONF,
217     acid => CS_STAT_RES_ACID,
218     drain => CS_STAT_RES_DRAIN,
219     ghit => CS_STAT_RES_GHOSTHIT,
220     pois => CS_STAT_RES_POISON,
221     slow => CS_STAT_RES_SLOW,
222     para => CS_STAT_RES_PARA,
223     tund => CS_STAT_TURN_UNDEAD,
224     fear => CS_STAT_RES_FEAR,
225     depl => CS_STAT_RES_DEPLETE,
226     deat => CS_STAT_RES_DEATH,
227     holyw => CS_STAT_RES_HOLYWORD,
228     blind => CS_STAT_RES_BLIND,
229     );
230    
231     sub update_stats_window {
232     my ($self, $stats, $prev) = @_;
233    
234     # I love text protocols...
235 root 1.52
236 root 1.59 my $hp = $stats->{+CS_STAT_HP} * 1;
237     my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
238     my $sp = $stats->{+CS_STAT_SP} * 1;
239     my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
240     my $fo = $stats->{+CS_STAT_FOOD} * 1;
241     my $fo_m = 999;
242     my $gr = $stats->{+CS_STAT_GRACE} * 1;
243     my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
244    
245     $::GAUGES->{hp} ->set_value ($hp, $hp_m);
246     $::GAUGES->{mana} ->set_value ($sp, $sp_m);
247     $::GAUGES->{food} ->set_value ($fo, $fo_m);
248     $::GAUGES->{grace} ->set_value ($gr, $gr_m);
249     $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
250     . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
251     my $rng = $stats->{+CS_STAT_RANGE};
252     $rng =~ s/^Range: //; # thank you so much dear server
253     $::GAUGES->{range} ->set_text ("Rng: " . $rng);
254     my $title = $stats->{+CS_STAT_TITLE};
255     $title =~ s/^Player: //;
256     $::STATWIDS->{title} ->set_text ("Title: " . $title);
257    
258     $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
259     $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
260     $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
261     $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
262     $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
263     $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
264     $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
265     $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
266     $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
267     $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
268     $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
269     $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
270     $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
271    
272 root 1.64 $self->update_weight;
273 root 1.59
274     $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
275     for keys %RES_TBL;
276    
277     my $sktbl = $::STATWIDS->{skill_tbl};
278     my @skills = keys %{ $self->{skill_info} };
279    
280     if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
281     $sktbl->clear;
282    
283 root 1.69 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
284     $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
285     $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
286     $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
287     $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
288     $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
289 root 1.59
290 elmex 1.68 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
291    
292     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);
294    
295 root 1.65 my ($x, $y) = (0, 1);
296 root 1.59 for (
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 root 1.52 ) {
302 root 1.59 my ($idx, $name) = @$_;
303    
304 elmex 1.68 my $spell_cb = sub {
305     my ($widget, $ev) = @_;
306    
307     if ($ev->{button} == 1) {
308     $::CONN->user_send ("ready_skill $name");
309     } elsif ($ev->{button} == 2) {
310     $::CONN->user_send ("use_skill $name");
311     } elsif ($ev->{button} == 3) {
312 root 1.90 my $shortname = CFPlus::shorten $name, 14;
313 root 1.69 (new CFPlus::UI::Menu
314 elmex 1.68 items => [
315 root 1.91 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
316     ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
317 elmex 1.68 ],
318     )->popup ($ev);
319     } else {
320     return 0;
321     }
322    
323     1
324     };
325    
326 root 1.69 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
327 elmex 1.68 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
328 root 1.69 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
329 elmex 1.68 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
330 root 1.74 $sktbl->add ($x * 3 + 2, $y, 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);
332 root 1.59
333     $x++ and ($x, $y) = (0, $y + 1);
334 root 1.52 }
335 root 1.1 }
336    
337 root 1.59 for (grep exists $stats->{$_}, @skills) {
338     $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
339     $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
340     }
341 root 1.1 }
342    
343 root 1.91 sub macro_send {
344     my ($self, $macro) = @_;
345    
346     for my $cmd (@{ $macro->{action} }) {
347     $self->send_command ($cmd);
348     }
349     }
350    
351 root 1.1 sub user_send {
352     my ($self, $command) = @_;
353    
354 root 1.91 $self->{record}->($command)
355 root 1.87 if $self->{record};
356 elmex 1.9
357 elmex 1.34 $self->logprint ("send: ", $command);
358 root 1.1 $self->send_command ($command);
359 root 1.45 ::status ($command);
360 root 1.1 }
361    
362 root 1.91 sub record {
363     my ($self, $cb) = @_;
364 elmex 1.9
365 root 1.91 $self->{record} = $cb;
366 elmex 1.9 }
367    
368 root 1.1 sub map_scroll {
369     my ($self, $dx, $dy) = @_;
370    
371     $self->{map}->scroll ($dx, $dy);
372     }
373    
374     sub feed_map1a {
375     my ($self, $data) = @_;
376    
377 root 1.79 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
378 root 1.1 $self->{map_widget}->update;
379     }
380    
381 root 1.36 sub magicmap {
382     my ($self, $w, $h, $x, $y, $data) = @_;
383    
384     $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
385     }
386    
387 root 1.1 sub flush_map {
388     my ($self) = @_;
389    
390     my $map_info = delete $self->{map_info}
391     or return;
392    
393     my ($hash, $x, $y, $w, $h) = @$map_info;
394    
395     my $data = $self->{map}->get_rect ($x, $y, $w, $h);
396     $self->{mapcache}->put ($hash => Compress::LZF::compress $data);
397     #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
398     }
399    
400     sub map_clear {
401     my ($self) = @_;
402    
403     $self->flush_map;
404     delete $self->{neigh_map};
405    
406     $self->{map}->clear;
407 root 1.37 delete $self->{map_widget}{magicmap};
408 root 1.1 }
409    
410    
411     sub load_map($$$) {
412     my ($self, $hash, $x, $y) = @_;
413    
414     if (defined (my $data = $self->{mapcache}->get ($hash))) {
415     $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    
421     $self->set_texture ($id => $data);
422     }
423     }
424     }
425    
426     # hardcode /world/world_xxx_xxx map names, the savings are enourmous,
427     # (server resource,s latency, bandwidth), so this hack is warranted.
428     # the right fix is to make real tiled maps with an overview file
429     sub send_mapinfo {
430     my ($self, $data, $cb) = @_;
431    
432     if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
433     my ($wx, $wy) = ($1, $2);
434    
435     if ($data =~ /^spatial ([1-4]+)$/) {
436     my @dx = (0, 0, 1, 0, -1);
437     my @dy = (0, -1, 0, 1, 0);
438     my ($dx, $dy);
439    
440     for (split //, $1) {
441     $dx += $dx[$_];
442     $dy += $dy[$_];
443     }
444    
445     $cb->(spatial => 15,
446     $self->{map_info}[1] - $self->{map}->ox + $dx * 50,
447     $self->{map_info}[2] - $self->{map}->oy + $dy * 50,
448     50, 50,
449     sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
450     );
451    
452     return;
453     }
454     }
455    
456     $self->SUPER::send_mapinfo ($data, $cb);
457     }
458    
459     # this method does a "flood fill" into every tile direction
460     # it assumes that tiles are arranged in a rectangular grid,
461     # i.e. a map is the same as the left of the right map etc.
462     # failure to comply are harmless and result in display errors
463     # at worst.
464     sub flood_fill {
465     my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
466    
467     # the server does not allow map paths > 6
468     return if 7 <= length $path;
469    
470     my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
471    
472     for (
473     [1, 3, 0, -1],
474     [2, 4, 1, 0],
475     [3, 1, 0, 1],
476     [4, 2, -1, 0],
477     ) {
478     my ($tile, $tile2, $dx, $dy) = @$_;
479    
480     next if $block & (1 << $tile);
481     my $block = $block | (1 << $tile2);
482    
483     my $gx = $gx + $dx;
484     my $gy = $gy + $dy;
485    
486     next unless $flags & (1 << ($tile - 1));
487     next if $self->{neigh_grid}{$gx, $gy}++;
488    
489     my $neigh = $self->{neigh_map}{$hash} ||= [];
490     if (my $info = $neigh->[$tile]) {
491     my ($flags, $x, $y, $w, $h, $hash) = @$info;
492    
493     $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
494     if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
495    
496     } else {
497     $self->send_mapinfo ("spatial $path$tile", sub {
498     my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
499    
500     return if $mode ne "spatial";
501    
502     $x += $self->{map}->ox;
503     $y += $self->{map}->oy;
504    
505     $self->load_map ($hash, $x, $y)
506     unless $self->{neigh_map}{$hash}[5]++;#d#
507    
508     $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
509    
510     $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
511     if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
512     });
513     }
514     }
515     }
516    
517     sub map_change {
518     my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
519    
520     $self->flush_map;
521    
522     my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
523    
524     my $mapmapw = $self->{mapmap}->{w};
525     my $mapmaph = $self->{mapmap}->{h};
526    
527     $self->{neigh_rect} = [
528     $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
529     $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
530     ];
531    
532     delete $self->{neigh_grid};
533    
534     $x += $ox;
535     $y += $oy;
536    
537     $self->{map_info} = [$hash, $x, $y, $w, $h];
538    
539     (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
540     $::STATWIDS->{map}->set_text ("Map: " . $map);
541    
542     $self->load_map ($hash, $x, $y);
543     $self->flood_fill (0, 0, 0, "", $hash, $flags);
544     }
545    
546     sub face_find {
547     my ($self, $facenum, $face) = @_;
548    
549     my $hash = "$face->{chksum},$face->{name}";
550    
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 root 1.69 my $txn = $CFPlus::DB_ENV->txn_begin;
558 root 1.15 my $status = $self->{facemap}->db_get (id => $id);
559 root 1.1 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
560 root 1.35 $id = ($id || 64) + 1;
561 root 1.1 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 root 1.15 $txn->txn_abort;
569 root 1.1 }
570    
571 root 1.69 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
572 root 1.1 }
573    
574     gotid:
575     $face->{id} = $id;
576     $self->{map}->set_face ($facenum => $id);
577     $self->{faceid}[$facenum] = $id;#d#
578    
579     my $face = $self->{tilecache}->get ($id);
580    
581     if ($face) {
582     #$self->face_prefetch;
583     $face
584     } else {
585     my $tex = $self->{noface};
586     $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
587     undef
588     };
589     }
590    
591     sub face_update {
592 root 1.58 my ($self, $facenum, $face, $changed) = @_;
593 root 1.1
594 root 1.58 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
595 root 1.1
596     $self->set_texture ($face->{id} => delete $face->{image});
597     }
598    
599     sub set_texture {
600     my ($self, $id, $data) = @_;
601    
602     $self->{texture}[$id] ||= do {
603     my $tex =
604 root 1.69 new_from_image CFPlus::Texture
605 root 1.1 $data, minify => 1, mipmap => 1;
606    
607     $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
608     $self->{map_widget}->update;
609    
610     $tex
611     };
612     }
613    
614     sub sound_play {
615     my ($self, $x, $y, $soundnum, $type) = @_;
616    
617     $self->{sound_play}->($x, $y, $soundnum, $type);
618     }
619    
620     my $LAST_QUERY; # server is stupid, stupid, stupid
621    
622     sub query {
623     my ($self, $flags, $prompt) = @_;
624    
625     $prompt = $LAST_QUERY unless length $prompt;
626     $LAST_QUERY = $prompt;
627    
628 root 1.22 $self->{query}-> ($self, $flags, $prompt);
629 root 1.1 }
630    
631     sub drawinfo {
632     my ($self, $color, $text) = @_;
633    
634     my @color = (
635     [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
636     [1.00, 1.00, 1.00],
637     [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
638     [1.00, 0.00, 0.00],
639     [1.00, 0.54, 0.00],
640     [0.11, 0.56, 1.00],
641     [0.93, 0.46, 0.00],
642     [0.18, 0.54, 0.34],
643     [0.56, 0.73, 0.56],
644     [0.80, 0.80, 0.80],
645 root 1.61 [0.75, 0.61, 0.20],
646 root 1.1 [0.99, 0.77, 0.26],
647     [0.74, 0.65, 0.41],
648     );
649    
650 root 1.93 my $fg = $color[$color % @color];
651    
652 elmex 1.34 $self->logprint ("info: ", $text);
653    
654 root 1.23 # try to create single paragraphs of multiple lines sent by the server
655 root 1.24 $text =~ s/(?<=\S)\n(?=\w)/ /g;
656 root 1.23
657 root 1.69 $text = CFPlus::asxml $text;
658 root 1.1 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
659     $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
660    
661 root 1.93 ::message ({ fg => $fg, markup => $_ })
662 root 1.86 for split /\n/, $text;
663 root 1.1
664 elmex 1.5 $self->{statusbox}->add ($text,
665 root 1.1 group => $text,
666 root 1.93 fg => $fg,
667 root 1.71 timeout => $color >= 2 ? 180 : 10,
668 root 1.1 tooltip_font => $::FONT_FIXED,
669     );
670     }
671    
672     sub drawextinfo {
673     my ($self, $color, $type, $subtype, $message) = @_;
674    
675     $self->drawinfo ($color, $message);
676     }
677    
678     sub spell_add {
679     my ($self, $spell) = @_;
680    
681 root 1.66 # try to create single paragraphs out of the multiple lines sent by the server
682 root 1.27 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
683     $spell->{message} =~ s/\n+$//;
684     $spell->{message} ||= "Server did not provide a description for this spell.";
685    
686 root 1.88 $::SPELL_LIST->add_spell ($spell);
687 elmex 1.14
688 root 1.69 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
689     $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
690 root 1.1 }
691    
692     sub spell_delete {
693     my ($self, $spell) = @_;
694 root 1.51
695 root 1.88 $::SPELL_LIST->remove_spell ($spell);
696 root 1.1 }
697    
698 root 1.87 sub setup {
699     my ($self, $setup) = @_;
700    
701 root 1.95 $self->{map_widget}->set_tilesize ($self->{tilesize});
702 root 1.87 $::MAP->resize ($self->{mapw}, $self->{maph});
703     }
704    
705 root 1.1 sub addme_success {
706     my ($self) = @_;
707    
708 root 1.72 my %skill_help;
709 root 1.21
710 root 1.72 for my $node (CFPlus::Pod::find skill_description => "*") {
711     my (undef, @par) = CFPlus::Pod::section_of $node;
712     $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
713 root 1.21 };
714 root 1.72
715 root 1.1 for my $skill (values %{$self->{skill_info}}) {
716     $self->{map_widget}->add_command ("ready_skill $skill",
717 root 1.69 (CFPlus::asxml "Ready the skill '$skill'\n\n")
718 root 1.72 . $skill_help{$skill});
719 root 1.1 $self->{map_widget}->add_command ("use_skill $skill",
720 root 1.69 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
721 root 1.72 . $skill_help{$skill});
722 root 1.1 }
723     }
724    
725     sub eof {
726     my ($self) = @_;
727    
728     $self->{map_widget}->clr_commands;
729    
730     ::stop_game ();
731     }
732    
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 root 1.69 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
756 root 1.19 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
757 root 1.1 } elsif (!exists $self->{num_faces}) {
758     $self->send ("requestinfo image_info");
759    
760     $self->{num_faces} = 0;
761    
762 root 1.69 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
763 root 1.19 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
764 root 1.1 }
765     }
766    
767     sub update_floorbox {
768 root 1.69 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
769 root 1.1 return unless $::CONN;
770 elmex 1.62
771 root 1.1 $::FLOORBOX->clear;
772    
773     my $row;
774 elmex 1.62 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
775 root 1.25 if ($row < 6) {
776 root 1.1 local $_->{face_widget}; # hack to force recreation of widget
777     local $_->{desc_widget}; # hack to force recreation of widget
778 root 1.69 CFPlus::Item::update_widgets $_;
779 root 1.1
780     $::FLOORBOX->add (0, $row, $_->{face_widget});
781     $::FLOORBOX->add (1, $row, $_->{desc_widget});
782    
783     $row++;
784     } else {
785 root 1.69 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
786 root 1.30 text => "More...",
787 root 1.51 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
788 root 1.25 );
789 root 1.1 last;
790     }
791     }
792 elmex 1.62 if ($::CONN->{open_container}) {
793 root 1.69 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
794 elmex 1.62 text => "Close container",
795     on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
796     );
797     }
798 root 1.1 });
799 elmex 1.62
800 root 1.1 $::WANT_REFRESH++;
801     }
802    
803     sub set_opencont {
804     my ($conn, $tag, $name) = @_;
805     $conn->{open_container} = $tag;
806 elmex 1.62 update_floorbox;
807 elmex 1.10
808     $::INV_RIGHT_HB->clear ();
809 root 1.69 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
810 elmex 1.10
811     if ($tag != 0) { # Floor isn't closable, is it?
812 root 1.69 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
813 elmex 1.10 text => "Close container",
814     tooltip => "Close the currently open container (if one is open)",
815     on_activate => sub {
816     $::CONN->send ("apply $tag") # $::CONN->{open_container}")
817     if $tag != 0;
818     #if $CONN->{open_container} != 0;
819 root 1.38 0
820 elmex 1.10 },
821     );
822     }
823    
824 root 1.1 $::INVR->set_items ($conn->{container}{$tag});
825     }
826    
827 root 1.47 sub update_containers {
828     my ($self) = @_;
829 root 1.1
830 root 1.69 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
831 root 1.55 my $todo = delete $self->{update_container}
832     or return;
833    
834     for my $tag (keys %$todo) {
835 elmex 1.62 update_floorbox if $tag == 0 or $tag == $self->{open_container};
836 root 1.47 if ($tag == 0) {
837 root 1.48 $::INVR->set_items ($self->{container}{0})
838     if $tag == $self->{open_container};
839 root 1.47 } elsif ($tag == $self->{player}{tag}) {
840     $::INV->set_items ($self->{container}{$tag})
841     } else {
842 root 1.48 $::INVR->set_items ($self->{container}{$tag})
843     if $tag == $self->{open_container};
844 root 1.47 }
845     }
846     });
847 root 1.1 }
848    
849 root 1.48 sub container_add {
850     my ($self, $tag, $items) = @_;
851    
852     $self->{update_container}{$tag}++;
853     $self->update_containers;
854     }
855    
856 root 1.1 sub container_clear {
857     my ($self, $tag) = @_;
858    
859 root 1.47 $self->{update_container}{$tag}++;
860     $self->update_containers;
861 root 1.1 }
862    
863     sub item_delete {
864     my ($self, @items) = @_;
865    
866 root 1.49 $self->{update_container}{$_->{container}}++
867 root 1.47 for @items;
868    
869     $self->update_containers;
870 root 1.1 }
871    
872     sub item_update {
873     my ($self, $item) = @_;
874    
875     #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
876    
877 root 1.69 CFPlus::Item::update_widgets $item;
878 root 1.1
879 root 1.2 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
880 root 1.1 set_opencont ($::CONN, 0, "Floor");
881    
882 root 1.2 } elsif ($item->{flags} & F_OPEN) {
883 root 1.69 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
884 root 1.47
885 root 1.1 } else {
886 root 1.47 $self->{update_container}{$item->{container}}++;
887     $self->update_containers;
888 root 1.1 }
889     }
890    
891 elmex 1.3 sub player_update {
892     my ($self, $player) = @_;
893 root 1.64
894     $self->update_weight;
895     }
896    
897     sub update_weight {
898     my ($self) = @_;
899    
900     my $weight = .001 * $self->{player}{weight};
901     my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
902    
903     $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
904     $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
905     $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
906 root 1.28 }
907    
908 root 1.32 sub update_server_info {
909     my ($self) = @_;
910    
911     my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
912    
913     $::SERVER_INFO->set_markup (
914     "server <tt>$self->{host}:$self->{port}</tt>\n"
915     . "protocol version <tt>$self->{version}</tt>\n"
916     . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
917     . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
918 root 1.86 . "editing support $yesno[!!$self->{editor_support}]\n"
919 root 1.80 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
920 root 1.32 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
921     . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
922     . "map size $self->{mapw}×$self->{maph}\n"
923     );
924 elmex 1.89
925     ::setup_build_button ($self->{editor_support}->{builder_ui});
926 root 1.32 }
927    
928 root 1.28 sub logged_in {
929     my ($self) = @_;
930    
931 root 1.70 $self->send_ext_req (cfplus_support => version => 1, sub {
932     $self->{cfplus_ext} = $_[0]{version};
933 root 1.32 $self->update_server_info;
934 root 1.70
935 root 1.85 if ($self->{cfplus_ext} >= 2) {
936     $self->send_ext_req ("editor_support", sub {
937 root 1.86 $self->{editor_support} = $_[0];
938 root 1.85 $self->update_server_info;
939    
940     0
941     });
942     }
943    
944 root 1.70 0
945 root 1.32 });
946 root 1.31
947 root 1.32 $self->update_server_info;
948 root 1.13
949     $self->send_command ("output-sync $::CFG->{output_sync}");
950     $self->send_command ("output-count $::CFG->{output_count}");
951 root 1.94 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
952 root 1.29 $self->send_command ("pickup $::CFG->{pickup}");
953 elmex 1.3 }
954    
955 elmex 1.89 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 root 1.32 sub lookat {
964     my ($self, $x, $y) = @_;
965    
966     if ($self->{cfplus_ext}) {
967 root 1.70 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
968     my ($msg) = @_;
969 root 1.32
970 root 1.70 if (exists $msg->{npc_dialog}) {
971 root 1.32 # start npc chat dialog
972 root 1.69 $self->{npc_dialog} = new CFPlus::NPCDialog::
973 root 1.32 dx => $x,
974     dy => $y,
975 root 1.70 title => "$msg->{npc_dialog} (NPC)",
976 root 1.32 conn => $self,
977     ;
978     }
979     });
980     }
981    
982     $self->send ("lookat $x $y");
983     }
984    
985     sub destroy {
986     my ($self) = @_;
987    
988 root 1.79 (delete $self->{npc_dialog})->destroy
989 root 1.32 if $self->{npc_dialog};
990    
991     $self->SUPER::destroy;
992     }
993    
994 root 1.69 package CFPlus::NPCDialog;
995 root 1.32
996 root 1.76 our @ISA = 'CFPlus::UI::Toplevel';
997 root 1.32
998     sub new {
999     my $class = shift;
1000    
1001     my $self = $class->SUPER::new (
1002     x => 'center',
1003     y => 'center',
1004     name => "npc_dialog",
1005     force_w => $::WIDTH * 0.7,
1006     force_h => $::HEIGHT * 0.7,
1007     title => "NPC Dialog",
1008     kw => { hi => 0, yes => 0, no => 0 },
1009 root 1.64 has_close_button => 1,
1010 root 1.32 @_,
1011     );
1012    
1013 root 1.92 CFPlus::weaken (my $this = $self);
1014 root 1.32
1015 root 1.64 $self->connect (delete => sub { $this->destroy; 1 });
1016    
1017 root 1.32 # better use a pane...
1018 root 1.69 $self->add (my $hbox = new CFPlus::UI::HBox);
1019     $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
1020 root 1.32
1021 root 1.69 $hbox->add (my $vbox = new CFPlus::UI::VBox);
1022 root 1.32
1023 root 1.69 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
1024     $vbox->add ($self->{entry} = new CFPlus::UI::Entry
1025 root 1.73 tooltip => "#npc_message_entry",
1026 root 1.32 on_activate => sub {
1027     my ($entry, $text) = @_;
1028    
1029     return unless $text =~ /\S/;
1030    
1031     $entry->set_text ("");
1032     $this->send ($text);
1033 root 1.38
1034     0
1035 root 1.32 },
1036     );
1037    
1038 root 1.69 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
1039 root 1.32
1040 root 1.69 $self->{bye_button} = new CFPlus::UI::Button
1041 root 1.32 text => "Bye (close)",
1042     tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1043 root 1.64 on_activate => sub { $this->destroy; 1 },
1044 root 1.32 ;
1045    
1046     $self->update_options;
1047    
1048 root 1.70 $self->{id} = $self->{conn}->send_ext_req (
1049     npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1050     sub { $this && $this->feed (@_) }
1051     );
1052 root 1.32
1053 root 1.38 $self->{entry}->grab_focus;
1054 root 1.32
1055 root 1.67 $self->{textview}->add_paragraph ({
1056     fg => [1, 1, 0, 1],
1057     markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1058     });
1059 root 1.32
1060     $self->show;
1061     $self
1062     };
1063    
1064     sub update_options {
1065     my ($self) = @_;
1066    
1067 root 1.92 CFPlus::weaken $self;
1068 root 1.32
1069     $self->{options}->clear;
1070 root 1.39 $self->{options}->add ($self->{bye_button});
1071 root 1.32
1072     for my $kw (sort keys %{ $self->{kw} }) {
1073 root 1.69 $self->{options}->add (new CFPlus::UI::Button
1074 root 1.32 text => $kw,
1075     on_activate => sub {
1076     $self->send ($kw);
1077 root 1.38 0
1078 root 1.32 },
1079     );
1080     }
1081     }
1082    
1083     sub feed {
1084 root 1.70 my ($self, $msg) = @_;
1085 root 1.32
1086 root 1.92 CFPlus::weaken $self;
1087 root 1.42
1088 root 1.70 if ($msg->{msgtype} eq "reply") {
1089     $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1090     $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1091 root 1.61
1092 root 1.70 my $text = "\n" . CFPlus::asxml $msg->{msg};
1093 root 1.32 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1094 root 1.41 my @link;
1095 root 1.70 $text =~ s{
1096 root 1.41 ($match)
1097     }{
1098 root 1.42 my $kw = $1;
1099    
1100 root 1.69 push @link, new CFPlus::UI::Label
1101 root 1.42 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1102 root 1.41 can_hover => 1,
1103 root 1.42 can_events => 1,
1104 root 1.43 padding_x => 0,
1105     padding_y => 0,
1106 root 1.42 on_button_up => sub {
1107     $self->send ($kw);
1108     };
1109 root 1.41
1110 root 1.75 "\x{fffc}"
1111 root 1.41 }giex;
1112 root 1.32
1113 root 1.70 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1114 root 1.42 $self->{textview}->scroll_to_bottom;
1115 root 1.32 $self->update_options;
1116     } else {
1117     $self->destroy;
1118     }
1119    
1120     1
1121     }
1122    
1123     sub send {
1124     my ($self, $msg) = @_;
1125    
1126 root 1.69 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1127 root 1.42 $self->{textview}->scroll_to_bottom;
1128 root 1.61
1129 root 1.70 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1130 root 1.32 }
1131    
1132     sub destroy {
1133     my ($self) = @_;
1134    
1135 root 1.39 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1136 root 1.32
1137 root 1.70 if ($self->{conn}) {
1138     $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1139     delete $self->{conn}{npc_dialog};
1140     $self->{conn}->disconnect_ext ($self->{id});
1141     }
1142 root 1.32
1143     $self->SUPER::destroy;
1144     }
1145    
1146 root 1.67 1
1147 root 1.84