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.116 by root, Thu Jul 12 19:13:20 2007 UTC vs.
Revision 1.128 by root, Mon Jul 23 21:03:26 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;
68 $self->{music_map}{$face} = $chksum; 68 $self->{music_map}{$face} = $chksum;
69 69
70 # check if already cached 70 # check if already cached
71 CFPlus::DB::get resmap => $chksum, sub { 71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta) = @_; 72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
73 74
74 if (defined $meta) { 75 if (defined $meta_json) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
76 } else { 80 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); 81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub { 82 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1]; 83 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1]; 84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
81 85
82 CFPlus::DB::write_file $chksum, $data, sub { }; 86 CFPlus::DB::write_file $path, $data, sub {
83 CFPlus::DB::put resmap => $chksum => $meta, sub { }; 87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
86 ::message ({ markup => "downloaded song #$face, size $len octets" }); 92 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs}); 93 &::audio_music_set ($self->{songs});
94 };
95 };
89 }); 96 });
90 } 97 }
91 } 98 }
92 } 99 }
93 } 100 }
94 101
95 if (my $play = $ev->{play}) { 102 if (my $play = $ev{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); 103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 } 104 }
98 }); 105 });
99 106
100 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (capabilities => sub {
101 my ($cap) = @_; 108 my (%cap) = @_;
102 109
103 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap{tileset}) {
104 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
105 $self->{tileset} = $default; 112 $self->{tileset} = $default;
106 $self->{tilesize} = $default->[3]; 113 $self->{tilesize} = $default->[3];
107 $self->setup_req (tileset => $default->[0]); 114 $self->setup_req (tileset => $default->[0]);
108 115
… …
118 ->convert_blessed 125 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__widget_ref__ => sub {
120 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
121 }); 128 });
122 129
130 # widgetset new
123 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
124 my ($arg) = @_; 132 my ($arg) = @_;
125 133
126 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
127 w => {}, 135 w => {},
128 }; 136 };
129 }); 137 });
130 138
139 # widgetset destroy
131 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_; 141 my ($arg) = @_;
133 142
134 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
135 or return; 144 or return;
136 145
137 $_->destroy 146 $_->destroy
138 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
139 }); 148 });
140 149
150 # widgetset destroy
141 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_; 152 my ($arg) = @_;
143 153
144 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
145 155
… …
175 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
177 } 187 }
178 }); 188 });
179 189
190 # widget call
180 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
181 my ($arg) = @_; 192 my ($arg) = @_;
182 193
183 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
184 or return; 195 or return;
… …
191 } else { 202 } else {
192 $w->$m (@$a); 203 $w->$m (@$a);
193 } 204 }
194 }); 205 });
195 206
207 # widget set
196 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
197 my ($arg) = @_; 209 my ($arg) = @_;
198 210
199 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
200 or return; 212 or return;
201 213
202 $w->{$arg->{name}} = $arg->{value}; 214 my $attr = $arg->{attr};
215
216 for (my $i = 0; $i < $#$attr; $i += 2) {
217 my ($member, $value) = @$attr[$i, $i+1];
218 if (defined $value) {
219 $w->{$member} = $value;
220 } else {
221 delete $w->{$member};
222 }
223 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
224 }
203 }); 225 });
204 226
227 # widget get
205 $self->connect_ext (w_g => sub { 228 $self->connect_ext (w_g => sub {
206 my ($arg) = @_; 229 my ($arg) = @_;
207 230
208 my $w = $self->{widget}{$arg->{id}} 231 my $w = $self->{widget}{$arg->{id}}
209 or return; 232 or return;
210 233
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 234 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
212 }); 235 });
213 236
237 # destroy widgets on logout
214 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 238 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
215 for my $ws (values %{delete $self->{widgetset} || {}}) { 239 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy 240 $_->destroy
217 for values %{delete $ws->{w} || {}}; 241 for values %{delete $ws->{w} || {}};
218 } 242 }
… …
431 my @skills = keys %{ $self->{skill_info} }; 455 my @skills = keys %{ $self->{skill_info} };
432 456
433 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 457 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
434 $sktbl->clear; 458 $sktbl->clear;
435 459
460 my @add;
461
462 push @add,
436 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 463 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
437 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 464 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
438 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 465 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
439 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 466 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
440 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 467 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
441 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 468 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
469 ;
442 470
443 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 471 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
444 472
445 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 473 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
446 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 474 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
474 } 502 }
475 503
476 1 504 1
477 }; 505 };
478 506
507 push @add,
479 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 508 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
480 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 509 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
481 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 510 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
482 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 511 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
483 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 512 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
484 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 513 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
514 ;
485 515
486 $x++ and ($x, $y) = (0, $y + 1); 516 $x++ and ($x, $y) = (0, $y + 1);
487 } 517 }
518
519 $sktbl->add_at (@add);
488 } 520 }
489 521
490 for (grep exists $stats->{$_}, @skills) { 522 for (grep exists $stats->{$_}, @skills) {
491 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 523 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
492 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 524 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
759} 791}
760 792
761sub set_texture { 793sub set_texture {
762 my ($self, $id, $data) = @_; 794 my ($self, $id, $data) = @_;
763 795
796 return unless $self->{map};
797
764 $self->{texture}[$id] = my $tex = 798 $self->{texture}[$id] = my $tex =
765 new_from_image CFPlus::Texture 799 new_from_image CFPlus::Texture
766 $data, minify => 1, mipmap => 1; 800 $data, minify => 1, mipmap => 1;
767 801
768 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 802 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
769 $self->{map_widget}->update; 803 $self->{map_widget}->update;
804
805 $_->() for @{(delete $self->{face_cb}{$id}) || []};
806}
807
808sub connect_face_update {
809 my ($self, $id, $cb) = @_;
810
811 push @{$self->{face_cb}{$id}}, $cb;
812
813 CFPlus::guard {
814 @{$self->{face_cb}{$id}}
815 = grep $_ != $cb,
816 @{$self->{face_cb}{$id}};
817 }
770} 818}
771 819
772sub sound_play { 820sub sound_play {
773 my ($self, $x, $y, $soundnum, $type) = @_; 821 my ($self, $x, $y, $soundnum, $type) = @_;
774 822
… …
958 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
959 return unless $::CONN; 1007 return unless $::CONN;
960 1008
961 $::FLOORBOX->clear; 1009 $::FLOORBOX->clear;
962 1010
1011 my @add;
1012
963 my $row; 1013 my $row;
964 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1014 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
965 if ($row < 6) { 1015 if ($row < 6) {
966 local $_->{face_widget}; # hack to force recreation of widget 1016 local $_->{face_widget}; # hack to force recreation of widget
967 local $_->{desc_widget}; # hack to force recreation of widget 1017 local $_->{desc_widget}; # hack to force recreation of widget
968 CFPlus::Item::update_widgets $_; 1018 CFPlus::Item::update_widgets $_;
969 1019
1020 push @add,
970 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1021 0, $row, $_->{face_widget},
971 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1022 1, $row, $_->{desc_widget};
972 1023
973 $row++; 1024 $row++;
974 } else { 1025 } else {
975 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1026 push @add, 1, $row, new CFPlus::UI::Button
976 text => "More...", 1027 text => "More...",
977 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1028 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
978 ); 1029 ;
979 last; 1030 last;
980 } 1031 }
981 } 1032 }
982 if ($::CONN->{open_container}) { 1033 if ($::CONN->{open_container}) {
983 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1034 push @add, 1, $row++, new CFPlus::UI::Button
984 text => "Close container", 1035 text => "Close container",
985 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1036 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
986 ); 1037 ;
987 } 1038 }
1039
1040 $::FLOORBOX->add_at (@add);
988 }); 1041 });
989 1042
990 $::WANT_REFRESH++; 1043 $::WANT_REFRESH++;
991} 1044}
992 1045
… …
1118} 1171}
1119 1172
1120sub logged_in { 1173sub logged_in {
1121 my ($self) = @_; 1174 my ($self) = @_;
1122 1175
1123 $self->send_ext_req (cfplus_support => version => 1, sub { 1176 $self->send_ext_req (cfplus_support => version => 2, sub {
1177 my (%msg) = @_;
1178
1124 $self->{cfplus_ext} = $_[0]{version}; 1179 $self->{cfplus_ext} = $msg{version};
1125 $self->update_server_info; 1180 $self->update_server_info;
1126 1181
1127 if ($self->{cfplus_ext} >= 2) { 1182 if ($self->{cfplus_ext} >= 2) {
1128 $self->send_ext_req ("editor_support", sub { 1183 $self->send_ext_req ("editor_support", sub {
1129 $self->{editor_support} = $_[0]; 1184 $self->{editor_support} = { @_ };
1130 $self->update_server_info; 1185 $self->update_server_info;
1131 1186
1132 0 1187 0
1133 }); 1188 });
1134 } 1189 }
… …
1154 1209
1155sub lookat { 1210sub lookat {
1156 my ($self, $x, $y) = @_; 1211 my ($self, $x, $y) = @_;
1157 1212
1158 if ($self->{cfplus_ext}) { 1213 if ($self->{cfplus_ext}) {
1159 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1214 $self->send_ext_req (lookat => $x, $y, sub {
1160 my ($msg) = @_; 1215 my (%msg) = @_;
1161 1216
1162 if (exists $msg->{npc_dialog}) { 1217 if (exists $msg{npc_dialog}) {
1163 # start npc chat dialog 1218 # start npc chat dialog
1164 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1219 $self->{npc_dialog} = new CFPlus::NPCDialog::
1165 dx => $x, 1220 token => $msg{npc_dialog},
1166 dy => $y,
1167 title => "$msg->{npc_dialog} (NPC)", 1221 title => "$msg{npc_dialog}[0] (NPC)",
1168 conn => $self, 1222 conn => $self,
1169 ; 1223 ;
1170 } 1224 }
1171 }); 1225 });
1172 } 1226 }
… …
1237 on_activate => sub { $this->destroy; 1 }, 1291 on_activate => sub { $this->destroy; 1 },
1238 ; 1292 ;
1239 1293
1240 $self->update_options; 1294 $self->update_options;
1241 1295
1242 $self->{id} = $self->{conn}->send_ext_req ( 1296 $self->{id} = "npc-channel-" . $self->{conn}->token;
1243 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1297 $self->{conn}->connect_ext ($self->{id} => sub {
1244 sub { $this && $this->feed (@_) } 1298 $this->feed (@_) if $this;
1245 ); 1299 });
1300
1301 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1246 1302
1247 $self->{entry}->grab_focus; 1303 $self->{entry}->grab_focus;
1248 1304
1249 $self->{textview}->add_paragraph ({ 1305 $self->{textview}->add_paragraph ({
1250 fg => [1, 1, 0, 1], 1306 fg => [1, 1, 0, 1],
… …
1273 ); 1329 );
1274 } 1330 }
1275} 1331}
1276 1332
1277sub feed { 1333sub feed {
1278 my ($self, $msg) = @_; 1334 my ($self, $type, @arg) = @_;
1279 1335
1280 CFPlus::weaken $self; 1336 CFPlus::weaken $self;
1281 1337
1282 if ($msg->{msgtype} eq "reply") { 1338 if ($type eq "update") {
1339 my (%info) = @arg;
1340
1283 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1341 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1284 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1342 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1285
1286 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1287 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1288 my @link;
1289 $text =~ s{
1290 ($match)
1291 }{
1292 my $kw = $1;
1293
1294 push @link, new CFPlus::UI::Label
1295 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1296 can_hover => 1,
1297 can_events => 1,
1298 padding_x => 0,
1299 padding_y => 0,
1300 on_button_up => sub {
1301 $self->send ($kw);
1302 };
1303
1304 "\x{fffc}"
1305 }giex;
1306 1343
1344 if (exists $info{msg}) {
1345 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1346 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1347 my @link;
1348 $text =~ s{
1349 ($match)
1350 }{
1351 my $kw = $1;
1352
1353 push @link, new CFPlus::UI::Label
1354 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1355 can_hover => 1,
1356 can_events => 1,
1357 padding_x => 0,
1358 padding_y => 0,
1359 on_button_up => sub {
1360 $self->send ($kw);
1361 };
1362
1363 "\x{fffc}"
1364 }giex;
1365
1307 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1366 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1308 $self->{textview}->scroll_to_bottom; 1367 $self->{textview}->scroll_to_bottom;
1368 }
1369
1309 $self->update_options; 1370 $self->update_options;
1310 } else { 1371 } else {
1311 $self->destroy; 1372 $self->destroy;
1312 } 1373 }
1313 1374
… …
1318 my ($self, $msg) = @_; 1379 my ($self, $msg) = @_;
1319 1380
1320 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1381 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1321 $self->{textview}->scroll_to_bottom; 1382 $self->{textview}->scroll_to_bottom;
1322 1383
1323 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1384 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1324} 1385}
1325 1386
1326sub destroy { 1387sub destroy {
1327 my ($self) = @_; 1388 my ($self) = @_;
1328 1389
1329 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1390 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1330 1391
1331 if ($self->{conn}) { 1392 if ($self->{conn}) {
1332 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1393 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1333 delete $self->{conn}{npc_dialog}; 1394 delete $self->{conn}{npc_dialog};
1334 $self->{conn}->disconnect_ext ($self->{id}); 1395 $self->{conn}->disconnect_ext ($self->{id});
1335 } 1396 }
1336 1397
1337 $self->SUPER::destroy; 1398 $self->SUPER::destroy;

Diff Legend

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