ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.121 by root, Sat Jul 14 13:08:40 2007 UTC vs.
Revision 1.130 by root, Tue Jul 24 00:28:07 2007 UTC

… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (event_music => sub { 53 $self->connect_ext (music => sub {
54 my ($ev) = @_; 54 my (%ev) = @_;
55 55
56 return unless $::CFG->{bgm_enable}; 56 return unless $::CFG->{bgm_enable};
57 57
58 my $faces = $ev->{faces}; 58 my $faces = $ev{faces};
59 my @songs; 59 my @songs;
60 60
61 # request music from server if appropriate 61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) { 62 if (my $faces = $ev{faces}) {
63 for (@$faces) { 63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_; 64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum; 65 utf8::downgrade $chksum;
66 66
67 $chksum = unpack "H*", $chksum; 67 $chksum = unpack "H*", $chksum;
… …
97 } 97 }
98 } 98 }
99 } 99 }
100 } 100 }
101 101
102 if (my $play = $ev->{play}) { 102 if (my $play = $ev{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); 103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 } 104 }
105 }); 105 });
106 106
107 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (capabilities => sub {
108 my ($cap) = @_; 108 my (%cap) = @_;
109 109
110 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 112 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 113 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]); 114 $self->setup_req (tileset => $default->[0]);
115 115
… …
121 } 121 }
122 }); 122 });
123 123
124 $self->{json_coder} 124 $self->{json_coder}
125 ->convert_blessed 125 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
128 }); 128 });
129 129
130 # widgetset new
130 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
131 my ($arg) = @_; 132 my ($id) = @_;
132 133
133 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$id} = {
134 w => {}, 135 w => {},
135 }; 136 };
136 }); 137 });
137 138
139 # widgetset destroy
138 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
139 my ($arg) = @_; 141 my ($id) = @_;
140 142
141 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$id}
142 or return; 144 or return;
143 145
144 $_->destroy 146 $_->destroy
145 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
146 }); 148 });
147 149
150 # widgetset create
148 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
149 my ($arg) = @_; 152 my ($ws, $id, $class, $args) = @_;
150
151 my $args = $arg->{args} || {};
152 153
153 for my $ev (grep /^on_/, keys %$args) { 154 for my $ev (grep /^on_/, keys %$args) {
154 $args->{$ev} = sub { 155 $args->{$ev} = sub {
155 my $id = shift->{s_id}; 156 my $id = shift->{s_id};
156 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 157 $self->send_exti_msg (w_e => $id, $ev, \@_);
157 158
158 1 159 1
159 }; 160 };
160 } 161 }
161 162
162 if (my $widget = eval { 163 if (my $widget = eval {
163 local $SIG{__DIE__}; 164 local $SIG{__DIE__};
164 "CFPlus::UI::$arg->{class}"->new ( 165 "CFPlus::UI::$class"->new (
165 %$args, 166 %$args,
166 s_ws => $arg->{ws}, 167 s_ws => $ws,
167 s_id => $arg->{id}, 168 s_id => $id,
168 ) 169 )
169 } 170 }
170 ) { 171 ) {
171 $self->{widget}{$arg->{id}} 172 $self->{widget}{$id}
172 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 173 = $self->{widgetset}{$ws}{w}{$id}
173 = $widget; 174 = $widget;
174 175
175 $widget->connect (on_destroy => sub { 176 $widget->connect (on_destroy => sub {
176 my ($widget) = @_; 177 my ($widget) = @_;
177 178
178 delete $self->{widget}{$widget->{s_id}}; 179 delete $self->{widget}{$widget->{s_id}};
179 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 180 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
180 }); 181 });
181 } else { 182 } else {
182 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 183 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
183 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 184 $self->send_exti_msg (w_e => $id, "destroy");
184 } 185 }
185 }); 186 });
186 187
188 # widget call
187 $self->connect_ext (w_c => sub { 189 $self->connect_ext (w_c => sub {
188 my ($arg) = @_; 190 my ($id, $rid, $method, $args) = @_;
189 191
190 my $w = $self->{widget}{$arg->{id}} 192 my $w = $self->{widget}{$id}
191 or return; 193 or return;
192 my $m = $arg->{name};
193 194
194 my $a = $arg->{args} || []; 195 $args ||= [];
195 196
196 if (exists $arg->{rid}) { 197 if ($rid) {
197 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 198 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
198 } else { 199 } else {
199 $w->$m (@$a); 200 $w->$method (@$args);
200 } 201 }
201 }); 202 });
202 203
204 # widget set
203 $self->connect_ext (w_s => sub { 205 $self->connect_ext (w_s => sub {
204 my ($arg) = @_; 206 my ($id, $attr) = @_;
205 207
206 my $w = $self->{widget}{$arg->{id}} 208 my $w = $self->{widget}{$id}
207 or return; 209 or return;
208 210
209 $w->{$arg->{name}} = $arg->{value}; 211 for (my $i = 0; $i < $#$attr; $i += 2) {
212 my ($member, $value) = @$attr[$i, $i+1];
213 if (defined $value) {
214 $w->{$member} = $value;
215 } else {
216 delete $w->{$member};
217 }
218 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
219 }
210 }); 220 });
211 221
222 # widget get
212 $self->connect_ext (w_g => sub { 223 $self->connect_ext (w_g => sub {
213 my ($arg) = @_; 224 my ($id, $rid, $attr) = @_;
214 225
215 my $w = $self->{widget}{$arg->{id}} 226 my $w = $self->{widget}{$id}
216 or return; 227 or return;
217 228
218 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
219 }); 230 });
220 231
232 # destroy widgets on logout
221 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
222 for my $ws (values %{delete $self->{widgetset} || {}}) { 234 for my $ws (values %{delete $self->{widgetset} || {}}) {
223 $_->destroy 235 $_->destroy
224 for values %{delete $ws->{w} || {}}; 236 for values %{delete $ws->{w} || {}};
225 } 237 }
… …
438 my @skills = keys %{ $self->{skill_info} }; 450 my @skills = keys %{ $self->{skill_info} };
439 451
440 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
441 $sktbl->clear; 453 $sktbl->clear;
442 454
455 my @add;
456
457 push @add,
443 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
444 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
445 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
446 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
447 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
448 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
449 465
450 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 466 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
451 467
452 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 468 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
453 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 469 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
481 } 497 }
482 498
483 1 499 1
484 }; 500 };
485 501
502 push @add,
486 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 503 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
487 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 504 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
488 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 505 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
489 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 506 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
490 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 507 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
491 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 508 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
509 ;
492 510
493 $x++ and ($x, $y) = (0, $y + 1); 511 $x++ and ($x, $y) = (0, $y + 1);
494 } 512 }
513
514 $sktbl->add_at (@add);
495 } 515 }
496 516
497 for (grep exists $stats->{$_}, @skills) { 517 for (grep exists $stats->{$_}, @skills) {
498 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
499 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
774 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
775 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
776 796
777 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
778 $self->{map_widget}->update; 798 $self->{map_widget}->update;
799
800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801}
802
803sub connect_face_update {
804 my ($self, $id, $cb) = @_;
805
806 push @{$self->{face_cb}{$id}}, $cb;
807
808 CFPlus::guard {
809 @{$self->{face_cb}{$id}}
810 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}};
812 }
779} 813}
780 814
781sub sound_play { 815sub sound_play {
782 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
783 817
… …
967 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
968 return unless $::CONN; 1002 return unless $::CONN;
969 1003
970 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
971 1005
1006 my @add;
1007
972 my $row; 1008 my $row;
973 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1009 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
974 if ($row < 6) { 1010 if ($row < 6) {
975 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
976 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
977 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
978 1014
1015 push @add,
979 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
980 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
981 1018
982 $row++; 1019 $row++;
983 } else { 1020 } else {
984 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
985 text => "More...", 1022 text => "More...",
986 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
987 ); 1024 ;
988 last; 1025 last;
989 } 1026 }
990 } 1027 }
991 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
992 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
993 text => "Close container", 1030 text => "Close container",
994 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
995 ); 1032 ;
996 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
997 }); 1036 });
998 1037
999 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
1000} 1039}
1001 1040
… …
1127} 1166}
1128 1167
1129sub logged_in { 1168sub logged_in {
1130 my ($self) = @_; 1169 my ($self) = @_;
1131 1170
1132 $self->send_ext_req (cfplus_support => version => 1, sub { 1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
1133 $self->{cfplus_ext} = $_[0]{version}; 1174 $self->{cfplus_ext} = $msg{version};
1134 $self->update_server_info; 1175 $self->update_server_info;
1135 1176
1136 if ($self->{cfplus_ext} >= 2) { 1177 if ($self->{cfplus_ext} >= 2) {
1137 $self->send_ext_req ("editor_support", sub { 1178 $self->send_ext_req ("editor_support", sub {
1138 $self->{editor_support} = $_[0]; 1179 $self->{editor_support} = { @_ };
1139 $self->update_server_info; 1180 $self->update_server_info;
1140 1181
1141 0 1182 0
1142 }); 1183 });
1143 } 1184 }
… …
1163 1204
1164sub lookat { 1205sub lookat {
1165 my ($self, $x, $y) = @_; 1206 my ($self, $x, $y) = @_;
1166 1207
1167 if ($self->{cfplus_ext}) { 1208 if ($self->{cfplus_ext}) {
1168 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1209 $self->send_ext_req (lookat => $x, $y, sub {
1169 my ($msg) = @_; 1210 my (%msg) = @_;
1170 1211
1171 if (exists $msg->{npc_dialog}) { 1212 if (exists $msg{npc_dialog}) {
1172 # start npc chat dialog 1213 # start npc chat dialog
1173 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
1174 dx => $x, 1215 token => $msg{npc_dialog},
1175 dy => $y,
1176 title => "$msg->{npc_dialog} (NPC)", 1216 title => "$msg{npc_dialog}[0] (NPC)",
1177 conn => $self, 1217 conn => $self,
1178 ; 1218 ;
1179 } 1219 }
1180 }); 1220 });
1181 } 1221 }
… …
1246 on_activate => sub { $this->destroy; 1 }, 1286 on_activate => sub { $this->destroy; 1 },
1247 ; 1287 ;
1248 1288
1249 $self->update_options; 1289 $self->update_options;
1250 1290
1251 $self->{id} = $self->{conn}->send_ext_req ( 1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1252 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1292 $self->{conn}->connect_ext ($self->{id} => sub {
1253 sub { $this && $this->feed (@_) } 1293 $this->feed (@_) if $this;
1254 ); 1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1255 1297
1256 $self->{entry}->grab_focus; 1298 $self->{entry}->grab_focus;
1257 1299
1258 $self->{textview}->add_paragraph ({ 1300 $self->{textview}->add_paragraph ({
1259 fg => [1, 1, 0, 1], 1301 fg => [1, 1, 0, 1],
… …
1282 ); 1324 );
1283 } 1325 }
1284} 1326}
1285 1327
1286sub feed { 1328sub feed {
1287 my ($self, $msg) = @_; 1329 my ($self, $type, @arg) = @_;
1288 1330
1289 CFPlus::weaken $self; 1331 CFPlus::weaken $self;
1290 1332
1291 if ($msg->{msgtype} eq "reply") { 1333 if ($type eq "update") {
1334 my (%info) = @arg;
1335
1292 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1293 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1294
1295 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1296 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1297 my @link;
1298 $text =~ s{
1299 ($match)
1300 }{
1301 my $kw = $1;
1302
1303 push @link, new CFPlus::UI::Label
1304 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1305 can_hover => 1,
1306 can_events => 1,
1307 padding_x => 0,
1308 padding_y => 0,
1309 on_button_up => sub {
1310 $self->send ($kw);
1311 };
1312
1313 "\x{fffc}"
1314 }giex;
1315 1338
1339 if (exists $info{msg}) {
1340 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1341 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1342 my @link;
1343 $text =~ s{
1344 ($match)
1345 }{
1346 my $kw = $1;
1347
1348 push @link, new CFPlus::UI::Label
1349 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1350 can_hover => 1,
1351 can_events => 1,
1352 padding_x => 0,
1353 padding_y => 0,
1354 on_button_up => sub {
1355 $self->send ($kw);
1356 };
1357
1358 "\x{fffc}"
1359 }giex;
1360
1316 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1317 $self->{textview}->scroll_to_bottom; 1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1318 $self->update_options; 1365 $self->update_options;
1319 } else { 1366 } else {
1320 $self->destroy; 1367 $self->destroy;
1321 } 1368 }
1322 1369
… …
1327 my ($self, $msg) = @_; 1374 my ($self, $msg) = @_;
1328 1375
1329 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1330 $self->{textview}->scroll_to_bottom; 1377 $self->{textview}->scroll_to_bottom;
1331 1378
1332 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1379 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1333} 1380}
1334 1381
1335sub destroy { 1382sub destroy {
1336 my ($self) = @_; 1383 my ($self) = @_;
1337 1384
1338 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1385 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1339 1386
1340 if ($self->{conn}) { 1387 if ($self->{conn}) {
1341 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1388 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1342 delete $self->{conn}{npc_dialog}; 1389 delete $self->{conn}{npc_dialog};
1343 $self->{conn}->disconnect_ext ($self->{id}); 1390 $self->{conn}->disconnect_ext ($self->{id});
1344 } 1391 }
1345 1392
1346 $self->SUPER::destroy; 1393 $self->SUPER::destroy;

Diff Legend

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