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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.124 by root, Fri Jul 20 16:32:04 2007 UTC vs.
Revision 1.161 by root, Wed Aug 22 16:52:34 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	&::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
107	$self->connect_ext (event_capabilities => sub {
108	my ($cap) = @_;
109
110	if (my $ts = $cap->{tileset}) {
111	if (my ($default) = grep $_->[2] & 1, @$ts) {
112	$self->{tileset} = $default;
113	$self->{tilesize} = $default->[3];
114	$self->setup_req (tileset => $default->[0]);
115
116	my $w = int $self->{mapw} * 32 / $self->{tilesize};
117	my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119	$self->setup_req (mapsize => "${w}x${h}");
120	}
121	}
122	});
123
124	$self->{json_coder}	53	$self->{json_coder}
125	->convert_blessed	54	->convert_blessed
126	->filter_json_single_key_object (__widget_ref__ => sub {	55	->filter_json_single_key_object (__w_ => sub {
127	$self->{widget}{$_[0]}	56	$self->{widget}{$_[0]}
128	});	57	});
129
130	# widgetset new
131	$self->connect_ext (ws_n => sub {
132	my ($arg) = @_;
133
134	$self->{widgetset}{$arg{id}} = {
135	w => {},
136	};
137	});
138
139	# widgetset destroy
140	$self->connect_ext (ws_d => sub {
141	my ($arg) = @_;
142
143	my $ws = delete $self->{widgetset}{$arg{id}}
144	or return;
145
146	$_->destroy
147	for values %{$ws->{w}};
148	});
149
150	# widgetset destroy
151	$self->connect_ext (ws_c => sub {
152	my ($arg) = @_;
153
154	my $args = $arg->{args} \|\| {};
155
156	for my $ev (grep /^on_/, keys %$args) {
157	$args->{$ev} = sub {
158	my $id = shift->{s_id};
159	$self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161	1
162	};
163	}
164
165	if (my $widget = eval {
166	local $SIG{__DIE__};
167	"CFPlus::UI::$arg->{class}"->new (
168	%$args,
169	s_ws => $arg->{ws},
170	s_id => $arg->{id},
171	)
172	}
173	) {
174	$self->{widget}{$arg->{id}}
175	= $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176	= $widget;
177
178	$widget->connect (on_destroy => sub {
179	my ($widget) = @_;
180
181	delete $self->{widget}{$widget->{s_id}};
182	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183	});
184	} else {
185	warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186	$self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187	}
188	});
189
190	# widget call
191	$self->connect_ext (w_c => sub {
192	my ($arg) = @_;
193
194	my $w = $self->{widget}{$arg->{id}}
195	or return;
196	my $m = $arg->{name};
197
198	my $a = $arg->{args} \|\| [];
199
200	if (exists $arg->{rid}) {
201	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202	} else {
203	$w->$m (@$a);
204	}
205	});
206
207	# widget set
208	$self->connect_ext (w_s => sub {
209	my ($arg) = @_;
210
211	my $w = $self->{widget}{$arg->{id}}
212	or return;
213
214	$w->{$arg->{name}} = $arg->{value};
215	});
216
217	# widget get
218	$self->connect_ext (w_g => sub {
219	my ($arg) = @_;
220
221	my $w = $self->{widget}{$arg->{id}}
222	or return;
223
224	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
225	});
226		58
227	# destroy widgets on logout	59	# destroy widgets on logout
228	$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 {
229	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {	61	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
230	$_->destroy	62	$_->destroy
…		…
253	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	85	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
254		86
255	$self	87	$self
256	}	88	}
257		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
258	sub logprint {	309	sub logprint {
259	my ($self, @a) = @_;	310	my ($self, @a) = @_;
260		311
261	$self->{log_fh} \|\|= do {	312	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
262	my $path = "$Crossfire::VARDIR/log.$self->{host}";
263
264	open my $fh, ">>:utf8", $path
265	or die "Couldn't open logfile $path: $!";
266
267	$fh->autoflush (1);
268
269	$fh;
270	};
271
272	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
273
274	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
275	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
276
277	print {$self->{log_fh}} "$ts ", @a, "\n";
278	}	313	}
279		314
280	sub _stat_numdiff {	315	sub _stat_numdiff {
281	my ($self, $name, $old, $new) = @_;	316	my ($self, $name, $old, $new) = @_;
282		317
…		…
415	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	450	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
416	$::GAUGES->{food} ->set_value ($fo, $fo_m);	451	$::GAUGES->{food} ->set_value ($fo, $fo_m);
417	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	452	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
418	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	453	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
419	. " (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});
420	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});	456	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
421	my $title = $stats->{+CS_STAT_TITLE};	457	my $title = $stats->{+CS_STAT_TITLE};
422	$title =~ s/^Player: //;	458	$title =~ s/^Player: //;
423	$::STATWIDS->{title} ->set_text ("Title: " . $title);	459	$::STATWIDS->{title} ->set_text ("Title: " . $title);
424		460
…		…
445	my @skills = keys %{ $self->{skill_info} };	481	my @skills = keys %{ $self->{skill_info} };
446		482
447	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	483	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
448	$sktbl->clear;	484	$sktbl->clear;
449		485
450	my @add;	486	my $sw = $self->{skillwid}{""} \|\|= [
451
452	push @add,
453	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),	487	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
454	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),
455	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),	490	3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
456	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),	491	4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
457	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),
458	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),	494	7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
459	;	495	];
		496
		497	my @add = @$sw;
460		498
461	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>";
462		500
463	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);
464	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);
…		…
492	}	530	}
493		531
494	1	532	1
495	};	533	};
496		534
		535	my $sw = $self->{skillwid}{$idx} \|\|= [
		536	# exp
		537	(new CFPlus::UI::Label
		538	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
		539
		540	# level
		541	(new CFPlus::UI::Label
		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
		548	(new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
		549	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		550	];
		551
497	push @add,	552	push @add,
498	$x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	553	$x * 4 + 0, $y, $sw->[0],
499	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),	554	$x * 4 + 1, $y, $sw->[1],
500	$x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	555	$x * 4 + 2, $y, $sw->[2],
501	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),	556	$x * 4 + 3, $y, $sw->[3],
502	$x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
503	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
504	;	557	;
505		558
506	$x++ and ($x, $y) = (0, $y + 1);	559	$x++ and ($x, $y) = (0, $y + 1);
507	}	560	}
508		561
509	$sktbl->add_at (@add);	562	$sktbl->add_at (@add);
510	}	563	}
511		564
512	for (grep exists $stats->{$_}, @skills) {	565	for (grep exists $stats->{$_}, @skills) {
		566	my $sw = $self->{skillwid}{$_};
513	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	567	$sw->[0]->set_text (::formsep ($stats->{$_}[1]));
514	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	568	$sw->[1]->set_text ($stats->{$_}[0] * 1);
		569	$sw->[2]->set_value (@{$stats->{$_}});
515	}	570	}
516	}	571	}
517		572
518	sub macro_send {	573	sub macro_send {
519	my ($self, $macro) = @_;	574	my ($self, $macro) = @_;
…		…
547	}	602	}
548		603
549	sub feed_map1a {	604	sub feed_map1a {
550	my ($self, $data) = @_;	605	my ($self, $data) = @_;
551		606
552	$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	if $self->{map_widget};
		634	});
		635	} else {
553	$self->{map_widget}->update;	636	$self->{map_widget}->update;
		637	}
554	}	638	}
555		639
556	sub magicmap {	640	sub magicmap {
557	my ($self, $w, $h, $x, $y, $data) = @_;	641	my ($self, $w, $h, $x, $y, $data) = @_;
558		642
…		…
565	my $map_info = delete $self->{map_info}	649	my $map_info = delete $self->{map_info}
566	or return;	650	or return;
567		651
568	my ($hash, $x, $y, $w, $h) = @$map_info;	652	my ($hash, $x, $y, $w, $h) = @$map_info;
569		653
570	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	654	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
		655	$self->{map_cache_new}{$hash} = \$data;
571	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	656	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
572	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
573	}	657	}
574		658
575	sub map_clear {	659	sub map_clear {
576	my ($self) = @_;	660	my ($self) = @_;
577		661
…		…
583	}	667	}
584		668
585	sub bg_fetch {	669	sub bg_fetch {
586	my ($self) = @_;	670	my ($self) = @_;
587		671
588	my $id;	672	my $tile;
589		673
590	do {	674	do {
591	$id = pop @{$self->{bg_fetch}}	675	$tile = pop @{$self->{bg_fetch}}
592	or return;	676	or return;
593	} while $self->{texture}[$id];	677	} while $self->{texture}[$tile];
594		678
595	CFPlus::DB::get tilecache => $id, sub {	679	CFPlus::DB::get tilecache => $tile, sub {
596	my ($data) = @_;	680	my ($data) = @_;
597		681
598	return unless $self->{map}; # stop when destroyed	682	return unless $self->{map}; # stop when destroyed
599		683
600	$self->set_texture ($id => $data)
601	if defined $data;	684	if (defined $data) {
		685	$self->have_tile ($tile, $data);
		686	$self->{texture}[$tile]->upload;
		687	}
602		688
603	$self->bg_fetch;	689	$self->bg_fetch;
604	};	690	};
605	}	691	}
606		692
607	sub load_map($$$) {	693	sub load_map($$$) {
608	my ($self, $hash, $x, $y) = @_;	694	my ($self, $hash, $x, $y) = @_;
609		695
610	my $gen = $self->{map_change_gen};	696	my $gen = $self->{map_change_gen};
611		697
612	CFPlus::DB::get $self->{mapcache} => $hash, sub {	698	my $cb = sub {
613	return unless $gen == $self->{map_change_gen};	699	return unless $gen == $self->{map_change_gen};
614		700
615	my ($data) = @_;	701	my ($data) = @_;
616		702
617	if (defined $data) {	703	if (defined $data) {
		704	$self->{map_cache_new}{$hash} = \$data;
		705
618	$data = Compress::LZF::decompress $data;	706	my $data = Compress::LZF::decompress $data;
619	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
620		707
621	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	708	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
622	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	709	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
623	$self->bg_fetch unless $inprogress;	710	$self->bg_fetch unless $inprogress;
624	}	711	}
625	};	712	};
		713
		714	if (my $rdata = $self->{map_cache_old}{$hash}) {
		715	$cb->($$rdata);
		716	} else {
		717	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
		718	}
626	}	719	}
627		720
628	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	721	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
629	# (server resource,s latency, bandwidth), so this hack is warranted.	722	# (server resource,s latency, bandwidth), so this hack is warranted.
630	# the right fix is to make real tiled maps with an overview file	723	# the right fix is to make real tiled maps with an overview file
…		…
723	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	816	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
724		817
725	$self->flush_map;	818	$self->flush_map;
726		819
727	++$self->{map_change_gen};	820	++$self->{map_change_gen};
		821	$self->{map_cache_old} = delete $self->{map_cache_new};
728		822
729	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	823	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
730		824
731	my $mapmapw = $self->{mapmap}->{w};	825	my $mapmapw = $self->{mapmap}->{w};
732	my $mapmaph = $self->{mapmap}->{h};	826	my $mapmaph = $self->{mapmap}->{h};
…		…
751	}	845	}
752		846
753	sub face_find {	847	sub face_find {
754	my ($self, $facenum, $face, $cb) = @_;	848	my ($self, $facenum, $face, $cb) = @_;
755		849
756	my $hash = "$face->{chksum},$face->{name}";	850	if ($face->{type} == 0) { # FT_FACE
757
758	my $id = CFPlus::DB::get_tile_id_sync $hash;	851	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
759		852
760	$face->{id} = $id;	853	$face->{id} = $id;
761	$self->{faceid}[$facenum] = $id;
762
763	$self->{map}->set_tileid ($facenum => $id);	854	$self->{map}->set_tileid ($facenum => $id);
764		855
765	CFPlus::DB::get tilecache => $id, $cb;	856	CFPlus::DB::get tilecache => $id, $cb;
		857
		858	} elsif ($face->{type} & 1) { # with metadata
		859	CFPlus::DB::get res_meta => $face->{name}, $cb;
		860
		861	} else { # no metadata
		862	CFPlus::DB::get res_data => $face->{name}, $cb;
		863	}
766	}	864	}
767		865
768	sub face_update {	866	sub face_update {
769	my ($self, $facenum, $face, $changed) = @_;	867	my ($self, $facenum, $face, $changed) = @_;
770		868
		869	if ($face->{type} == 0) {
		870	# image, FT_FACE
771	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	871	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
772	if $changed;	872	if $changed;
773		873
774	$self->set_texture ($face->{id} => delete $face->{image});	874	$self->have_tile ($face->{id}, delete $face->{data});
		875
		876	} elsif ($face->{type} & 1) {
		877	# split metadata case, FT_MUSIC, FT_SOUND
		878	if ($changed) { # new data
		879	my ($meta, $data) = unpack "(w/a)", $face->{data};
		880	$face->{data} = $meta;
		881
		882	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		883	CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
		884	}
		885
		886	$face->{data} = $self->{json_coder}->decode ($face->{data});
		887
		888	::add_license ($face);
		889
		890	if ($face->{type} == 3) { # FT_MUSIC
		891	::message ({ markup => "downloaded song #$facenum" })
		892	if $changed;
		893
		894	&::audio_music_push ($facenum);
		895	} elsif ($face->{type} == 5) { # FT_SOUND
		896	::message ({ markup => "downloaded sound #$facenum" })
		897	if $changed;
		898
		899	&::audio_sound_push ($facenum);
		900	}
		901
		902	} else {
		903	# flat resource case, FT_RSRC
		904	CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
		905	if $changed;
		906	}
		907
		908	if (my $cbs = $self->{face_cb}{$facenum}) {
		909	$_->($face, $changed) for @$cbs;
		910	}
775	}	911	}
776		912
777	sub smooth_update {	913	sub smooth_update {
778	my ($self, $facenum, $face) = @_;	914	my ($self, $facenum, $face) = @_;
779		915
780	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	916	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
781	}	917	}
782		918
783	sub set_texture {	919	sub have_tile {
784	my ($self, $id, $data) = @_;	920	my ($self, $tile, $data) = @_;
785		921
786	return unless $self->{map};	922	return unless $self->{map};
787		923
788	$self->{texture}[$id] = my $tex =	924	my $tex = $self->{texture}[$tile] \|\|=
789	new_from_image CFPlus::Texture	925	new CFPlus::Texture
		926	tile => $tile,
		927	image => $data, delete_image => 1,
790	$data, minify => 1, mipmap => 1;	928	minify => 1, mipmap => 1;
791		929
792	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	930	if (my $cbs = delete $self->{tile_cb}{$tile}) {
793	$self->{map_widget}->update;	931	$_->($tex) for @$cbs;
794		932	}
795	$_->() for @{(delete $self->{face_cb}{$id}) \|\| []};
796	}	933	}
797		934
798	sub connect_face_update {	935	# call in non-void context registers a temporary
		936	# hook with handle, otherwise its permanent
		937	sub on_face_change {
799	my ($self, $id, $cb) = @_;	938	my ($self, $num, $cb) = @_;
800		939
801	push @{$self->{face_cb}{$id}}, $cb;	940	push @{$self->{face_cb}{$num}}, $cb;
802		941
		942	defined wantarray
803	CFPlus::guard {	943	? CFPlus::guard {
804	@{$self->{face_cb}{$id}}	944	@{$self->{face_cb}{$num}}
805	= grep $_ != $cb,	945	= grep $_ != $cb,
806	@{$self->{face_cb}{$id}};	946	@{$self->{face_cb}{$num}};
807	}	947	}
		948	: ()
		949	}
		950
		951	# call in non-void context registers a temporary
		952	# hook with handle, otherwise its permanent
		953	sub register_face_handler {
		954	my ($self, $num, $cb) = @_;
		955
		956	return unless $num;
		957
		958	# invoke if available right now
		959	$cb->($self->{face}[$num], 0)
		960	unless exists $self->{face}[$num]{loading};
		961
		962	# future changes
		963	$self->on_face_change ($num => $cb)
808	}	964	}
809		965
810	sub sound_play {	966	sub sound_play {
811	my ($self, $x, $y, $soundnum, $type) = @_;	967	my ($self, $type, $face, $dx, $dy, $vol) = @_;
812		968
813	$self->{sound_play}->($x, $y, $soundnum, $type);	969	&::audio_sound_play ($face, $dx, $dy, $vol)
		970	unless $type & 1; # odd types are silent for future expansion
814	}	971	}
815		972
816	my $LAST_QUERY; # server is stupid, stupid, stupid	973	my $LAST_QUERY; # server is stupid, stupid, stupid
817		974
818	sub query {	975	sub query {
…		…
883	$self->{$type} = $text;	1040	$self->{$type} = $text;
884	} else {	1041	} else {
885	$self->logprint ("msg: ", $text);	1042	$self->logprint ("msg: ", $text);
886	return if $color < 0; # negative color == ignore if not understood	1043	return if $color < 0; # negative color == ignore if not understood
887		1044
888	my $fg = $CF_COLOR[$color % @CF_COLOR];	1045	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
889		1046
890	## try to create single paragraphs of multiple lines sent by the server	1047	## try to create single paragraphs of multiple lines sent by the server
891	# no longer neecssary with TRT servers	1048	# no longer neecssary with TRT servers
892	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1049	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
893		1050
894	::message ({ fg => $fg, markup => $_ })	1051	::message ({
		1052	fg => $fg,
		1053	markup => $_,
		1054	type => $type,
		1055	extra => [@extra],
		1056	color_flags => $color
895	for split /\n/, $text;	1057	}) for split /\n/, $text;
896		1058
897	$self->{statusbox}->add ($text,	1059	$self->{statusbox}->add ($text,
898	group => $text,	1060	group => $text,
899	fg => $fg,	1061	fg => $fg,
900	timeout => $color >= 2 ? 180 : 10,	1062	timeout => $color >= 2 ? 180 : 10,
…		…
956	$self->{map_widget}->clr_commands;	1118	$self->{map_widget}->clr_commands;
957		1119
958	::stop_game ();	1120	::stop_game ();
959	}	1121	}
960		1122
961	sub image_info {
962	my ($self, $numfaces) = @_;
963
964	$self->{num_faces} = $numfaces;
965	$self->{face_prefetch} = [1 .. $numfaces];
966	$self->face_prefetch;
967	}
968
969	sub face_prefetch {
970	my ($self) = @_;
971
972	return unless $::CFG->{face_prefetch};
973
974	if ($self->{num_faces}) {
975	return if @{ $self->{send_queue} \|\| [] };
976	my $todo = @{ $self->{face_prefetch} }
977	or return;
978
979	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
980
981	$self->send ("requestinfo image_sums $face $face");
982
983	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
984	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
985	} elsif (!exists $self->{num_faces}) {
986	$self->send ("requestinfo image_info");
987
988	$self->{num_faces} = 0;
989
990	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
991	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992	}
993	}
994
995	sub update_floorbox {	1123	sub update_floorbox {
996	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1124	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
997	return unless $::CONN;	1125	return unless $::CONN;
998		1126
999	$::FLOORBOX->clear;	1127	$::FLOORBOX->clear;
…		…
1028	}	1156	}
1029		1157
1030	$::FLOORBOX->add_at (@add);	1158	$::FLOORBOX->add_at (@add);
1031	});	1159	});
1032		1160
1033	$::WANT_REFRESH++;	1161	$::WANT_REFRESH->start;
1034	}	1162	}
1035		1163
1036	sub set_opencont {	1164	sub set_opencont {
1037	my ($conn, $tag, $name) = @_;	1165	my ($conn, $tag, $name) = @_;
1038	$conn->{open_container} = $tag;	1166	$conn->{open_container} = $tag;
1039	update_floorbox;	1167	update_floorbox;
1040		1168
1041	$::INV_RIGHT_HB->clear ();	1169	$::INVR_HB->clear ();
1042	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1170	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1043		1171
1044	if ($tag != 0) { # Floor isn't closable, is it?	1172	if ($tag != 0) { # Floor isn't closable, is it?
1045	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1173	$::INVR_HB->add (new CFPlus::UI::Button
1046	text => "Close container",	1174	text => "Close container",
1047	tooltip => "Close the currently open container (if one is open)",	1175	tooltip => "Close the currently open container (if one is open)",
1048	on_activate => sub {	1176	on_activate => sub {
1049	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1177	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
1050	if $tag != 0;	1178	if $tag != 0;
1051	#if $CONN->{open_container} != 0;
1052	0	1179	0
1053	},	1180	},
1054	);	1181	);
1055	}	1182	}
1056		1183
…		…
1155	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1282	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1156	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1283	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1157	. "map size $self->{mapw}×$self->{maph}\n"	1284	. "map size $self->{mapw}×$self->{maph}\n"
1158	);	1285	);
1159		1286
1160	::setup_build_button ($self->{editor_support}->{builder_ui});
1161	}	1287	}
1162		1288
1163	sub logged_in {	1289	sub logged_in {
1164	my ($self) = @_;	1290	my ($self) = @_;
1165		1291
1166	$self->send_ext_req (cfplus_support => version => 1, sub {	1292	$self->send_ext_req (cfplus_support => version => 2, sub {
		1293	my (%msg) = @_;
		1294
1167	$self->{cfplus_ext} = $_[0]{version};	1295	$self->{cfplus_ext} = $msg{version};
1168	$self->update_server_info;	1296	$self->update_server_info;
1169		1297
1170	if ($self->{cfplus_ext} >= 2) {	1298	if ($self->{cfplus_ext} >= 2) {
1171	$self->send_ext_req ("editor_support", sub {	1299	$self->send_ext_req ("editor_support", sub {
1172	$self->{editor_support} = $_[0];	1300	$self->{editor_support} = { @_ };
1173	$self->update_server_info;	1301	$self->update_server_info;
1174		1302
1175	0	1303	0
1176	});	1304	});
1177	}	1305	}
…		…
1185	$self->send_command ("output-count $::CFG->{output_count}");	1313	$self->send_command ("output-count $::CFG->{output_count}");
1186	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1314	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1187	$self->send_command ("pickup $::CFG->{pickup}");	1315	$self->send_command ("pickup $::CFG->{pickup}");
1188	}	1316	}
1189		1317
1190	sub buildat {
1191	my ($self, $builditem, $x, $y) = @_;
1192
1193	if ($self->{cfplus_ext}) {
1194	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1195	}
1196	}
1197
1198	sub lookat {	1318	sub lookat {
1199	my ($self, $x, $y) = @_;	1319	my ($self, $x, $y) = @_;
1200		1320
1201	if ($self->{cfplus_ext}) {	1321	if ($self->{cfplus_ext}) {
1202	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1322	$self->send_ext_req (lookat => $x, $y, sub {
1203	my ($msg) = @_;	1323	my (%msg) = @_;
1204		1324
1205	if (exists $msg->{npc_dialog}) {	1325	if (exists $msg{npc_dialog}) {
1206	# start npc chat dialog	1326	# start npc chat dialog
1207	$self->{npc_dialog} = new CFPlus::NPCDialog::	1327	$self->{npc_dialog} = new CFPlus::NPCDialog::
1208	dx => $x,	1328	token => $msg{npc_dialog},
1209	dy => $y,
1210	title => "$msg->{npc_dialog} (NPC)",	1329	title => "$msg{npc_dialog}[0] (NPC)",
1211	conn => $self,	1330	conn => $self,
1212	;	1331	;
1213	}	1332	}
1214	});	1333	});
1215	}	1334	}
…		…
1280	on_activate => sub { $this->destroy; 1 },	1399	on_activate => sub { $this->destroy; 1 },
1281	;	1400	;
1282		1401
1283	$self->update_options;	1402	$self->update_options;
1284		1403
1285	$self->{id} = $self->{conn}->send_ext_req (	1404	$self->{id} = "npc-channel-" . $self->{conn}->token;
1286	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1405	$self->{conn}->connect_ext ($self->{id} => sub {
1287	sub { $this && $this->feed (@_) }	1406	$this->feed (@_) if $this;
1288	);	1407	});
		1408
		1409	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1289		1410
1290	$self->{entry}->grab_focus;	1411	$self->{entry}->grab_focus;
1291		1412
1292	$self->{textview}->add_paragraph ({	1413	$self->{textview}->add_paragraph ({
1293	fg => [1, 1, 0, 1],	1414	fg => [1, 1, 0, 1],
…		…
1316	);	1437	);
1317	}	1438	}
1318	}	1439	}
1319		1440
1320	sub feed {	1441	sub feed {
1321	my ($self, $msg) = @_;	1442	my ($self, $type, @arg) = @_;
1322		1443
1323	CFPlus::weaken $self;	1444	CFPlus::weaken $self;
1324		1445
1325	if ($msg->{msgtype} eq "reply") {	1446	if ($type eq "update") {
		1447	my (%info) = @arg;
		1448
1326	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1449	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1327	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1450	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1328
1329	my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1330	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1331	my @link;
1332	$text =~ s{
1333	($match)
1334	}{
1335	my $kw = $1;
1336
1337	push @link, new CFPlus::UI::Label
1338	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1339	can_hover => 1,
1340	can_events => 1,
1341	padding_x => 0,
1342	padding_y => 0,
1343	on_button_up => sub {
1344	$self->send ($kw);
1345	};
1346
1347	"\x{fffc}"
1348	}giex;
1349		1451
		1452	if (exists $info{msg}) {
		1453	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1454	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1455	my @link;
		1456	$text =~ s{
		1457	($match)
		1458	}{
		1459	my $kw = $1;
		1460
		1461	push @link, new CFPlus::UI::Label
		1462	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1463	can_hover => 1,
		1464	can_events => 1,
		1465	padding_x => 0,
		1466	padding_y => 0,
		1467	on_button_up => sub {
		1468	$self->send ($kw);
		1469	};
		1470
		1471	"\x{fffc}"
		1472	}giex;
		1473
1350	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1474	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1351	$self->{textview}->scroll_to_bottom;	1475	$self->{textview}->scroll_to_bottom;
		1476	}
		1477
1352	$self->update_options;	1478	$self->update_options;
1353	} else {	1479	} else {
1354	$self->destroy;	1480	$self->destroy;
1355	}	1481	}
1356		1482
…		…
1361	my ($self, $msg) = @_;	1487	my ($self, $msg) = @_;
1362		1488
1363	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1489	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1364	$self->{textview}->scroll_to_bottom;	1490	$self->{textview}->scroll_to_bottom;
1365		1491
1366	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1492	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1367	}	1493	}
1368		1494
1369	sub destroy {	1495	sub destroy {
1370	my ($self) = @_;	1496	my ($self) = @_;
1371		1497
1372	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1498	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1373		1499
1374	if ($self->{conn}) {	1500	if ($self->{conn}) {
1375	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1501	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1376	delete $self->{conn}{npc_dialog};	1502	delete $self->{conn}{npc_dialog};
1377	$self->{conn}->disconnect_ext ($self->{id});	1503	$self->{conn}->disconnect_ext ($self->{id});
1378	}	1504	}
1379		1505
1380	$self->SUPER::destroy;	1506	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.124 by root, Fri Jul 20 16:32:04 2007 UTC vs. Revision 1.161 by root, Wed Aug 22 16:52:34 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.124 by root, Fri Jul 20 16:32:04 2007 UTC vs.
Revision 1.161 by root, Wed Aug 22 16:52:34 2007 UTC