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.112 by root, Tue Jul 10 16:25:16 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 (music => sub {
54 my (%ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
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});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
53 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (capabilities => sub {
54 my ($cap) = @_; 108 my (%cap) = @_;
55 109
56 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default; 112 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3]; 113 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]); 114 $self->setup_req (tileset => $default->[0]);
61 115
… …
67 } 121 }
68 }); 122 });
69 123
70 $self->{json_coder} 124 $self->{json_coder}
71 ->convert_blessed 125 ->convert_blessed
72 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__w_ => sub {
73 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
74 }); 128 });
75 129
130 # widgetset new
76 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
77 my ($arg) = @_; 132 my ($id) = @_;
78 133
79 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$id} = {
80 w => {}, 135 w => {},
81 }; 136 };
82 }); 137 });
83 138
139 # widgetset destroy
84 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
85 my ($arg) = @_; 141 my ($id) = @_;
86 142
87 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$id}
88 or return; 144 or return;
89 145
90 $_->destroy 146 $_->destroy
91 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
92 }); 148 });
93 149
150 # widgetset create
94 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
95 my ($arg) = @_; 152 my ($ws, $id, $class, $args) = @_;
96
97 my $args = $arg->{args} || {};
98 153
99 for my $ev (grep /^on_/, keys %$args) { 154 for my $ev (grep /^on_/, keys %$args) {
100 $args->{$ev} = sub { 155 $args->{$ev} = sub {
101 my $id = shift->{s_id}; 156 my $id = shift->{s_id};
102 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 157 $self->send_exti_msg (w_e => $id, $ev, \@_);
103 158
104 1 159 1
105 }; 160 };
106 } 161 }
107 162
108 if (my $widget = eval { 163 if (my $widget = eval {
109 local $SIG{__DIE__}; 164 local $SIG{__DIE__};
110 "CFPlus::UI::$arg->{class}"->new ( 165 "CFPlus::UI::$class"->new (
111 %$args, 166 %$args,
112 s_ws => $arg->{ws}, 167 s_ws => $ws,
113 s_id => $arg->{id}, 168 s_id => $id,
114 ) 169 )
115 } 170 }
116 ) { 171 ) {
117 $self->{widget}{$arg->{id}} 172 $self->{widget}{$id}
118 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 173 = $self->{widgetset}{$ws}{w}{$id}
119 = $widget; 174 = $widget;
120 175
121 $widget->connect (on_destroy => sub { 176 $widget->connect (on_destroy => sub {
122 my ($widget) = @_; 177 my ($widget) = @_;
123 178
124 delete $self->{widget}{$widget->{s_id}}; 179 delete $self->{widget}{$widget->{s_id}};
125 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 180 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
126 }); 181 });
127 } else { 182 } else {
128 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";
129 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 184 $self->send_exti_msg (w_e => $id, "destroy");
130 } 185 }
131 }); 186 });
132 187
188 # widget call
133 $self->connect_ext (w_c => sub { 189 $self->connect_ext (w_c => sub {
134 my ($arg) = @_; 190 my ($id, $rid, $method, $args) = @_;
135 191
136 my $w = $self->{widget}{$arg->{id}} 192 my $w = $self->{widget}{$id}
137 or return; 193 or return;
138 my $m = $arg->{name};
139 194
140 my $a = $arg->{args} || []; 195 $args ||= [];
141 196
142 if (exists $arg->{rid}) { 197 if ($rid) {
143 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 198 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
144 } else { 199 } else {
145 $w->$m (@$a); 200 $w->$method (@$args);
146 } 201 }
147 }); 202 });
148 203
204 # widget set
149 $self->connect_ext (w_s => sub { 205 $self->connect_ext (w_s => sub {
150 my ($arg) = @_; 206 my ($id, $attr) = @_;
151 207
152 my $w = $self->{widget}{$arg->{id}} 208 my $w = $self->{widget}{$id}
153 or return; 209 or return;
154 210
155 $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 }
156 }); 220 });
157 221
222 # widget get
158 $self->connect_ext (w_g => sub { 223 $self->connect_ext (w_g => sub {
159 my ($arg) = @_; 224 my ($id, $rid, $attr) = @_;
160 225
161 my $w = $self->{widget}{$arg->{id}} 226 my $w = $self->{widget}{$id}
162 or return; 227 or return;
163 228
164 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
165 }); 230 });
166 231
232 # destroy widgets on logout
167 $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 {
168 for my $ws (values %{delete $self->{widgetset} || {}}) { 234 for my $ws (values %{delete $self->{widgetset} || {}}) {
169 $_->destroy 235 $_->destroy
170 for values %{delete $ws->{w} || {}}; 236 for values %{delete $ws->{w} || {}};
171 } 237 }
… …
384 my @skills = keys %{ $self->{skill_info} }; 450 my @skills = keys %{ $self->{skill_info} };
385 451
386 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
387 $sktbl->clear; 453 $sktbl->clear;
388 454
455 my @add;
456
457 push @add,
389 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
390 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
391 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
392 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
393 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
394 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
395 465
396 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>";
397 467
398 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);
399 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);
… …
427 } 497 }
428 498
429 1 499 1
430 }; 500 };
431 501
502 push @add,
432 $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
433 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),
434 $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
435 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),
436 $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,
437 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 ;
438 510
439 $x++ and ($x, $y) = (0, $y + 1); 511 $x++ and ($x, $y) = (0, $y + 1);
440 } 512 }
513
514 $sktbl->add_at (@add);
441 } 515 }
442 516
443 for (grep exists $stats->{$_}, @skills) { 517 for (grep exists $stats->{$_}, @skills) {
444 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
445 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
712} 786}
713 787
714sub set_texture { 788sub set_texture {
715 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
716 790
791 return unless $self->{map};
792
717 $self->{texture}[$id] = my $tex = 793 $self->{texture}[$id] = my $tex =
718 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
719 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
720 796
721 $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}});
722 $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 }
723} 813}
724 814
725sub sound_play { 815sub sound_play {
726 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
727 817
… …
911 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
912 return unless $::CONN; 1002 return unless $::CONN;
913 1003
914 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
915 1005
1006 my @add;
1007
916 my $row; 1008 my $row;
917 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} }) {
918 if ($row < 6) { 1010 if ($row < 6) {
919 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
920 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
921 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
922 1014
1015 push @add,
923 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
924 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
925 1018
926 $row++; 1019 $row++;
927 } else { 1020 } else {
928 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
929 text => "More...", 1022 text => "More...",
930 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
931 ); 1024 ;
932 last; 1025 last;
933 } 1026 }
934 } 1027 }
935 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
936 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
937 text => "Close container", 1030 text => "Close container",
938 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
939 ); 1032 ;
940 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
941 }); 1036 });
942 1037
943 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
944} 1039}
945 1040
… …
1071} 1166}
1072 1167
1073sub logged_in { 1168sub logged_in {
1074 my ($self) = @_; 1169 my ($self) = @_;
1075 1170
1076 $self->send_ext_req (cfplus_support => version => 1, sub { 1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
1077 $self->{cfplus_ext} = $_[0]{version}; 1174 $self->{cfplus_ext} = $msg{version};
1078 $self->update_server_info; 1175 $self->update_server_info;
1079 1176
1080 if ($self->{cfplus_ext} >= 2) { 1177 if ($self->{cfplus_ext} >= 2) {
1081 $self->send_ext_req ("editor_support", sub { 1178 $self->send_ext_req ("editor_support", sub {
1082 $self->{editor_support} = $_[0]; 1179 $self->{editor_support} = { @_ };
1083 $self->update_server_info; 1180 $self->update_server_info;
1084 1181
1085 0 1182 0
1086 }); 1183 });
1087 } 1184 }
… …
1107 1204
1108sub lookat { 1205sub lookat {
1109 my ($self, $x, $y) = @_; 1206 my ($self, $x, $y) = @_;
1110 1207
1111 if ($self->{cfplus_ext}) { 1208 if ($self->{cfplus_ext}) {
1112 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1209 $self->send_ext_req (lookat => $x, $y, sub {
1113 my ($msg) = @_; 1210 my (%msg) = @_;
1114 1211
1115 if (exists $msg->{npc_dialog}) { 1212 if (exists $msg{npc_dialog}) {
1116 # start npc chat dialog 1213 # start npc chat dialog
1117 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
1118 dx => $x, 1215 token => $msg{npc_dialog},
1119 dy => $y,
1120 title => "$msg->{npc_dialog} (NPC)", 1216 title => "$msg{npc_dialog}[0] (NPC)",
1121 conn => $self, 1217 conn => $self,
1122 ; 1218 ;
1123 } 1219 }
1124 }); 1220 });
1125 } 1221 }
… …
1190 on_activate => sub { $this->destroy; 1 }, 1286 on_activate => sub { $this->destroy; 1 },
1191 ; 1287 ;
1192 1288
1193 $self->update_options; 1289 $self->update_options;
1194 1290
1195 $self->{id} = $self->{conn}->send_ext_req ( 1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1196 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1292 $self->{conn}->connect_ext ($self->{id} => sub {
1197 sub { $this && $this->feed (@_) } 1293 $this->feed (@_) if $this;
1198 ); 1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1199 1297
1200 $self->{entry}->grab_focus; 1298 $self->{entry}->grab_focus;
1201 1299
1202 $self->{textview}->add_paragraph ({ 1300 $self->{textview}->add_paragraph ({
1203 fg => [1, 1, 0, 1], 1301 fg => [1, 1, 0, 1],
… …
1226 ); 1324 );
1227 } 1325 }
1228} 1326}
1229 1327
1230sub feed { 1328sub feed {
1231 my ($self, $msg) = @_; 1329 my ($self, $type, @arg) = @_;
1232 1330
1233 CFPlus::weaken $self; 1331 CFPlus::weaken $self;
1234 1332
1235 if ($msg->{msgtype} eq "reply") { 1333 if ($type eq "update") {
1334 my (%info) = @arg;
1335
1236 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1237 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1238
1239 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1240 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1241 my @link;
1242 $text =~ s{
1243 ($match)
1244 }{
1245 my $kw = $1;
1246
1247 push @link, new CFPlus::UI::Label
1248 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1249 can_hover => 1,
1250 can_events => 1,
1251 padding_x => 0,
1252 padding_y => 0,
1253 on_button_up => sub {
1254 $self->send ($kw);
1255 };
1256
1257 "\x{fffc}"
1258 }giex;
1259 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
1260 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1261 $self->{textview}->scroll_to_bottom; 1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1262 $self->update_options; 1365 $self->update_options;
1263 } else { 1366 } else {
1264 $self->destroy; 1367 $self->destroy;
1265 } 1368 }
1266 1369
… …
1271 my ($self, $msg) = @_; 1374 my ($self, $msg) = @_;
1272 1375
1273 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1274 $self->{textview}->scroll_to_bottom; 1377 $self->{textview}->scroll_to_bottom;
1275 1378
1276 $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);
1277} 1380}
1278 1381
1279sub destroy { 1382sub destroy {
1280 my ($self) = @_; 1383 my ($self) = @_;
1281 1384
1282 #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
1283 1386
1284 if ($self->{conn}) { 1387 if ($self->{conn}) {
1285 $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};
1286 delete $self->{conn}{npc_dialog}; 1389 delete $self->{conn}{npc_dialog};
1287 $self->{conn}->disconnect_ext ($self->{id}); 1390 $self->{conn}->disconnect_ext ($self->{id});
1288 } 1391 }
1289 1392
1290 $self->SUPER::destroy; 1393 $self->SUPER::destroy;

Diff Legend

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