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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC vs.
Revision 1.156 by root, Tue Aug 21 00:59: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	xwidget1 => 1,#d#
26	%{$arg{setup_req} \|\| {}},	27	%{$arg{setup_req} \|\| {}},
27	},	28	},
28	);	29	);
29		30
30	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
…		…
47	sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
48	@args	49	@args
49	} sort { $a->{par} <=> $b->{par} }	50	} sort { $a->{par} <=> $b->{par} }
50	CFPlus::Pod::find command => "*";	51	CFPlus::Pod::find command => "*";
51		52
		53	$self->connect_ext (ambient_music => sub {
		54	my ($songs) = @_;
		55	&::audio_music_set_ambient ($songs);
		56	});
		57
52	$self->connect_ext (event_capabilities => sub {	58	$self->connect_ext (capabilities => sub {
53	my ($cap) = @_;	59	my (%cap) = @_;
54		60
		61	#$self->send ("setup sound 0"); # we use a different protocol
		62	$self->update_fx_want;
		63
		64	$self->send_exti_req (resource => "exp_table", sub {
		65	my ($exp_table) = @_;
		66
		67	$self->register_face_handler ($exp_table, sub {
		68	my ($face) = @_;
		69
		70	$self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		71
		72	#TODO: update all interested parties
		73	});
		74
		75	()
		76	});
		77
55	if (my $ts = $cap->{tileset}) {	78	if (my $ts = $cap{tileset}) {
56	if (my ($default) = grep $_->[2] & 1, @$ts) {	79	if (my ($default) = grep $_->[2] & 1, @$ts) {
57	$self->{tileset} = $default;	80	$self->{tileset} = $default;
58	$self->{tilesize} = $default->[3];	81	$self->{tilesize} = $default->[3];
59	$self->setup_req (tileset => $default->[0]);	82	$self->setup_req (tileset => $default->[0]);
60		83
…		…
64	$self->setup_req (mapsize => "${w}x${h}");	87	$self->setup_req (mapsize => "${w}x${h}");
65	}	88	}
66	}	89	}
67	});	90	});
68		91
		92	$self->{json_coder}
		93	->convert_blessed
		94	->filter_json_single_key_object (__w_ => sub {
		95	$self->{widget}{$_[0]}
		96	});
		97
		98	# widgetset new
		99	$self->connect_ext (ws_n => sub {
		100	my ($id) = @_;
		101
		102	$self->{widgetset}{$id} = {
		103	w => {},
		104	};
		105	});
		106
		107	# widgetset destroy
		108	$self->connect_ext (ws_d => sub {
		109	my ($id) = @_;
		110
		111	my $ws = delete $self->{widgetset}{$id}
		112	or return;
		113
		114	$_->destroy
		115	for values %{$ws->{w}};
		116	});
		117
		118	# widgetset create
		119	$self->connect_ext (ws_c => sub {
		120	my ($ws, $id, $class, $args) = @_;
		121
		122	for my $ev (grep /^on_/, keys %$args) {
		123	my $rid = $args->{$ev};
		124	$args->{$ev} = sub {
		125	my $id = shift->{s_id};
		126	$self->send_exti_msg (w_e => $id, $rid, @_);
		127
		128	1
		129	};
		130	}
		131
		132	$self->widget_associate (
		133	$ws, $id => scalar eval {
		134	local $SIG{__DIE__};
		135	"CFPlus::UI::$class"->new (%$args)
		136	}
		137	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		138	});
		139
		140	# widgetset associate
		141	$self->connect_ext (ws_a => sub {
		142	my (%ass) = @_;
		143
		144	# everything that has a name, wether conceivably useful or not
		145	my %wkw = (
		146	root => $CFPlus::UI::ROOT,
		147	tooltip => $CFPlus::UI::TOOLTIP,
		148
		149	mapwidget => $::MAPWIDGET,
		150	buttonbar => $::BUTTONBAR,
		151	metaserver => $::METASERVER,
		152	buttonbar => $::BUTTONBAR,
		153	login_button => $::LOGIN_BUTTON,
		154	quit_dialog => $::QUIT_DIALOG,
		155	host_entry => $::HOST_ENTRY,
		156	metaserver => $::METASERVER,
		157	server_info => $::SERVER_INFO,
		158
		159	setup_dialog => $::SETUP_DIALOG,
		160	setup_notebook => $::SETUP_NOTEBOOK,
		161	setup_server => $::SETUP_SERVER,
		162	setup_keyboard => $::SETUP_KEYBOARD,
		163
		164	pl_notebook => $::PL_NOTEBOOK,
		165	pl_window => $::PL_WINDOW,
		166	inventory_page => $::INVENTORY_PAGE,
		167	stats_page => $::STATS_PAGE,
		168	skill_page => $::SKILL_PAGE,
		169	spell_page => $::SPELL_PAGE,
		170	spell_list => $::SPELL_LIST,
		171
		172	floorbox => $::FLOORBOX,
		173	help_window => $::HELP_WINDOW,
		174	message_window => $::MESSAGE_WINDOW,
		175	statusbox => $::SDTATUSBOX,
		176
		177	inv => $::INV,
		178	invr => $::INVR,
		179	invr_hb => $::INVR_HB,
		180
		181	);
		182
		183	while (my ($id, $name) = each %ass) {
		184	$self->widget_associate (undef, $id => $wkw{$name})
		185	or warn "server failed to associate non-existent well-known widget $name\n";
		186	}
		187	});
		188
		189	# widget call
		190	$self->connect_ext (w_c => sub {
		191	my ($id, $rid, $method, @args) = @_;
		192
		193	my $w = $self->{widget}{$id}
		194	or return;
		195
		196	if ($rid) {
		197	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
		198	} else {
		199	$w->$method (@args);
		200	}
		201	});
		202
		203	# widget set
		204	$self->connect_ext (w_s => sub {
		205	my ($id, $attr) = @_;
		206
		207	my $w = $self->{widget}{$id}
		208	or return;
		209
		210	for (my $i = 0; $i < $#$attr; $i += 2) {
		211	my ($member, $value) = @$attr[$i, $i+1];
		212	if (defined $value) {
		213	$w->{$member} = $value;
		214	} else {
		215	delete $w->{$member};
		216	}
		217	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		218	}
		219	});
		220
		221	# widget get
		222	$self->connect_ext (w_g => sub {
		223	my ($id, $rid, $attr) = @_;
		224
		225	my $w = $self->{widget}{$id}
		226	or return;
		227
		228	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		229	});
		230
		231	# message window
		232	$self->connect_ext (channel_info => sub {
		233	my ($info) = @_;
		234	$self->{channels}->{$info->{id}} = $info;
		235	$::MESSAGE_WINDOW->add_channel ($info);
		236	});
		237
		238	# destroy widgets on logout
		239	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		240	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
		241	$_->destroy
		242	for values %{delete $ws->{w} \|\| {}};
		243	}
		244	});
		245
69	$self->{map_widget}->add_command (@$_)	246	$self->{map_widget}->add_command (@$_)
70	for @cmd_help;	247	for @cmd_help;
71		248
72	{	249	{
73	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture	250	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
…		…
87	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	264	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
88		265
89	$self	266	$self
90	}	267	}
91		268
		269	sub widget_associate {
		270	my ($self, $ws, $id, $widget) = @_;
		271
		272	if ($widget) {
		273	$widget->{s_id} = $id;
		274	$self->{widget}{$id} = $widget;
		275
		276	if ($ws) {
		277	$widget->{s_ws} = $ws;
		278	$self->{widgetset}{$ws}{w}{$id} = $widget;
		279	}
		280
		281	$widget->connect (on_destroy => sub {
		282	my ($widget) = @_;
		283
		284	delete $self->{widget}{$widget->{s_id}};
		285	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		286	if exists $widget->{s_ws};
		287	});
		288
		289	1
		290	} else {
		291	$self->send_exti_msg (w_e => $id, undef);
		292
		293	0
		294	}
		295	}
		296
		297	sub update_fx_want {
		298	my ($self) = @_;
		299
		300	$self->send_exti_msg (fx_want => {
		301	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		302	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		303	6 => 1, # FT_RSRC
		304	});
		305	}
		306
92	sub logprint {	307	sub logprint {
93	my ($self, @a) = @_;	308	my ($self, @a) = @_;
94		309
95	$self->{log_fh} \|\|= do {	310	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
96	my $path = "$Crossfire::VARDIR/log.$self->{host}";
97
98	open my $fh, ">>:utf8", $path
99	or die "Couldn't open logfile $path: $!";
100
101	$fh->autoflush (1);
102
103	$fh;
104	};
105
106	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
107
108	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
109	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
110
111	print {$self->{log_fh}} "$ts ", @a, "\n";
112	}	311	}
113		312
114	sub _stat_numdiff {	313	sub _stat_numdiff {
115	my ($self, $name, $old, $new) = @_;	314	my ($self, $name, $old, $new) = @_;
116		315
…		…
249	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	448	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
250	$::GAUGES->{food} ->set_value ($fo, $fo_m);	449	$::GAUGES->{food} ->set_value ($fo, $fo_m);
251	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	450	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
252	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	451	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
253	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	452	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
254	my $rng = $stats->{+CS_STAT_RANGE};	453	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
255	$rng =~ s/^Range: //; # thank you so much dear server
256	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
257	my $title = $stats->{+CS_STAT_TITLE};	454	my $title = $stats->{+CS_STAT_TITLE};
258	$title =~ s/^Player: //;	455	$title =~ s/^Player: //;
259	$::STATWIDS->{title} ->set_text ("Title: " . $title);	456	$::STATWIDS->{title} ->set_text ("Title: " . $title);
260		457
261	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	458	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
281	my @skills = keys %{ $self->{skill_info} };	478	my @skills = keys %{ $self->{skill_info} };
282		479
283	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	480	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
284	$sktbl->clear;	481	$sktbl->clear;
285		482
		483	my @add;
		484
		485	push @add,
286	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	486	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
287	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	487	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
288	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	488	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
289	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	489	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
290	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	490	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
291	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	491	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		492	;
292		493
293	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	494	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
294		495
295	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	496	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
296	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	497	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
…		…
324	}	525	}
325		526
326	1	527	1
327	};	528	};
328		529
		530	push @add,
329	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	531	$x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
330	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	532	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
331	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	533	$x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
332	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	534	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
333	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	535	$x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
334	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	536	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		537	;
335		538
336	$x++ and ($x, $y) = (0, $y + 1);	539	$x++ and ($x, $y) = (0, $y + 1);
337	}	540	}
		541
		542	$sktbl->add_at (@add);
338	}	543	}
339		544
340	for (grep exists $stats->{$_}, @skills) {	545	for (grep exists $stats->{$_}, @skills) {
341	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	546	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
342	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	547	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
…		…
375	}	580	}
376		581
377	sub feed_map1a {	582	sub feed_map1a {
378	my ($self, $data) = @_;	583	my ($self, $data) = @_;
379		584
380	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	585	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		586	my $delay;
		587
		588	for my $tile (@$missing) {
		589	next if $self->{delay}{$tile};
		590
		591	$delay = 1;
		592
		593	if (my $tex = $::CONN->{texture}[$tile]) {
		594	$tex->upload;
		595	} else {
		596	$self->{delay}{$tile} = 1;
		597
		598	# we assume the face is in-flight and will eventually come
		599	push @{$self->{tile_cb}{$tile}}, sub {
		600	delete $self->{delay}{$tile};
		601	$_[0]->upload;
		602	};
		603	}
		604	}
		605
		606	if ($delay) {
		607	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		608	Event->timer (after => 0.03, cb => sub {
		609	$_[0]->w->cancel;
		610	$self->{map_widget}->update;
		611	});
		612	} else {
381	$self->{map_widget}->update;	613	$self->{map_widget}->update;
		614	}
382	}	615	}
383		616
384	sub magicmap {	617	sub magicmap {
385	my ($self, $w, $h, $x, $y, $data) = @_;	618	my ($self, $w, $h, $x, $y, $data) = @_;
386		619
…		…
393	my $map_info = delete $self->{map_info}	626	my $map_info = delete $self->{map_info}
394	or return;	627	or return;
395		628
396	my ($hash, $x, $y, $w, $h) = @$map_info;	629	my ($hash, $x, $y, $w, $h) = @$map_info;
397		630
398	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	631	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
		632	$self->{map_cache_new}{$hash} = \$data;
399	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	633	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
400	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
401	}	634	}
402		635
403	sub map_clear {	636	sub map_clear {
404	my ($self) = @_;	637	my ($self) = @_;
405		638
…		…
411	}	644	}
412		645
413	sub bg_fetch {	646	sub bg_fetch {
414	my ($self) = @_;	647	my ($self) = @_;
415		648
416	my $id;	649	my $tile;
417		650
418	do {	651	do {
419	$id = pop @{$self->{bg_fetch}}	652	$tile = pop @{$self->{bg_fetch}}
420	or return;	653	or return;
421	} while $self->{texture}[$id];	654	} while $self->{texture}[$tile];
422		655
423	CFPlus::DB::get tilecache => $id, sub {	656	CFPlus::DB::get tilecache => $tile, sub {
424	my ($data) = @_;	657	my ($data) = @_;
425		658
426	return unless $self->{map}; # stop when destroyed	659	return unless $self->{map}; # stop when destroyed
427		660
428	$self->set_texture ($id => $data)
429	if defined $data;	661	if (defined $data) {
		662	$self->have_tile ($tile, $data);
		663	$self->{texture}[$tile]->upload;
		664	}
430		665
431	$self->bg_fetch;	666	$self->bg_fetch;
432	};	667	};
433	}	668	}
434		669
435	sub load_map($$$) {	670	sub load_map($$$) {
436	my ($self, $hash, $x, $y) = @_;	671	my ($self, $hash, $x, $y) = @_;
437		672
438	my $gen = $self->{map_change_gen};	673	my $gen = $self->{map_change_gen};
439		674
440	CFPlus::DB::get $self->{mapcache} => $hash, sub {	675	my $cb = sub {
441	return unless $gen == $self->{map_change_gen};	676	return unless $gen == $self->{map_change_gen};
442		677
443	my ($data) = @_;	678	my ($data) = @_;
444		679
445	if (defined $data) {	680	if (defined $data) {
		681	$self->{map_cache_new}{$hash} = \$data;
		682
446	$data = Compress::LZF::decompress $data;	683	my $data = Compress::LZF::decompress $data;
447	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
448		684
449	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	685	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
450	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	686	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
451	$self->bg_fetch unless $inprogress;	687	$self->bg_fetch unless $inprogress;
452	}	688	}
453	};	689	};
		690
		691	if (my $rdata = $self->{map_cache_old}{$hash}) {
		692	$cb->($$rdata);
		693	} else {
		694	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
		695	}
454	}	696	}
455		697
456	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	698	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
457	# (server resource,s latency, bandwidth), so this hack is warranted.	699	# (server resource,s latency, bandwidth), so this hack is warranted.
458	# the right fix is to make real tiled maps with an overview file	700	# the right fix is to make real tiled maps with an overview file
…		…
551	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	793	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
552		794
553	$self->flush_map;	795	$self->flush_map;
554		796
555	++$self->{map_change_gen};	797	++$self->{map_change_gen};
		798	$self->{map_cache_old} = delete $self->{map_cache_new};
556		799
557	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	800	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
558		801
559	my $mapmapw = $self->{mapmap}->{w};	802	my $mapmapw = $self->{mapmap}->{w};
560	my $mapmaph = $self->{mapmap}->{h};	803	my $mapmaph = $self->{mapmap}->{h};
…		…
579	}	822	}
580		823
581	sub face_find {	824	sub face_find {
582	my ($self, $facenum, $face, $cb) = @_;	825	my ($self, $facenum, $face, $cb) = @_;
583		826
584	my $hash = "$face->{chksum},$face->{name}";	827	if ($face->{type} == 0) { # FT_FACE
585
586	my $id = CFPlus::DB::get_tile_id_sync $hash;	828	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
587		829
588	$face->{id} = $id;	830	$face->{id} = $id;
589	$self->{faceid}[$facenum] = $id;
590
591	$self->{map}->set_tileid ($facenum => $id);	831	$self->{map}->set_tileid ($facenum => $id);
592		832
593	CFPlus::DB::get tilecache => $id, $cb;	833	CFPlus::DB::get tilecache => $id, $cb;
		834
		835	} elsif ($face->{type} & 1) { # with metadata
		836	CFPlus::DB::get res_meta => $face->{name}, $cb;
		837
		838	} else { # no metadata
		839	CFPlus::DB::get res_data => $face->{name}, $cb;
		840	}
594	}	841	}
595		842
596	sub face_update {	843	sub face_update {
597	my ($self, $facenum, $face, $changed) = @_;	844	my ($self, $facenum, $face, $changed) = @_;
598		845
		846	if ($face->{type} == 0) {
		847	# image, FT_FACE
599	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	848	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
600	if $changed;	849	if $changed;
601		850
602	$self->set_texture ($face->{id} => delete $face->{image});	851	$self->have_tile ($face->{id}, delete $face->{data});
		852
		853	} elsif ($face->{type} & 1) {
		854	# split metadata case, FT_MUSIC, FT_SOUND
		855	if ($changed) { # new data
		856	my ($meta, $data) = unpack "(w/a)", $face->{data};
		857	$face->{data} = $meta;
		858
		859	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		860	CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
		861	}
		862
		863	$face->{data} = $self->{json_coder}->decode ($face->{data});
		864
		865	::add_license ($face);
		866
		867	if ($face->{type} == 3) { # FT_MUSIC
		868	::message ({ markup => "downloaded song #$facenum" })
		869	if $changed;
		870
		871	&::audio_music_push ($facenum);
		872	} elsif ($face->{type} == 5) { # FT_SOUND
		873	::message ({ markup => "downloaded sound #$facenum" })
		874	if $changed;
		875
		876	&::audio_sound_push ($facenum);
		877	}
		878
		879	} else {
		880	# flat resource case, FT_RSRC
		881	CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
		882	if $changed;
		883	}
		884
		885	if (my $cbs = $self->{face_cb}{$facenum}) {
		886	$_->($face, $changed) for @$cbs;
		887	}
603	}	888	}
604		889
605	sub smooth_update {	890	sub smooth_update {
606	my ($self, $facenum, $face) = @_;	891	my ($self, $facenum, $face) = @_;
607		892
608	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	893	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
609	}	894	}
610		895
611	sub set_texture {	896	sub have_tile {
612	my ($self, $id, $data) = @_;	897	my ($self, $tile, $data) = @_;
613		898
614	$self->{texture}[$id] = my $tex =	899	return unless $self->{map};
		900
		901	my $tex = $self->{texture}[$tile] \|\|=
615	new_from_image CFPlus::Texture	902	new CFPlus::Texture
		903	tile => $tile,
		904	image => $data, delete_image => 1,
616	$data, minify => 1, mipmap => 1;	905	minify => 1, mipmap => 1;
617		906
618	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	907	if (my $cbs = delete $self->{tile_cb}{$tile}) {
619	$self->{map_widget}->update;	908	$_->($tex) for @$cbs;
		909	}
		910	}
		911
		912	# call in non-void context registers a temporary
		913	# hook with handle, otherwise its permanent
		914	sub on_face_change {
		915	my ($self, $num, $cb) = @_;
		916
		917	push @{$self->{face_cb}{$num}}, $cb;
		918
		919	defined wantarray
		920	? CFPlus::guard {
		921	@{$self->{face_cb}{$num}}
		922	= grep $_ != $cb,
		923	@{$self->{face_cb}{$num}};
		924	}
		925	: ()
		926	}
		927
		928	# call in non-void context registers a temporary
		929	# hook with handle, otherwise its permanent
		930	sub register_face_handler {
		931	my ($self, $num, $cb) = @_;
		932
		933	# invoke if available right now
		934	$cb->($self->{face}[$num], 0)
		935	unless exists $self->{face}[$num]{loading};
		936
		937	# future changes
		938	$self->on_face_change ($num => $cb)
620	}	939	}
621		940
622	sub sound_play {	941	sub sound_play {
623	my ($self, $x, $y, $soundnum, $type) = @_;	942	my ($self, $type, $face, $dx, $dy, $vol) = @_;
624		943
625	$self->{sound_play}->($x, $y, $soundnum, $type);	944	&::audio_sound_play ($face, $dx, $dy, $vol)
		945	unless $type & 1; # odd types are silent for future expansion
626	}	946	}
627		947
628	my $LAST_QUERY; # server is stupid, stupid, stupid	948	my $LAST_QUERY; # server is stupid, stupid, stupid
629		949
630	sub query {	950	sub query {
…		…
633	$prompt = $LAST_QUERY unless length $prompt;	953	$prompt = $LAST_QUERY unless length $prompt;
634	$LAST_QUERY = $prompt;	954	$LAST_QUERY = $prompt;
635		955
636	$self->{query}-> ($self, $flags, $prompt);	956	$self->{query}-> ($self, $flags, $prompt);
637	}	957	}
		958
		959	sub sanitise_xml($) {
		960	local $_ = shift;
		961
		962	# we now weed out all tags we do not support
		963	s%<(?!/?i>\|/?u>\|/?b>\|fg \|/fg>)%<%g;
		964	# now all entities
		965	s/&(?!amp;\|lt;\|gt;\|apos;\|quot;\|#[0-9]+;\|#x[0-9a-fA-F]+;)/&/g;
		966
		967	# handle some elements
		968	s/<fg name='([^'])'>(.?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		969	s/<fg name="([^"])">(.?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		970
		971	$_
		972	}
		973
		974	our %NAME_TO_COLOR = (
		975	black => 0,
		976	white => 1,
		977	darkblue => 2,
		978	red => 3,
		979	orange => 4,
		980	lightblue => 5,
		981	darkorange => 6,
		982	green => 7,
		983	darkgreen => 8,
		984	grey => 9,
		985	brown => 10,
		986	yellow => 11,
		987	tan => 12,
		988	);
638		989
639	our @CF_COLOR = (	990	our @CF_COLOR = (
640	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	991	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
641	[1.00, 1.00, 1.00],	992	[1.00, 1.00, 1.00],
642	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	993	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
…		…
650	[0.75, 0.61, 0.20],	1001	[0.75, 0.61, 0.20],
651	[0.99, 0.77, 0.26],	1002	[0.99, 0.77, 0.26],
652	[0.74, 0.65, 0.41],	1003	[0.74, 0.65, 0.41],
653	);	1004	);
654		1005
655	sub drawinfo {	1006	sub msg {
656	my ($self, $color, $text) = @_;	1007	my ($self, $color, $type, $text, @extra) = @_;
657		1008
658	my $fg = $CF_COLOR[$color % @CF_COLOR];	1009	$text = sanitise_xml $text;
659		1010
		1011	if (my $cb = $self->{cb_msg}{$type}) {
		1012	$_->($self, $color, $type, $text, @extra) for values %$cb;
		1013	} elsif ($type =~ /^(?:chargen-race-title\|chargen-race-description)$/) {
		1014	$type =~ s/-/_/g;
		1015	$self->{$type} = $text;
		1016	} else {
660	$self->logprint ("info: ", $text);	1017	$self->logprint ("msg: ", $text);
		1018	return if $color < 0; # negative color == ignore if not understood
661		1019
		1020	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
		1021
662	## try to create single paragraphs of multiple lines sent by the server	1022	## try to create single paragraphs of multiple lines sent by the server
663	# no longer neecssary with TRT servers	1023	# no longer neecssary with TRT servers
664	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1024	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
665		1025
666	$text = CFPlus::asxml $text;	1026	::message ({
667	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	1027	fg => $fg,
668	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	1028	markup => $_,
669		1029	type => $type,
670	::message ({ fg => $fg, markup => $_ })	1030	extra => [@extra],
		1031	color_flags => $color
671	for split /\n/, $text;	1032	}) for split /\n/, $text;
672		1033
673	$self->{statusbox}->add ($text,	1034	$self->{statusbox}->add ($text,
674	group => $text,	1035	group => $text,
675	fg => $fg,	1036	fg => $fg,
676	timeout => $color >= 2 ? 180 : 10,	1037	timeout => $color >= 2 ? 180 : 10,
677	tooltip_font => $::FONT_FIXED,	1038	tooltip_font => $::FONT_FIXED,
678	);	1039	);
679	}	1040	}
680
681	sub drawextinfo {
682	my ($self, $color, $type, $subtype, $message) = @_;
683
684	$self->drawinfo ($color, $message);
685	}	1041	}
686		1042
687	sub spell_add {	1043	sub spell_add {
688	my ($self, $spell) = @_;	1044	my ($self, $spell) = @_;
689		1045
…		…
737	$self->{map_widget}->clr_commands;	1093	$self->{map_widget}->clr_commands;
738		1094
739	::stop_game ();	1095	::stop_game ();
740	}	1096	}
741		1097
742	sub image_info {
743	my ($self, $numfaces) = @_;
744
745	$self->{num_faces} = $numfaces;
746	$self->{face_prefetch} = [1 .. $numfaces];
747	$self->face_prefetch;
748	}
749
750	sub face_prefetch {
751	my ($self) = @_;
752
753	return unless $::CFG->{face_prefetch};
754
755	if ($self->{num_faces}) {
756	return if @{ $self->{send_queue} \|\| [] };
757	my $todo = @{ $self->{face_prefetch} }
758	or return;
759
760	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
761
762	$self->send ("requestinfo image_sums $face $face");
763
764	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
765	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
766	} elsif (!exists $self->{num_faces}) {
767	$self->send ("requestinfo image_info");
768
769	$self->{num_faces} = 0;
770
771	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
772	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
773	}
774	}
775
776	sub update_floorbox {	1098	sub update_floorbox {
777	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1099	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
778	return unless $::CONN;	1100	return unless $::CONN;
779		1101
780	$::FLOORBOX->clear;	1102	$::FLOORBOX->clear;
		1103
		1104	my @add;
781		1105
782	my $row;	1106	my $row;
783	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	1107	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
784	if ($row < 6) {	1108	if ($row < 6) {
785	local $_->{face_widget}; # hack to force recreation of widget	1109	local $_->{face_widget}; # hack to force recreation of widget
786	local $_->{desc_widget}; # hack to force recreation of widget	1110	local $_->{desc_widget}; # hack to force recreation of widget
787	CFPlus::Item::update_widgets $_;	1111	CFPlus::Item::update_widgets $_;
788		1112
		1113	push @add,
789	$::FLOORBOX->add (0, $row, $_->{face_widget});	1114	0, $row, $_->{face_widget},
790	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1115	1, $row, $_->{desc_widget};
791		1116
792	$row++;	1117	$row++;
793	} else {	1118	} else {
794	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1119	push @add, 1, $row, new CFPlus::UI::Button
795	text => "More...",	1120	text => "More...",
796	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1121	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
797	);	1122	;
798	last;	1123	last;
799	}	1124	}
800	}	1125	}
801	if ($::CONN->{open_container}) {	1126	if ($::CONN->{open_container}) {
802	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1127	push @add, 1, $row++, new CFPlus::UI::Button
803	text => "Close container",	1128	text => "Close container",
804	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1129	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
805	);	1130	;
806	}	1131	}
807	});
808		1132
		1133	$::FLOORBOX->add_at (@add);
		1134	});
		1135
809	$::WANT_REFRESH++;	1136	$::WANT_REFRESH->start;
810	}	1137	}
811		1138
812	sub set_opencont {	1139	sub set_opencont {
813	my ($conn, $tag, $name) = @_;	1140	my ($conn, $tag, $name) = @_;
814	$conn->{open_container} = $tag;	1141	$conn->{open_container} = $tag;
815	update_floorbox;	1142	update_floorbox;
816		1143
817	$::INV_RIGHT_HB->clear ();	1144	$::INVR_HB->clear ();
818	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1145	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
819		1146
820	if ($tag != 0) { # Floor isn't closable, is it?	1147	if ($tag != 0) { # Floor isn't closable, is it?
821	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1148	$::INVR_HB->add (new CFPlus::UI::Button
822	text => "Close container",	1149	text => "Close container",
823	tooltip => "Close the currently open container (if one is open)",	1150	tooltip => "Close the currently open container (if one is open)",
824	on_activate => sub {	1151	on_activate => sub {
825	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1152	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
826	if $tag != 0;	1153	if $tag != 0;
827	#if $CONN->{open_container} != 0;
828	0	1154	0
829	},	1155	},
830	);	1156	);
831	}	1157	}
832		1158
…		…
931	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1257	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
932	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1258	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
933	. "map size $self->{mapw}×$self->{maph}\n"	1259	. "map size $self->{mapw}×$self->{maph}\n"
934	);	1260	);
935		1261
936	::setup_build_button ($self->{editor_support}->{builder_ui});
937	}	1262	}
938		1263
939	sub logged_in {	1264	sub logged_in {
940	my ($self) = @_;	1265	my ($self) = @_;
941		1266
942	$self->send_ext_req (cfplus_support => version => 1, sub {	1267	$self->send_ext_req (cfplus_support => version => 2, sub {
		1268	my (%msg) = @_;
		1269
943	$self->{cfplus_ext} = $_[0]{version};	1270	$self->{cfplus_ext} = $msg{version};
944	$self->update_server_info;	1271	$self->update_server_info;
945		1272
946	if ($self->{cfplus_ext} >= 2) {	1273	if ($self->{cfplus_ext} >= 2) {
947	$self->send_ext_req ("editor_support", sub {	1274	$self->send_ext_req ("editor_support", sub {
948	$self->{editor_support} = $_[0];	1275	$self->{editor_support} = { @_ };
949	$self->update_server_info;	1276	$self->update_server_info;
950		1277
951	0	1278	0
952	});	1279	});
953	}	1280	}
…		…
961	$self->send_command ("output-count $::CFG->{output_count}");	1288	$self->send_command ("output-count $::CFG->{output_count}");
962	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1289	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
963	$self->send_command ("pickup $::CFG->{pickup}");	1290	$self->send_command ("pickup $::CFG->{pickup}");
964	}	1291	}
965		1292
966	sub buildat {
967	my ($self, $builditem, $x, $y) = @_;
968
969	if ($self->{cfplus_ext}) {
970	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
971	}
972	}
973
974	sub lookat {	1293	sub lookat {
975	my ($self, $x, $y) = @_;	1294	my ($self, $x, $y) = @_;
976		1295
977	if ($self->{cfplus_ext}) {	1296	if ($self->{cfplus_ext}) {
978	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1297	$self->send_ext_req (lookat => $x, $y, sub {
979	my ($msg) = @_;	1298	my (%msg) = @_;
980		1299
981	if (exists $msg->{npc_dialog}) {	1300	if (exists $msg{npc_dialog}) {
982	# start npc chat dialog	1301	# start npc chat dialog
983	$self->{npc_dialog} = new CFPlus::NPCDialog::	1302	$self->{npc_dialog} = new CFPlus::NPCDialog::
984	dx => $x,	1303	token => $msg{npc_dialog},
985	dy => $y,
986	title => "$msg->{npc_dialog} (NPC)",	1304	title => "$msg{npc_dialog}[0] (NPC)",
987	conn => $self,	1305	conn => $self,
988	;	1306	;
989	}	1307	}
990	});	1308	});
991	}	1309	}
…		…
998		1316
999	(delete $self->{npc_dialog})->destroy	1317	(delete $self->{npc_dialog})->destroy
1000	if $self->{npc_dialog};	1318	if $self->{npc_dialog};
1001		1319
1002	$self->SUPER::destroy;	1320	$self->SUPER::destroy;
		1321
		1322	%$self = ();
1003	}	1323	}
1004		1324
1005	package CFPlus::NPCDialog;	1325	package CFPlus::NPCDialog;
1006		1326
1007	our @ISA = 'CFPlus::UI::Toplevel';	1327	our @ISA = 'CFPlus::UI::Toplevel';
…		…
1054	on_activate => sub { $this->destroy; 1 },	1374	on_activate => sub { $this->destroy; 1 },
1055	;	1375	;
1056		1376
1057	$self->update_options;	1377	$self->update_options;
1058		1378
1059	$self->{id} = $self->{conn}->send_ext_req (	1379	$self->{id} = "npc-channel-" . $self->{conn}->token;
1060	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1380	$self->{conn}->connect_ext ($self->{id} => sub {
1061	sub { $this && $this->feed (@_) }	1381	$this->feed (@_) if $this;
1062	);	1382	});
		1383
		1384	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1063		1385
1064	$self->{entry}->grab_focus;	1386	$self->{entry}->grab_focus;
1065		1387
1066	$self->{textview}->add_paragraph ({	1388	$self->{textview}->add_paragraph ({
1067	fg => [1, 1, 0, 1],	1389	fg => [1, 1, 0, 1],
…		…
1090	);	1412	);
1091	}	1413	}
1092	}	1414	}
1093		1415
1094	sub feed {	1416	sub feed {
1095	my ($self, $msg) = @_;	1417	my ($self, $type, @arg) = @_;
1096		1418
1097	CFPlus::weaken $self;	1419	CFPlus::weaken $self;
1098		1420
1099	if ($msg->{msgtype} eq "reply") {	1421	if ($type eq "update") {
		1422	my (%info) = @arg;
		1423
1100	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1424	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1101	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1425	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1102
1103	my $text = "\n" . CFPlus::asxml $msg->{msg};
1104	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1105	my @link;
1106	$text =~ s{
1107	($match)
1108	}{
1109	my $kw = $1;
1110
1111	push @link, new CFPlus::UI::Label
1112	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1113	can_hover => 1,
1114	can_events => 1,
1115	padding_x => 0,
1116	padding_y => 0,
1117	on_button_up => sub {
1118	$self->send ($kw);
1119	};
1120
1121	"\x{fffc}"
1122	}giex;
1123		1426
		1427	if (exists $info{msg}) {
		1428	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1429	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1430	my @link;
		1431	$text =~ s{
		1432	($match)
		1433	}{
		1434	my $kw = $1;
		1435
		1436	push @link, new CFPlus::UI::Label
		1437	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1438	can_hover => 1,
		1439	can_events => 1,
		1440	padding_x => 0,
		1441	padding_y => 0,
		1442	on_button_up => sub {
		1443	$self->send ($kw);
		1444	};
		1445
		1446	"\x{fffc}"
		1447	}giex;
		1448
1124	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1449	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1125	$self->{textview}->scroll_to_bottom;	1450	$self->{textview}->scroll_to_bottom;
		1451	}
		1452
1126	$self->update_options;	1453	$self->update_options;
1127	} else {	1454	} else {
1128	$self->destroy;	1455	$self->destroy;
1129	}	1456	}
1130		1457
…		…
1135	my ($self, $msg) = @_;	1462	my ($self, $msg) = @_;
1136		1463
1137	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1464	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1138	$self->{textview}->scroll_to_bottom;	1465	$self->{textview}->scroll_to_bottom;
1139		1466
1140	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1467	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1141	}	1468	}
1142		1469
1143	sub destroy {	1470	sub destroy {
1144	my ($self) = @_;	1471	my ($self) = @_;
1145		1472
1146	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1473	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1147		1474
1148	if ($self->{conn}) {	1475	if ($self->{conn}) {
1149	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1476	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1150	delete $self->{conn}{npc_dialog};	1477	delete $self->{conn}{npc_dialog};
1151	$self->{conn}->disconnect_ext ($self->{id});	1478	$self->{conn}->disconnect_ext ($self->{id});
1152	}	1479	}
1153		1480
1154	$self->SUPER::destroy;	1481	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC vs. Revision 1.156 by root, Tue Aug 21 00:59:34 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC vs.
Revision 1.156 by root, Tue Aug 21 00:59:34 2007 UTC