[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.120 by root, Sat Jul 14 13:04:42 2007 UTC vs.
Revision 1.160 by root, Tue Aug 21 22:46:50 2007 UTC

…		…
21		21
22	my $self = $class->SUPER::new (%arg,	22	my $self = $class->SUPER::new (%arg,
23	setup_req => {	23	setup_req => {
24	extmap => 1,	24	extmap => 1,
25	excmd => 1,	25	excmd => 1,
26	ywidget => 1,	26	xwidget1 => 1,#d#
27	%{$arg{setup_req} \|\| {}},	27	%{$arg{setup_req} \|\| {}},
28	},	28	},
29	);	29	);
30		30
31	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
…		…
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 {
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	} else {
80	::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
81	$self->ask_face ($face, -100 - $pri, undef, sub {
82	my $len = length $_[1];
83	my ($meta_json, $data) = unpack "(w/a)", $_[1];
84
85	CFPlus::DB::write_file $path, $data, sub {
86	CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
87	my $meta = $self->{json_coder}->decode ($meta_json);
88	$meta->{path} = $path;
89	$self->{music_meta}{$chksum} = $meta;
90
91	::message ({ markup => "downloaded song #$face, size $len octets" });
92	&::audio_music_set ($self->{songs});
93	};
94	};
95	});
96	}
97	}
98	}
99	}
100
101	if (my $play = $ev->{play}) {
102	&::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
103	}
104	});
105
106	$self->connect_ext (event_capabilities => sub {
107	my ($cap) = @_;
108
109	if (my $ts = $cap->{tileset}) {
110	if (my ($default) = grep $_->[2] & 1, @$ts) {
111	$self->{tileset} = $default;
112	$self->{tilesize} = $default->[3];
113	$self->setup_req (tileset => $default->[0]);
114
115	my $w = int $self->{mapw} * 32 / $self->{tilesize};
116	my $h = int $self->{maph} * 32 / $self->{tilesize};
117
118	$self->setup_req (mapsize => "${w}x${h}");
119	}
120	}
121	});
122
123	$self->{json_coder}	53	$self->{json_coder}
124	->convert_blessed	54	->convert_blessed
125	->filter_json_single_key_object (__widget_ref__ => sub {	55	->filter_json_single_key_object (__w_ => sub {
126	$self->{widget}{$_[0]}	56	$self->{widget}{$_[0]}
127	});	57	});
128		58
129	$self->connect_ext (ws_n => sub {	59	# destroy widgets on logout
130	my ($arg) = @_;
131
132	$self->{widgetset}{$arg{id}} = {
133	w => {},
134	};
135	});
136
137	$self->connect_ext (ws_d => sub {
138	my ($arg) = @_;
139
140	my $ws = delete $self->{widgetset}{$arg{id}}
141	or return;
142
143	$_->destroy
144	for values %{$ws->{w}};
145	});
146
147	$self->connect_ext (ws_c => sub {
148	my ($arg) = @_;
149
150	my $args = $arg->{args} \|\| {};
151
152	for my $ev (grep /^on_/, keys %$args) {
153	$args->{$ev} = sub {
154	my $id = shift->{s_id};
155	$self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
156
157	1
158	};
159	}
160
161	if (my $widget = eval {
162	local $SIG{__DIE__};
163	"CFPlus::UI::$arg->{class}"->new (
164	%$args,
165	s_ws => $arg->{ws},
166	s_id => $arg->{id},
167	)
168	}
169	) {
170	$self->{widget}{$arg->{id}}
171	= $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
172	= $widget;
173
174	$widget->connect (on_destroy => sub {
175	my ($widget) = @_;
176
177	delete $self->{widget}{$widget->{s_id}};
178	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
179	});
180	} else {
181	warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
182	$self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
183	}
184	});
185
186	$self->connect_ext (w_c => sub {
187	my ($arg) = @_;
188
189	my $w = $self->{widget}{$arg->{id}}
190	or return;
191	my $m = $arg->{name};
192
193	my $a = $arg->{args} \|\| [];
194
195	if (exists $arg->{rid}) {
196	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
197	} else {
198	$w->$m (@$a);
199	}
200	});
201
202	$self->connect_ext (w_s => sub {
203	my ($arg) = @_;
204
205	my $w = $self->{widget}{$arg->{id}}
206	or return;
207
208	$w->{$arg->{name}} = $arg->{value};
209	});
210
211	$self->connect_ext (w_g => sub {
212	my ($arg) = @_;
213
214	my $w = $self->{widget}{$arg->{id}}
215	or return;
216
217	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
218	});
219
220	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {	60	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
221	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {	61	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
222	$_->destroy	62	$_->destroy
223	for values %{delete $ws->{w} \|\| {}};	63	for values %{delete $ws->{w} \|\| {}};
224	}	64	}
…		…
245	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	85	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
246		86
247	$self	87	$self
248	}	88	}
249		89
		90	sub update_fx_want {
		91	my ($self) = @_;
		92
		93	$self->send_exti_msg (fx_want => {
		94	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		95	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		96	6 => 1, # FT_RSRC
		97	});
		98	}
		99
		100	sub ext_capabilities {
		101	my ($self, %cap) = @_;
		102
		103	#$self->send ("setup sound 0"); # we use a different protocol
		104	$self->update_fx_want;
		105
		106	$self->send_exti_req (resource => "exp_table", sub {
		107	my ($exp_table) = @_;
		108
		109	$self->register_face_handler ($exp_table, sub {
		110	my ($face) = @_;
		111
		112	$self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		113	$_->() for values %{ $self->{on_exp_update} \|\| {} };
		114	});
		115
		116	()
		117	});
		118
		119	if (my $ts = $cap{tileset}) {
		120	if (my ($default) = grep $_->[2] & 1, @$ts) {
		121	$self->{tileset} = $default;
		122	$self->{tilesize} = $default->[3];
		123	$self->setup_req (tileset => $default->[0]);
		124
		125	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		126	my $h = int $self->{maph} * 32 / $self->{tilesize};
		127
		128	$self->setup_req (mapsize => "${w}x${h}");
		129	}
		130	}
		131	}
		132
		133	sub ext_ambient_music {
		134	my ($self, $songs) = @_;
		135	&::audio_music_set_ambient ($songs);
		136	}
		137
		138	#############################################################################
		139
		140	sub widget_associate {
		141	my ($self, $ws, $id, $widget) = @_;
		142
		143	if ($widget) {
		144	$widget->{s_id} = $id;
		145	$self->{widget}{$id} = $widget;
		146
		147	if ($ws) {
		148	$widget->{s_ws} = $ws;
		149	$self->{widgetset}{$ws}{w}{$id} = $widget;
		150	}
		151
		152	$widget->connect (on_destroy => sub {
		153	my ($widget) = @_;
		154
		155	delete $self->{widget}{$widget->{s_id}};
		156	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		157	if exists $widget->{s_ws};
		158	});
		159
		160	1
		161	} else {
		162	$self->send_exti_msg (w_e => $id, undef);
		163
		164	0
		165	}
		166	}
		167
		168	# widgetset new
		169	sub ext_ws_n {
		170	my ($self, $id) = @_;
		171
		172	$self->{widgetset}{$id} = {
		173	w => {},
		174	};
		175	}
		176
		177	# widgetset destroy
		178	sub ext_ws_d {
		179	my ($self, $id) = @_;
		180
		181	my $ws = delete $self->{widgetset}{$id}
		182	or return;
		183
		184	$_->destroy
		185	for values %{$ws->{w}};
		186	}
		187
		188	# widgetset create
		189	sub ext_ws_c {
		190	my ($self, $ws, $id, $class, $args) = @_;
		191
		192	for my $ev (grep /^on_/, keys %$args) {
		193	my $rid = $args->{$ev};
		194	$args->{$ev} = sub {
		195	my $id = shift->{s_id};
		196	$self->send_exti_msg (w_e => $id, $rid, @_);
		197
		198	1
		199	};
		200	}
		201
		202	$self->widget_associate (
		203	$ws, $id => scalar eval {
		204	local $SIG{__DIE__};
		205	"CFPlus::UI::$class"->new (%$args)
		206	}
		207	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		208	}
		209
		210	# widgetset associate
		211	sub ext_ws_a {
		212	my ($self, %ass) = @_;
		213
		214	# everything that has a name, wether conceivably useful or not
		215	my %wkw = (
		216	root => $CFPlus::UI::ROOT,
		217	tooltip => $CFPlus::UI::TOOLTIP,
		218
		219	mapwidget => $::MAPWIDGET,
		220	buttonbar => $::BUTTONBAR,
		221	metaserver => $::METASERVER,
		222	buttonbar => $::BUTTONBAR,
		223	login_button => $::LOGIN_BUTTON,
		224	quit_dialog => $::QUIT_DIALOG,
		225	host_entry => $::HOST_ENTRY,
		226	metaserver => $::METASERVER,
		227	server_info => $::SERVER_INFO,
		228
		229	setup_dialog => $::SETUP_DIALOG,
		230	setup_notebook => $::SETUP_NOTEBOOK,
		231	setup_server => $::SETUP_SERVER,
		232	setup_keyboard => $::SETUP_KEYBOARD,
		233
		234	pl_notebook => $::PL_NOTEBOOK,
		235	pl_window => $::PL_WINDOW,
		236	inventory_page => $::INVENTORY_PAGE,
		237	stats_page => $::STATS_PAGE,
		238	skill_page => $::SKILL_PAGE,
		239	spell_page => $::SPELL_PAGE,
		240	spell_list => $::SPELL_LIST,
		241
		242	floorbox => $::FLOORBOX,
		243	help_window => $::HELP_WINDOW,
		244	message_window => $::MESSAGE_WINDOW,
		245	statusbox => $::SDTATUSBOX,
		246
		247	inv => $::INV,
		248	invr => $::INVR,
		249	invr_hb => $::INVR_HB,
		250	);
		251
		252	while (my ($id, $name) = each %ass) {
		253	$self->widget_associate (undef, $id => $wkw{$name})
		254	or warn "server failed to associate non-existent well-known widget $name\n";
		255	}
		256	}
		257
		258	# widget call
		259	sub ext_w_c {
		260	my ($self, $id, $rid, $method, @args) = @_;
		261
		262	my $w = $self->{widget}{$id}
		263	or return;
		264
		265	if ($rid) {
		266	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
		267	} else {
		268	$w->$method (@args);
		269	}
		270	}
		271
		272	# widget set
		273	sub ext_w_s {
		274	my ($self, $id, $attr) = @_;
		275
		276	my $w = $self->{widget}{$id}
		277	or return;
		278
		279	for (my $i = 0; $i < $#$attr; $i += 2) {
		280	my ($member, $value) = @$attr[$i, $i+1];
		281	if (defined $value) {
		282	$w->{$member} = $value;
		283	} else {
		284	delete $w->{$member};
		285	}
		286	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		287	}
		288	}
		289
		290	# widget get
		291	sub ext_w_g {
		292	my ($self, $id, $rid, $attr) = @_;
		293
		294	my $w = $self->{widget}{$id}
		295	or return;
		296
		297	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		298	}
		299
		300	# message window
		301	sub ext_channel_info {
		302	my ($self, $info) = @_;
		303	$self->{channels}->{$info->{id}} = $info;
		304	$::MESSAGE_WINDOW->add_channel ($info);
		305	}
		306
		307	#############################################################################
		308
250	sub logprint {	309	sub logprint {
251	my ($self, @a) = @_;	310	my ($self, @a) = @_;
252		311
253	$self->{log_fh} \|\|= do {	312	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
254	my $path = "$Crossfire::VARDIR/log.$self->{host}";
255
256	open my $fh, ">>:utf8", $path
257	or die "Couldn't open logfile $path: $!";
258
259	$fh->autoflush (1);
260
261	$fh;
262	};
263
264	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
265
266	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
267	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
268
269	print {$self->{log_fh}} "$ts ", @a, "\n";
270	}	313	}
271		314
272	sub _stat_numdiff {	315	sub _stat_numdiff {
273	my ($self, $name, $old, $new) = @_;	316	my ($self, $name, $old, $new) = @_;
274		317
…		…
407	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	450	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
408	$::GAUGES->{food} ->set_value ($fo, $fo_m);	451	$::GAUGES->{food} ->set_value ($fo, $fo_m);
409	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	452	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
410	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	453	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
411	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	454	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		455	$::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
412	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});	456	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
413	my $title = $stats->{+CS_STAT_TITLE};	457	my $title = $stats->{+CS_STAT_TITLE};
414	$title =~ s/^Player: //;	458	$title =~ s/^Player: //;
415	$::STATWIDS->{title} ->set_text ("Title: " . $title);	459	$::STATWIDS->{title} ->set_text ("Title: " . $title);
416		460
…		…
437	my @skills = keys %{ $self->{skill_info} };	481	my @skills = keys %{ $self->{skill_info} };
438		482
439	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	483	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
440	$sktbl->clear;	484	$sktbl->clear;
441		485
		486	my $sw = $self->{skillwid}{""} \|\|= [
442	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	487	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
443	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	488	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		489	2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
444	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	490	3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
445	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	491	4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
446	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	492	5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		493	6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
447	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	494	7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		495	];
		496
		497	my @add = @$sw;
448		498
449	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	499	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
450		500
451	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	501	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
452	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	502	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
…		…
480	}	530	}
481		531
482	1	532	1
483	};	533	};
484		534
485	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	535	my $sw = $self->{skillwid}{$idx} \|\|= [
		536	# exp
		537	(new CFPlus::UI::Label
486	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	538	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
487	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	539
		540	# level
		541	(new CFPlus::UI::Label
488	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	542	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		543
		544	# progress
		545	(new CFPlus::UI::ExperienceProgress),
		546
		547	# label
489	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	548	(new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
490	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	549	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		550	];
		551
		552	push @add,
		553	$x * 4 + 0, $y, $sw->[0],
		554	$x * 4 + 1, $y, $sw->[1],
		555	$x * 4 + 2, $y, $sw->[2],
		556	$x * 4 + 3, $y, $sw->[3],
		557	;
491		558
492	$x++ and ($x, $y) = (0, $y + 1);	559	$x++ and ($x, $y) = (0, $y + 1);
493	}	560	}
		561
		562	$sktbl->add_at (@add);
494	}	563	}
495		564
496	for (grep exists $stats->{$_}, @skills) {	565	for (grep exists $stats->{$_}, @skills) {
		566	my $sw = $self->{skillwid}{$_};
497	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	567	$sw->[0]->set_text (::formsep ($stats->{$_}[1]));
498	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	568	$sw->[1]->set_text ($stats->{$_}[0] * 1);
		569	$sw->[2]->set_value (@{$stats->{$_}});
499	}	570	}
500	}	571	}
501		572
502	sub macro_send {	573	sub macro_send {
503	my ($self, $macro) = @_;	574	my ($self, $macro) = @_;
…		…
531	}	602	}
532		603
533	sub feed_map1a {	604	sub feed_map1a {
534	my ($self, $data) = @_;	605	my ($self, $data) = @_;
535		606
536	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	607	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		608	my $delay;
		609
		610	for my $tile (@$missing) {
		611	next if $self->{delay}{$tile};
		612
		613	$delay = 1;
		614
		615	if (my $tex = $::CONN->{texture}[$tile]) {
		616	$tex->upload;
		617	} else {
		618	$self->{delay}{$tile} = 1;
		619
		620	# we assume the face is in-flight and will eventually come
		621	push @{$self->{tile_cb}{$tile}}, sub {
		622	delete $self->{delay}{$tile};
		623	$_[0]->upload;
		624	};
		625	}
		626	}
		627
		628	if ($delay) {
		629	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		630	Event->timer (after => 0.03, cb => sub {
		631	$_[0]->w->cancel;
		632	$self->{map_widget}->update;
		633	});
		634	} else {
537	$self->{map_widget}->update;	635	$self->{map_widget}->update;
		636	}
538	}	637	}
539		638
540	sub magicmap {	639	sub magicmap {
541	my ($self, $w, $h, $x, $y, $data) = @_;	640	my ($self, $w, $h, $x, $y, $data) = @_;
542		641
…		…
549	my $map_info = delete $self->{map_info}	648	my $map_info = delete $self->{map_info}
550	or return;	649	or return;
551		650
552	my ($hash, $x, $y, $w, $h) = @$map_info;	651	my ($hash, $x, $y, $w, $h) = @$map_info;
553		652
554	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	653	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
		654	$self->{map_cache_new}{$hash} = \$data;
555	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	655	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
556	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
557	}	656	}
558		657
559	sub map_clear {	658	sub map_clear {
560	my ($self) = @_;	659	my ($self) = @_;
561		660
…		…
567	}	666	}
568		667
569	sub bg_fetch {	668	sub bg_fetch {
570	my ($self) = @_;	669	my ($self) = @_;
571		670
572	my $id;	671	my $tile;
573		672
574	do {	673	do {
575	$id = pop @{$self->{bg_fetch}}	674	$tile = pop @{$self->{bg_fetch}}
576	or return;	675	or return;
577	} while $self->{texture}[$id];	676	} while $self->{texture}[$tile];
578		677
579	CFPlus::DB::get tilecache => $id, sub {	678	CFPlus::DB::get tilecache => $tile, sub {
580	my ($data) = @_;	679	my ($data) = @_;
581		680
582	return unless $self->{map}; # stop when destroyed	681	return unless $self->{map}; # stop when destroyed
583		682
584	$self->set_texture ($id => $data)
585	if defined $data;	683	if (defined $data) {
		684	$self->have_tile ($tile, $data);
		685	$self->{texture}[$tile]->upload;
		686	}
586		687
587	$self->bg_fetch;	688	$self->bg_fetch;
588	};	689	};
589	}	690	}
590		691
591	sub load_map($$$) {	692	sub load_map($$$) {
592	my ($self, $hash, $x, $y) = @_;	693	my ($self, $hash, $x, $y) = @_;
593		694
594	my $gen = $self->{map_change_gen};	695	my $gen = $self->{map_change_gen};
595		696
596	CFPlus::DB::get $self->{mapcache} => $hash, sub {	697	my $cb = sub {
597	return unless $gen == $self->{map_change_gen};	698	return unless $gen == $self->{map_change_gen};
598		699
599	my ($data) = @_;	700	my ($data) = @_;
600		701
601	if (defined $data) {	702	if (defined $data) {
		703	$self->{map_cache_new}{$hash} = \$data;
		704
602	$data = Compress::LZF::decompress $data;	705	my $data = Compress::LZF::decompress $data;
603	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
604		706
605	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	707	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
606	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	708	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
607	$self->bg_fetch unless $inprogress;	709	$self->bg_fetch unless $inprogress;
608	}	710	}
609	};	711	};
		712
		713	if (my $rdata = $self->{map_cache_old}{$hash}) {
		714	$cb->($$rdata);
		715	} else {
		716	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
		717	}
610	}	718	}
611		719
612	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	720	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
613	# (server resource,s latency, bandwidth), so this hack is warranted.	721	# (server resource,s latency, bandwidth), so this hack is warranted.
614	# the right fix is to make real tiled maps with an overview file	722	# the right fix is to make real tiled maps with an overview file
…		…
707	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	815	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
708		816
709	$self->flush_map;	817	$self->flush_map;
710		818
711	++$self->{map_change_gen};	819	++$self->{map_change_gen};
		820	$self->{map_cache_old} = delete $self->{map_cache_new};
712		821
713	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	822	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
714		823
715	my $mapmapw = $self->{mapmap}->{w};	824	my $mapmapw = $self->{mapmap}->{w};
716	my $mapmaph = $self->{mapmap}->{h};	825	my $mapmaph = $self->{mapmap}->{h};
…		…
735	}	844	}
736		845
737	sub face_find {	846	sub face_find {
738	my ($self, $facenum, $face, $cb) = @_;	847	my ($self, $facenum, $face, $cb) = @_;
739		848
740	my $hash = "$face->{chksum},$face->{name}";	849	if ($face->{type} == 0) { # FT_FACE
741
742	my $id = CFPlus::DB::get_tile_id_sync $hash;	850	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
743		851
744	$face->{id} = $id;	852	$face->{id} = $id;
745	$self->{faceid}[$facenum] = $id;
746
747	$self->{map}->set_tileid ($facenum => $id);	853	$self->{map}->set_tileid ($facenum => $id);
748		854
749	CFPlus::DB::get tilecache => $id, $cb;	855	CFPlus::DB::get tilecache => $id, $cb;
		856
		857	} elsif ($face->{type} & 1) { # with metadata
		858	CFPlus::DB::get res_meta => $face->{name}, $cb;
		859
		860	} else { # no metadata
		861	CFPlus::DB::get res_data => $face->{name}, $cb;
		862	}
750	}	863	}
751		864
752	sub face_update {	865	sub face_update {
753	my ($self, $facenum, $face, $changed) = @_;	866	my ($self, $facenum, $face, $changed) = @_;
754		867
		868	if ($face->{type} == 0) {
		869	# image, FT_FACE
755	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	870	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
756	if $changed;	871	if $changed;
757		872
758	$self->set_texture ($face->{id} => delete $face->{image});	873	$self->have_tile ($face->{id}, delete $face->{data});
		874
		875	} elsif ($face->{type} & 1) {
		876	# split metadata case, FT_MUSIC, FT_SOUND
		877	if ($changed) { # new data
		878	my ($meta, $data) = unpack "(w/a)", $face->{data};
		879	$face->{data} = $meta;
		880
		881	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		882	CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
		883	}
		884
		885	$face->{data} = $self->{json_coder}->decode ($face->{data});
		886
		887	::add_license ($face);
		888
		889	if ($face->{type} == 3) { # FT_MUSIC
		890	::message ({ markup => "downloaded song #$facenum" })
		891	if $changed;
		892
		893	&::audio_music_push ($facenum);
		894	} elsif ($face->{type} == 5) { # FT_SOUND
		895	::message ({ markup => "downloaded sound #$facenum" })
		896	if $changed;
		897
		898	&::audio_sound_push ($facenum);
		899	}
		900
		901	} else {
		902	# flat resource case, FT_RSRC
		903	CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
		904	if $changed;
		905	}
		906
		907	if (my $cbs = $self->{face_cb}{$facenum}) {
		908	$_->($face, $changed) for @$cbs;
		909	}
759	}	910	}
760		911
761	sub smooth_update {	912	sub smooth_update {
762	my ($self, $facenum, $face) = @_;	913	my ($self, $facenum, $face) = @_;
763		914
764	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	915	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
765	}	916	}
766		917
767	sub set_texture {	918	sub have_tile {
768	my ($self, $id, $data) = @_;	919	my ($self, $tile, $data) = @_;
769		920
770	return unless $self->{map};	921	return unless $self->{map};
771		922
772	$self->{texture}[$id] = my $tex =	923	my $tex = $self->{texture}[$tile] \|\|=
773	new_from_image CFPlus::Texture	924	new CFPlus::Texture
		925	tile => $tile,
		926	image => $data, delete_image => 1,
774	$data, minify => 1, mipmap => 1;	927	minify => 1, mipmap => 1;
775		928
776	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	929	if (my $cbs = delete $self->{tile_cb}{$tile}) {
777	$self->{map_widget}->update;	930	$_->($tex) for @$cbs;
		931	}
		932	}
		933
		934	# call in non-void context registers a temporary
		935	# hook with handle, otherwise its permanent
		936	sub on_face_change {
		937	my ($self, $num, $cb) = @_;
		938
		939	push @{$self->{face_cb}{$num}}, $cb;
		940
		941	defined wantarray
		942	? CFPlus::guard {
		943	@{$self->{face_cb}{$num}}
		944	= grep $_ != $cb,
		945	@{$self->{face_cb}{$num}};
		946	}
		947	: ()
		948	}
		949
		950	# call in non-void context registers a temporary
		951	# hook with handle, otherwise its permanent
		952	sub register_face_handler {
		953	my ($self, $num, $cb) = @_;
		954
		955	return unless $num;
		956
		957	# invoke if available right now
		958	$cb->($self->{face}[$num], 0)
		959	unless exists $self->{face}[$num]{loading};
		960
		961	# future changes
		962	$self->on_face_change ($num => $cb)
778	}	963	}
779		964
780	sub sound_play {	965	sub sound_play {
781	my ($self, $x, $y, $soundnum, $type) = @_;	966	my ($self, $type, $face, $dx, $dy, $vol) = @_;
782		967
783	$self->{sound_play}->($x, $y, $soundnum, $type);	968	&::audio_sound_play ($face, $dx, $dy, $vol)
		969	unless $type & 1; # odd types are silent for future expansion
784	}	970	}
785		971
786	my $LAST_QUERY; # server is stupid, stupid, stupid	972	my $LAST_QUERY; # server is stupid, stupid, stupid
787		973
788	sub query {	974	sub query {
…		…
853	$self->{$type} = $text;	1039	$self->{$type} = $text;
854	} else {	1040	} else {
855	$self->logprint ("msg: ", $text);	1041	$self->logprint ("msg: ", $text);
856	return if $color < 0; # negative color == ignore if not understood	1042	return if $color < 0; # negative color == ignore if not understood
857		1043
858	my $fg = $CF_COLOR[$color % @CF_COLOR];	1044	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
859		1045
860	## try to create single paragraphs of multiple lines sent by the server	1046	## try to create single paragraphs of multiple lines sent by the server
861	# no longer neecssary with TRT servers	1047	# no longer neecssary with TRT servers
862	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1048	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
863		1049
864	::message ({ fg => $fg, markup => $_ })	1050	::message ({
		1051	fg => $fg,
		1052	markup => $_,
		1053	type => $type,
		1054	extra => [@extra],
		1055	color_flags => $color
865	for split /\n/, $text;	1056	}) for split /\n/, $text;
866		1057
867	$self->{statusbox}->add ($text,	1058	$self->{statusbox}->add ($text,
868	group => $text,	1059	group => $text,
869	fg => $fg,	1060	fg => $fg,
870	timeout => $color >= 2 ? 180 : 10,	1061	timeout => $color >= 2 ? 180 : 10,
…		…
926	$self->{map_widget}->clr_commands;	1117	$self->{map_widget}->clr_commands;
927		1118
928	::stop_game ();	1119	::stop_game ();
929	}	1120	}
930		1121
931	sub image_info {
932	my ($self, $numfaces) = @_;
933
934	$self->{num_faces} = $numfaces;
935	$self->{face_prefetch} = [1 .. $numfaces];
936	$self->face_prefetch;
937	}
938
939	sub face_prefetch {
940	my ($self) = @_;
941
942	return unless $::CFG->{face_prefetch};
943
944	if ($self->{num_faces}) {
945	return if @{ $self->{send_queue} \|\| [] };
946	my $todo = @{ $self->{face_prefetch} }
947	or return;
948
949	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
950
951	$self->send ("requestinfo image_sums $face $face");
952
953	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
954	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
955	} elsif (!exists $self->{num_faces}) {
956	$self->send ("requestinfo image_info");
957
958	$self->{num_faces} = 0;
959
960	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
961	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
962	}
963	}
964
965	sub update_floorbox {	1122	sub update_floorbox {
966	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1123	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
967	return unless $::CONN;	1124	return unless $::CONN;
968		1125
969	$::FLOORBOX->clear;	1126	$::FLOORBOX->clear;
		1127
		1128	my @add;
970		1129
971	my $row;	1130	my $row;
972	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	1131	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
973	if ($row < 6) {	1132	if ($row < 6) {
974	local $_->{face_widget}; # hack to force recreation of widget	1133	local $_->{face_widget}; # hack to force recreation of widget
975	local $_->{desc_widget}; # hack to force recreation of widget	1134	local $_->{desc_widget}; # hack to force recreation of widget
976	CFPlus::Item::update_widgets $_;	1135	CFPlus::Item::update_widgets $_;
977		1136
		1137	push @add,
978	$::FLOORBOX->add (0, $row, $_->{face_widget});	1138	0, $row, $_->{face_widget},
979	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1139	1, $row, $_->{desc_widget};
980		1140
981	$row++;	1141	$row++;
982	} else {	1142	} else {
983	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1143	push @add, 1, $row, new CFPlus::UI::Button
984	text => "More...",	1144	text => "More...",
985	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1145	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
986	);	1146	;
987	last;	1147	last;
988	}	1148	}
989	}	1149	}
990	if ($::CONN->{open_container}) {	1150	if ($::CONN->{open_container}) {
991	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1151	push @add, 1, $row++, new CFPlus::UI::Button
992	text => "Close container",	1152	text => "Close container",
993	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1153	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
994	);	1154	;
995	}	1155	}
		1156
		1157	$::FLOORBOX->add_at (@add);
996	});	1158	});
997		1159
998	$::WANT_REFRESH++;	1160	$::WANT_REFRESH->start;
999	}	1161	}
1000		1162
1001	sub set_opencont {	1163	sub set_opencont {
1002	my ($conn, $tag, $name) = @_;	1164	my ($conn, $tag, $name) = @_;
1003	$conn->{open_container} = $tag;	1165	$conn->{open_container} = $tag;
1004	update_floorbox;	1166	update_floorbox;
1005		1167
1006	$::INV_RIGHT_HB->clear ();	1168	$::INVR_HB->clear ();
1007	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1169	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1008		1170
1009	if ($tag != 0) { # Floor isn't closable, is it?	1171	if ($tag != 0) { # Floor isn't closable, is it?
1010	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1172	$::INVR_HB->add (new CFPlus::UI::Button
1011	text => "Close container",	1173	text => "Close container",
1012	tooltip => "Close the currently open container (if one is open)",	1174	tooltip => "Close the currently open container (if one is open)",
1013	on_activate => sub {	1175	on_activate => sub {
1014	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1176	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
1015	if $tag != 0;	1177	if $tag != 0;
1016	#if $CONN->{open_container} != 0;
1017	0	1178	0
1018	},	1179	},
1019	);	1180	);
1020	}	1181	}
1021		1182
…		…
1120	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1281	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1121	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1282	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1122	. "map size $self->{mapw}×$self->{maph}\n"	1283	. "map size $self->{mapw}×$self->{maph}\n"
1123	);	1284	);
1124		1285
1125	::setup_build_button ($self->{editor_support}->{builder_ui});
1126	}	1286	}
1127		1287
1128	sub logged_in {	1288	sub logged_in {
1129	my ($self) = @_;	1289	my ($self) = @_;
1130		1290
1131	$self->send_ext_req (cfplus_support => version => 1, sub {	1291	$self->send_ext_req (cfplus_support => version => 2, sub {
		1292	my (%msg) = @_;
		1293
1132	$self->{cfplus_ext} = $_[0]{version};	1294	$self->{cfplus_ext} = $msg{version};
1133	$self->update_server_info;	1295	$self->update_server_info;
1134		1296
1135	if ($self->{cfplus_ext} >= 2) {	1297	if ($self->{cfplus_ext} >= 2) {
1136	$self->send_ext_req ("editor_support", sub {	1298	$self->send_ext_req ("editor_support", sub {
1137	$self->{editor_support} = $_[0];	1299	$self->{editor_support} = { @_ };
1138	$self->update_server_info;	1300	$self->update_server_info;
1139		1301
1140	0	1302	0
1141	});	1303	});
1142	}	1304	}
…		…
1150	$self->send_command ("output-count $::CFG->{output_count}");	1312	$self->send_command ("output-count $::CFG->{output_count}");
1151	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1313	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1152	$self->send_command ("pickup $::CFG->{pickup}");	1314	$self->send_command ("pickup $::CFG->{pickup}");
1153	}	1315	}
1154		1316
1155	sub buildat {
1156	my ($self, $builditem, $x, $y) = @_;
1157
1158	if ($self->{cfplus_ext}) {
1159	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1160	}
1161	}
1162
1163	sub lookat {	1317	sub lookat {
1164	my ($self, $x, $y) = @_;	1318	my ($self, $x, $y) = @_;
1165		1319
1166	if ($self->{cfplus_ext}) {	1320	if ($self->{cfplus_ext}) {
1167	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1321	$self->send_ext_req (lookat => $x, $y, sub {
1168	my ($msg) = @_;	1322	my (%msg) = @_;
1169		1323
1170	if (exists $msg->{npc_dialog}) {	1324	if (exists $msg{npc_dialog}) {
1171	# start npc chat dialog	1325	# start npc chat dialog
1172	$self->{npc_dialog} = new CFPlus::NPCDialog::	1326	$self->{npc_dialog} = new CFPlus::NPCDialog::
1173	dx => $x,	1327	token => $msg{npc_dialog},
1174	dy => $y,
1175	title => "$msg->{npc_dialog} (NPC)",	1328	title => "$msg{npc_dialog}[0] (NPC)",
1176	conn => $self,	1329	conn => $self,
1177	;	1330	;
1178	}	1331	}
1179	});	1332	});
1180	}	1333	}
…		…
1245	on_activate => sub { $this->destroy; 1 },	1398	on_activate => sub { $this->destroy; 1 },
1246	;	1399	;
1247		1400
1248	$self->update_options;	1401	$self->update_options;
1249		1402
1250	$self->{id} = $self->{conn}->send_ext_req (	1403	$self->{id} = "npc-channel-" . $self->{conn}->token;
1251	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1404	$self->{conn}->connect_ext ($self->{id} => sub {
1252	sub { $this && $this->feed (@_) }	1405	$this->feed (@_) if $this;
1253	);	1406	});
		1407
		1408	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1254		1409
1255	$self->{entry}->grab_focus;	1410	$self->{entry}->grab_focus;
1256		1411
1257	$self->{textview}->add_paragraph ({	1412	$self->{textview}->add_paragraph ({
1258	fg => [1, 1, 0, 1],	1413	fg => [1, 1, 0, 1],
…		…
1281	);	1436	);
1282	}	1437	}
1283	}	1438	}
1284		1439
1285	sub feed {	1440	sub feed {
1286	my ($self, $msg) = @_;	1441	my ($self, $type, @arg) = @_;
1287		1442
1288	CFPlus::weaken $self;	1443	CFPlus::weaken $self;
1289		1444
1290	if ($msg->{msgtype} eq "reply") {	1445	if ($type eq "update") {
		1446	my (%info) = @arg;
		1447
1291	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1448	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1292	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1449	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1293
1294	my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1295	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1296	my @link;
1297	$text =~ s{
1298	($match)
1299	}{
1300	my $kw = $1;
1301
1302	push @link, new CFPlus::UI::Label
1303	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1304	can_hover => 1,
1305	can_events => 1,
1306	padding_x => 0,
1307	padding_y => 0,
1308	on_button_up => sub {
1309	$self->send ($kw);
1310	};
1311
1312	"\x{fffc}"
1313	}giex;
1314		1450
		1451	if (exists $info{msg}) {
		1452	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1453	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1454	my @link;
		1455	$text =~ s{
		1456	($match)
		1457	}{
		1458	my $kw = $1;
		1459
		1460	push @link, new CFPlus::UI::Label
		1461	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1462	can_hover => 1,
		1463	can_events => 1,
		1464	padding_x => 0,
		1465	padding_y => 0,
		1466	on_button_up => sub {
		1467	$self->send ($kw);
		1468	};
		1469
		1470	"\x{fffc}"
		1471	}giex;
		1472
1315	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1473	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1316	$self->{textview}->scroll_to_bottom;	1474	$self->{textview}->scroll_to_bottom;
		1475	}
		1476
1317	$self->update_options;	1477	$self->update_options;
1318	} else {	1478	} else {
1319	$self->destroy;	1479	$self->destroy;
1320	}	1480	}
1321		1481
…		…
1326	my ($self, $msg) = @_;	1486	my ($self, $msg) = @_;
1327		1487
1328	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1488	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1329	$self->{textview}->scroll_to_bottom;	1489	$self->{textview}->scroll_to_bottom;
1330		1490
1331	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1491	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1332	}	1492	}
1333		1493
1334	sub destroy {	1494	sub destroy {
1335	my ($self) = @_;	1495	my ($self) = @_;
1336		1496
1337	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1497	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1338		1498
1339	if ($self->{conn}) {	1499	if ($self->{conn}) {
1340	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1500	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1341	delete $self->{conn}{npc_dialog};	1501	delete $self->{conn}{npc_dialog};
1342	$self->{conn}->disconnect_ext ($self->{id});	1502	$self->{conn}->disconnect_ext ($self->{id});
1343	}	1503	}
1344		1504
1345	$self->SUPER::destroy;	1505	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.120 by root, Sat Jul 14 13:04:42 2007 UTC vs. Revision 1.160 by root, Tue Aug 21 22:46:50 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.120 by root, Sat Jul 14 13:04:42 2007 UTC vs.
Revision 1.160 by root, Tue Aug 21 22:46:50 2007 UTC