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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.88 by root, Sun Nov 19 20:31:29 2006 UTC vs.
Revision 1.137 by root, Sat Jul 28 00:45:28 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Crossfire::Protocol::Constants;	6	use Crossfire::Protocol::Constants;
7		7
8	use CFPlus;	8	use CFPlus;
		9	use CFPlus::DB;
9	use CFPlus::UI;	10	use CFPlus::UI;
10	use CFPlus::Pod;	11	use CFPlus::Pod;
		12	use CFPlus::Macro;
		13	use CFPlus::Item;
11		14
12	use Crossfire::Protocol::Base 0.95;	15	use Crossfire::Protocol::Base 0.95;
13		16
14	use base 'Crossfire::Protocol::Base';	17	use base 'Crossfire::Protocol::Base';
15		18
16	sub new {	19	sub new {
17	my $class = shift;	20	my ($class, %arg) = @_;
18		21
19	my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });	22	my $self = $class->SUPER::new (%arg,
		23	setup_req => {
		24	extmap => 1,
		25	excmd => 1,
		26	ywidget => 1,#d#
		27	%{$arg{setup_req} \|\| {}},
		28	},
		29	);
20		30
21	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
22		32
23	my @cmd_help = map {	33	my @cmd_help = map {
24	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	34	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
…		…
35	for @args;	45	for @args;
36		46
37	map ["$cmd$_", $text],	47	map ["$cmd$_", $text],
38	sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
39	@args	49	@args
40	} sort { $a->{par} <=> $b->{par} }	50	} sort { $a->{par} <=> $b->{par} }
41	CFPlus::Pod::find command => "*";	51	CFPlus::Pod::find command => "*";
42		52
		53	$self->connect_ext (music => sub {
		54	my ($ev) = @_;
		55
		56	&::audio_music_set ($self->{songs} = $ev->{play})
		57	if $ev->{play};
		58	});
		59
		60	$self->connect_ext (capabilities => sub {
		61	my (%cap) = @_;
		62
		63	#$self->send ("setup sound 0"); # we use a different protocol
		64
		65	$self->send_exti_msg (fx_want => {
		66	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		67	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		68	});
		69
		70	if (my $ts = $cap{tileset}) {
		71	if (my ($default) = grep $_->[2] & 1, @$ts) {
		72	$self->{tileset} = $default;
		73	$self->{tilesize} = $default->[3];
		74	$self->setup_req (tileset => $default->[0]);
		75
		76	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		77	my $h = int $self->{maph} * 32 / $self->{tilesize};
		78
		79	$self->setup_req (mapsize => "${w}x${h}");
		80	}
		81	}
		82	});
		83
		84	$self->{json_coder}
		85	->convert_blessed
		86	->filter_json_single_key_object (__w_ => sub {
		87	$self->{widget}{$_[0]}
		88	});
		89
		90	# widgetset new
		91	$self->connect_ext (ws_n => sub {
		92	my ($id) = @_;
		93
		94	$self->{widgetset}{$id} = {
		95	w => {},
		96	};
		97	});
		98
		99	# widgetset destroy
		100	$self->connect_ext (ws_d => sub {
		101	my ($id) = @_;
		102
		103	my $ws = delete $self->{widgetset}{$id}
		104	or return;
		105
		106	$_->destroy
		107	for values %{$ws->{w}};
		108	});
		109
		110	# widgetset create
		111	$self->connect_ext (ws_c => sub {
		112	my ($ws, $id, $class, $args) = @_;
		113
		114	for my $ev (grep /^on_/, keys %$args) {
		115	$args->{$ev} = sub {
		116	my $id = shift->{s_id};
		117	$self->send_exti_msg (w_e => $id, $ev, \@_);
		118
		119	1
		120	};
		121	}
		122
		123	if (my $widget = eval {
		124	local $SIG{__DIE__};
		125	"CFPlus::UI::$class"->new (
		126	%$args,
		127	s_ws => $ws,
		128	s_id => $id,
		129	)
		130	}
		131	) {
		132	$self->{widget}{$id}
		133	= $self->{widgetset}{$ws}{w}{$id}
		134	= $widget;
		135
		136	$widget->connect (on_destroy => sub {
		137	my ($widget) = @_;
		138
		139	delete $self->{widget}{$widget->{s_id}};
		140	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
		141	});
		142	} else {
		143	warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		144	$self->send_exti_msg (w_e => $id, "destroy");
		145	}
		146	});
		147
		148	# widget call
		149	$self->connect_ext (w_c => sub {
		150	my ($id, $rid, $method, $args) = @_;
		151
		152	my $w = $self->{widget}{$id}
		153	or return;
		154
		155	$args \|\|= [];
		156
		157	if ($rid) {
		158	$self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
		159	} else {
		160	$w->$method (@$args);
		161	}
		162	});
		163
		164	# widget set
		165	$self->connect_ext (w_s => sub {
		166	my ($id, $attr) = @_;
		167
		168	my $w = $self->{widget}{$id}
		169	or return;
		170
		171	for (my $i = 0; $i < $#$attr; $i += 2) {
		172	my ($member, $value) = @$attr[$i, $i+1];
		173	if (defined $value) {
		174	$w->{$member} = $value;
		175	} else {
		176	delete $w->{$member};
		177	}
		178	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		179	}
		180	});
		181
		182	# widget get
		183	$self->connect_ext (w_g => sub {
		184	my ($id, $rid, $attr) = @_;
		185
		186	my $w = $self->{widget}{$id}
		187	or return;
		188
		189	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		190	});
		191
		192	# message window
		193	$self->connect_ext (channel_info => sub {
		194	my ($info) = @_;
		195	$self->{channels}->{$info->{id}} = $info;
		196	$::MESSAGE_WINDOW->add_channel ($info);
		197	});
		198
		199	# destroy widgets on logout
		200	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		201	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
		202	$_->destroy
		203	for values %{delete $ws->{w} \|\| {}};
		204	}
		205	});
		206
43	$self->{map_widget}->add_command (@$_)	207	$self->{map_widget}->add_command (@$_)
44	for @cmd_help;	208	for @cmd_help;
45
46	$self->{noface} = new_from_file CFPlus::Texture
47	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48		209
49	{	210	{
50	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture	211	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;	212	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});	213	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53	}	214	}
54		215
		216	{
		217	$self->{noface} = my $tex = new_from_file CFPlus::Texture
		218	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		219	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		220	}
		221
55	$self->{open_container} = 0;	222	$self->{open_container} = 0;
56		223
57	# "global"
58	$self->{tilecache} = CFPlus::db_table "tilecache"
59	or die "tilecache: unable to open database table";
60	$self->{facemap} = CFPlus::db_table "facemap"
61	or die "facemap: unable to open database table";
62
63	# per server	224	# per server
64	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"	225	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65	or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66		226
67	$self	227	$self
68	}	228	}
69		229
70	sub logprint {	230	sub logprint {
…		…
227	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	387	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
228	$::GAUGES->{food} ->set_value ($fo, $fo_m);	388	$::GAUGES->{food} ->set_value ($fo, $fo_m);
229	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	389	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
230	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	390	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
231	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	391	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
232	my $rng = $stats->{+CS_STAT_RANGE};	392	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
233	$rng =~ s/^Range: //; # thank you so much dear server
234	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
235	my $title = $stats->{+CS_STAT_TITLE};	393	my $title = $stats->{+CS_STAT_TITLE};
236	$title =~ s/^Player: //;	394	$title =~ s/^Player: //;
237	$::STATWIDS->{title} ->set_text ("Title: " . $title);	395	$::STATWIDS->{title} ->set_text ("Title: " . $title);
238		396
239	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	397	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
259	my @skills = keys %{ $self->{skill_info} };	417	my @skills = keys %{ $self->{skill_info} };
260		418
261	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	419	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
262	$sktbl->clear;	420	$sktbl->clear;
263		421
		422	my @add;
		423
		424	push @add,
264	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	425	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
265	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	426	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
266	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	427	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
267	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	428	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
268	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	429	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
269	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	430	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		431	;
270		432
271	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	433	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
272		434
273	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	435	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
274	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	436	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
…		…
288	if ($ev->{button} == 1) {	450	if ($ev->{button} == 1) {
289	$::CONN->user_send ("ready_skill $name");	451	$::CONN->user_send ("ready_skill $name");
290	} elsif ($ev->{button} == 2) {	452	} elsif ($ev->{button} == 2) {
291	$::CONN->user_send ("use_skill $name");	453	$::CONN->user_send ("use_skill $name");
292	} elsif ($ev->{button} == 3) {	454	} elsif ($ev->{button} == 3) {
		455	my $shortname = CFPlus::shorten $name, 14;
293	(new CFPlus::UI::Menu	456	(new CFPlus::UI::Menu
294	items => [	457	items => [
295	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],	458	["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
296	["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],	459	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
297	],	460	],
298	)->popup ($ev);	461	)->popup ($ev);
299	} else {	462	} else {
300	return 0;	463	return 0;
301	}	464	}
302		465
303	1	466	1
304	};	467	};
305		468
		469	push @add,
306	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	470	$x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
307	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	471	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
308	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	472	$x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
309	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	473	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
310	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	474	$x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
311	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	475	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		476	;
312		477
313	$x++ and ($x, $y) = (0, $y + 1);	478	$x++ and ($x, $y) = (0, $y + 1);
314	}	479	}
		480
		481	$sktbl->add_at (@add);
315	}	482	}
316		483
317	for (grep exists $stats->{$_}, @skills) {	484	for (grep exists $stats->{$_}, @skills) {
318	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	485	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
319	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	486	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
320	}	487	}
321	}	488	}
322		489
		490	sub macro_send {
		491	my ($self, $macro) = @_;
		492
		493	for my $cmd (@{ $macro->{action} }) {
		494	$self->send_command ($cmd);
		495	}
		496	}
		497
323	sub user_send {	498	sub user_send {
324	my ($self, $command) = @_;	499	my ($self, $command) = @_;
325		500
326	push @{$self->{record}}, $command	501	$self->{record}->($command)
327	if $self->{record};	502	if $self->{record};
328		503
329	$self->logprint ("send: ", $command);	504	$self->logprint ("send: ", $command);
330	$self->send_command ($command);	505	$self->send_command ($command);
331	::status ($command);	506	::status ($command);
332	}	507	}
333		508
334	sub start_record {	509	sub record {
335	my ($self) = @_;	510	my ($self, $cb) = @_;
336		511
337	$self->{record} = [];	512	$self->{record} = $cb;
338	}
339
340	sub stop_record {
341	my ($self) = @_;
342	return delete $self->{record};
343	}	513	}
344		514
345	sub map_scroll {	515	sub map_scroll {
346	my ($self, $dx, $dy) = @_;	516	my ($self, $dx, $dy) = @_;
347		517
…		…
368	or return;	538	or return;
369		539
370	my ($hash, $x, $y, $w, $h) = @$map_info;	540	my ($hash, $x, $y, $w, $h) = @$map_info;
371		541
372	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	542	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
373	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	543	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
374	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	544	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
375	}	545	}
376		546
377	sub map_clear {	547	sub map_clear {
378	my ($self) = @_;	548	my ($self) = @_;
…		…
382		552
383	$self->{map}->clear;	553	$self->{map}->clear;
384	delete $self->{map_widget}{magicmap};	554	delete $self->{map_widget}{magicmap};
385	}	555	}
386		556
		557	sub bg_fetch {
		558	my ($self) = @_;
		559
		560	my $id;
		561
		562	do {
		563	$id = pop @{$self->{bg_fetch}}
		564	or return;
		565	} while $self->{texture}[$id];
		566
		567	CFPlus::DB::get tilecache => $id, sub {
		568	my ($data) = @_;
		569
		570	return unless $self->{map}; # stop when destroyed
		571
		572	$self->set_texture ($id => $data)
		573	if defined $data;
		574
		575	$self->bg_fetch;
		576	};
		577	}
387		578
388	sub load_map($$$) {	579	sub load_map($$$) {
389	my ($self, $hash, $x, $y) = @_;	580	my ($self, $hash, $x, $y) = @_;
390		581
391	if (defined (my $data = $self->{mapcache}->get ($hash))) {	582	my $gen = $self->{map_change_gen};
		583
		584	CFPlus::DB::get $self->{mapcache} => $hash, sub {
		585	return unless $gen == $self->{map_change_gen};
		586
		587	my ($data) = @_;
		588
		589	if (defined $data) {
392	$data = Compress::LZF::decompress $data;	590	$data = Compress::LZF::decompress $data;
393	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	591	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
394	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
395	my $data = $self->{tilecache}->get ($id)
396	or next;
397		592
398	$self->set_texture ($id => $data);	593	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
		594	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		595	$self->bg_fetch unless $inprogress;
399	}	596	}
400	}	597	};
401	}	598	}
402		599
403	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	600	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
404	# (server resource,s latency, bandwidth), so this hack is warranted.	601	# (server resource,s latency, bandwidth), so this hack is warranted.
405	# the right fix is to make real tiled maps with an overview file	602	# the right fix is to make real tiled maps with an overview file
…		…
469		666
470	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	667	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
471	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	668	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
472		669
473	} else {	670	} else {
		671	my $gen = $self->{map_change_gen};
474	$self->send_mapinfo ("spatial $path$tile", sub {	672	$self->send_mapinfo ("spatial $path$tile", sub {
		673	return unless $gen == $self->{map_change_gen};
		674
475	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	675	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
476		676
477	return if $mode ne "spatial";	677	return if $mode ne "spatial";
478		678
479	$x += $self->{map}->ox;	679	$x += $self->{map}->ox;
…		…
493		693
494	sub map_change {	694	sub map_change {
495	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	695	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
496		696
497	$self->flush_map;	697	$self->flush_map;
		698
		699	++$self->{map_change_gen};
498		700
499	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	701	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
500		702
501	my $mapmapw = $self->{mapmap}->{w};	703	my $mapmapw = $self->{mapmap}->{w};
502	my $mapmaph = $self->{mapmap}->{h};	704	my $mapmaph = $self->{mapmap}->{h};
…		…
519	$self->load_map ($hash, $x, $y);	721	$self->load_map ($hash, $x, $y);
520	$self->flood_fill (0, 0, 0, "", $hash, $flags);	722	$self->flood_fill (0, 0, 0, "", $hash, $flags);
521	}	723	}
522		724
523	sub face_find {	725	sub face_find {
524	my ($self, $facenum, $face) = @_;	726	my ($self, $facenum, $face, $cb) = @_;
525		727
526	my $hash = "$face->{chksum},$face->{name}";	728	if ($face->{type} == 0) { # FT_FACE
		729	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
527		730
528	my $id = $self->{facemap}->get ($hash);	731	$face->{id} = $id;
529
530	unless ($id) {
531	# create new id for face
532	# I love transactions
533	for (1..100) {
534	my $txn = $CFPlus::DB_ENV->txn_begin;
535	my $status = $self->{facemap}->db_get (id => $id);
536	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
537	$id = ($id \|\| 64) + 1;
538	if ($self->{facemap}->put (id => $id) == 0
539	&& $self->{facemap}->put ($hash => $id) == 0) {
540	$txn->txn_commit;
541
542	goto gotid;
543	}
544	}
545	$txn->txn_abort;
546	}
547
548	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
549	}
550
551	gotid:
552	$face->{id} = $id;
553	$self->{map}->set_face ($facenum => $id);
554	$self->{faceid}[$facenum] = $id;#d#	732	$self->{faceid}[$facenum] = $id;
555		733
556	my $face = $self->{tilecache}->get ($id);	734	$self->{map}->set_tileid ($facenum => $id);
557		735
558	if ($face) {	736	CFPlus::DB::get tilecache => $id, $cb;
559	#$self->face_prefetch;	737
560	$face	738	} elsif ($face->{type} & 1) { # with metadata
561	} else {	739	#::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
562	my $tex = $self->{noface};	740	CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
563	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
564	undef
565	};	741	}
566	}	742	}
567		743
568	sub face_update {	744	sub face_update {
569	my ($self, $facenum, $face, $changed) = @_;	745	my ($self, $facenum, $face, $changed) = @_;
570		746
571	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;	747	if ($face->{type} == 0) { # FT_FACE
		748	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		749	if $changed;
572		750
573	$self->set_texture ($face->{id} => delete $face->{image});	751	$self->set_texture ($face->{id} => delete $face->{data});
		752
		753	} elsif ($face->{type} & 1) { # split metadata
		754	my $cb = sub { };
		755
		756	if ($face->{type} == 3) { # FT_MUSIC
		757	$cb = sub {
		758	$self->{music_meta}{$facenum} = $face;
		759
		760	::message ({ markup => "downloaded song #$facenum" })
		761	if $changed;
		762
		763	&::audio_music_set ($self->{songs});
		764	};
		765	}
		766
		767	if ($changed) { # new data
		768	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};
		769	my $path = CFPlus::DB::path_of_res $face->{name};
		770
		771	CFPlus::DB::write_file $path, $data, sub {
		772	CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
		773	$face->{meta} = $self->{json_coder}->decode ($meta_json);
		774	$face->{path} = $path;
		775
		776	$cb->();
		777	};
		778	};
		779	} else {
		780	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
		781	$cb->();
		782	}
		783	}
		784	}
		785
		786	sub smooth_update {
		787	my ($self, $facenum, $face) = @_;
		788
		789	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
574	}	790	}
575		791
576	sub set_texture {	792	sub set_texture {
577	my ($self, $id, $data) = @_;	793	my ($self, $id, $data) = @_;
578		794
		795	return unless $self->{map};
		796
579	$self->{texture}[$id] \|\|= do {	797	$self->{texture}[$id] = my $tex =
580	my $tex =
581	new_from_image CFPlus::Texture	798	new_from_image CFPlus::Texture
582	$data, minify => 1, mipmap => 1;	799	$data, minify => 1, mipmap => 1;
583		800
584	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	801	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
585	$self->{map_widget}->update;	802	$self->{map_widget}->update;
586		803
587	$tex	804	$_->() for @{(delete $self->{face_cb}{$id}) \|\| []};
		805	}
		806
		807	sub connect_face_update {
		808	my ($self, $id, $cb) = @_;
		809
		810	push @{$self->{face_cb}{$id}}, $cb;
		811
		812	CFPlus::guard {
		813	@{$self->{face_cb}{$id}}
		814	= grep $_ != $cb,
		815	@{$self->{face_cb}{$id}};
588	};	816	}
589	}	817	}
590		818
591	sub sound_play {	819	sub sound_play {
592	my ($self, $x, $y, $soundnum, $type) = @_;	820	my ($self, $x, $y, $soundnum, $type) = @_;
		821	warn "sound play <@_>\n";#d#
593		822
594	$self->{sound_play}->($x, $y, $soundnum, $type);	823	#$self->{sound_play}->($x, $y, $soundnum, $type);
595	}	824	}
596		825
597	my $LAST_QUERY; # server is stupid, stupid, stupid	826	my $LAST_QUERY; # server is stupid, stupid, stupid
598		827
599	sub query {	828	sub query {
…		…
603	$LAST_QUERY = $prompt;	832	$LAST_QUERY = $prompt;
604		833
605	$self->{query}-> ($self, $flags, $prompt);	834	$self->{query}-> ($self, $flags, $prompt);
606	}	835	}
607		836
608	sub drawinfo {	837	sub sanitise_xml($) {
609	my ($self, $color, $text) = @_;	838	local $_ = shift;
610		839
611	my @color = (	840	# we now weed out all tags we do not support
		841	s%<(?!/?i>\|/?u>\|/?b>\|fg \|/fg>)%<%g;
		842	# now all entities
		843	s/&(?!amp;\|lt;\|gt;\|apos;\|quot;\|#[0-9]+;\|#x[0-9a-fA-F]+;)/&/g;
		844
		845	# handle some elements
		846	s/<fg name='([^'])'>(.?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		847	s/<fg name="([^"])">(.?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		848
		849	$_
		850	}
		851
		852	our %NAME_TO_COLOR = (
		853	black => 0,
		854	white => 1,
		855	darkblue => 2,
		856	red => 3,
		857	orange => 4,
		858	lightblue => 5,
		859	darkorange => 6,
		860	green => 7,
		861	darkgreen => 8,
		862	grey => 9,
		863	brown => 10,
		864	yellow => 11,
		865	tan => 12,
		866	);
		867
		868	our @CF_COLOR = (
612	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	869	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
613	[1.00, 1.00, 1.00],	870	[1.00, 1.00, 1.00],
614	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	871	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
615	[1.00, 0.00, 0.00],	872	[1.00, 0.00, 0.00],
616	[1.00, 0.54, 0.00],	873	[1.00, 0.54, 0.00],
617	[0.11, 0.56, 1.00],	874	[0.11, 0.56, 1.00],
618	[0.93, 0.46, 0.00],	875	[0.93, 0.46, 0.00],
619	[0.18, 0.54, 0.34],	876	[0.18, 0.54, 0.34],
620	[0.56, 0.73, 0.56],	877	[0.56, 0.73, 0.56],
621	[0.80, 0.80, 0.80],	878	[0.80, 0.80, 0.80],
622	[0.75, 0.61, 0.20],	879	[0.75, 0.61, 0.20],
623	[0.99, 0.77, 0.26],	880	[0.99, 0.77, 0.26],
624	[0.74, 0.65, 0.41],	881	[0.74, 0.65, 0.41],
625	);	882	);
626		883
		884	sub msg {
		885	my ($self, $color, $type, $text, @extra) = @_;
		886
		887	$text = sanitise_xml $text;
		888
		889	if (my $cb = $self->{cb_msg}{$type}) {
		890	$_->($self, $color, $type, $text, @extra) for values %$cb;
		891	} elsif ($type =~ /^(?:chargen-race-title\|chargen-race-description)$/) {
		892	$type =~ s/-/_/g;
		893	$self->{$type} = $text;
		894	} else {
627	$self->logprint ("info: ", $text);	895	$self->logprint ("msg: ", $text);
		896	return if $color < 0; # negative color == ignore if not understood
628		897
		898	my $fg = $CF_COLOR[$color % @CF_COLOR];
		899
629	# try to create single paragraphs of multiple lines sent by the server	900	## try to create single paragraphs of multiple lines sent by the server
		901	# no longer neecssary with TRT servers
630	$text =~ s/(?<=\S)\n(?=\w)/ /g;	902	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
631		903
632	$text = CFPlus::asxml $text;	904	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
633	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
634	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
635
636	::message ({ fg => $color[$color], markup => $_ })
637	for split /\n/, $text;	905	for split /\n/, $text;
638		906
639	$self->{statusbox}->add ($text,	907	$self->{statusbox}->add ($text,
640	group => $text,	908	group => $text,
641	fg => $color[$color],	909	fg => $fg,
642	timeout => $color >= 2 ? 180 : 10,	910	timeout => $color >= 2 ? 180 : 10,
643	tooltip_font => $::FONT_FIXED,	911	tooltip_font => $::FONT_FIXED,
644	);	912	);
645	}	913	}
646
647	sub drawextinfo {
648	my ($self, $color, $type, $subtype, $message) = @_;
649
650	$self->drawinfo ($color, $message);
651	}	914	}
652		915
653	sub spell_add {	916	sub spell_add {
654	my ($self, $spell) = @_;	917	my ($self, $spell) = @_;
655		918
…		…
671	}	934	}
672		935
673	sub setup {	936	sub setup {
674	my ($self, $setup) = @_;	937	my ($self, $setup) = @_;
675		938
		939	$self->{map_widget}->set_tilesize ($self->{tilesize});
676	$::MAP->resize ($self->{mapw}, $self->{maph});	940	$::MAP->resize ($self->{mapw}, $self->{maph});
677	}	941	}
678		942
679	sub addme_success {	943	sub addme_success {
680	my ($self) = @_;	944	my ($self) = @_;
…		…
742	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1006	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
743	return unless $::CONN;	1007	return unless $::CONN;
744		1008
745	$::FLOORBOX->clear;	1009	$::FLOORBOX->clear;
746		1010
		1011	my @add;
		1012
747	my $row;	1013	my $row;
748	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	1014	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
749	if ($row < 6) {	1015	if ($row < 6) {
750	local $_->{face_widget}; # hack to force recreation of widget	1016	local $_->{face_widget}; # hack to force recreation of widget
751	local $_->{desc_widget}; # hack to force recreation of widget	1017	local $_->{desc_widget}; # hack to force recreation of widget
752	CFPlus::Item::update_widgets $_;	1018	CFPlus::Item::update_widgets $_;
753		1019
		1020	push @add,
754	$::FLOORBOX->add (0, $row, $_->{face_widget});	1021	0, $row, $_->{face_widget},
755	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1022	1, $row, $_->{desc_widget};
756		1023
757	$row++;	1024	$row++;
758	} else {	1025	} else {
759	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1026	push @add, 1, $row, new CFPlus::UI::Button
760	text => "More...",	1027	text => "More...",
761	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1028	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
762	);	1029	;
763	last;	1030	last;
764	}	1031	}
765	}	1032	}
766	if ($::CONN->{open_container}) {	1033	if ($::CONN->{open_container}) {
767	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1034	push @add, 1, $row++, new CFPlus::UI::Button
768	text => "Close container",	1035	text => "Close container",
769	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1036	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
770	);	1037	;
771	}	1038	}
		1039
		1040	$::FLOORBOX->add_at (@add);
772	});	1041	});
773		1042
774	$::WANT_REFRESH++;	1043	$::WANT_REFRESH++;
775	}	1044	}
776		1045
…		…
887	$::SERVER_INFO->set_markup (	1156	$::SERVER_INFO->set_markup (
888	"server <tt>$self->{host}:$self->{port}</tt>\n"	1157	"server <tt>$self->{host}:$self->{port}</tt>\n"
889	. "protocol version <tt>$self->{version}</tt>\n"	1158	. "protocol version <tt>$self->{version}</tt>\n"
890	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1159	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
891	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1160	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1161	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
892	. "editing support $yesno[!!$self->{editor_support}]\n"	1162	. "editing support $yesno[!!$self->{editor_support}]\n"
893	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"	1163	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1164	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
894	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1165	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
895	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1166	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
896	. "map size $self->{mapw}×$self->{maph}\n"	1167	. "map size $self->{mapw}×$self->{maph}\n"
897	);	1168	);
		1169
898	}	1170	}
899		1171
900	sub logged_in {	1172	sub logged_in {
901	my ($self) = @_;	1173	my ($self) = @_;
902		1174
903	$self->send_ext_req (cfplus_support => version => 1, sub {	1175	$self->send_ext_req (cfplus_support => version => 2, sub {
		1176	my (%msg) = @_;
		1177
904	$self->{cfplus_ext} = $_[0]{version};	1178	$self->{cfplus_ext} = $msg{version};
905	$self->update_server_info;	1179	$self->update_server_info;
906		1180
907	if ($self->{cfplus_ext} >= 2) {	1181	if ($self->{cfplus_ext} >= 2) {
908	$self->send_ext_req ("editor_support", sub {	1182	$self->send_ext_req ("editor_support", sub {
909	$self->{editor_support} = $_[0];	1183	$self->{editor_support} = { @_ };
910	$self->update_server_info;	1184	$self->update_server_info;
911		1185
912	0	1186	0
913	});	1187	});
914	}	1188	}
…		…
918		1192
919	$self->update_server_info;	1193	$self->update_server_info;
920		1194
921	$self->send_command ("output-sync $::CFG->{output_sync}");	1195	$self->send_command ("output-sync $::CFG->{output_sync}");
922	$self->send_command ("output-count $::CFG->{output_count}");	1196	$self->send_command ("output-count $::CFG->{output_count}");
		1197	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
923	$self->send_command ("pickup $::CFG->{pickup}");	1198	$self->send_command ("pickup $::CFG->{pickup}");
924	}	1199	}
925		1200
926	sub lookat {	1201	sub lookat {
927	my ($self, $x, $y) = @_;	1202	my ($self, $x, $y) = @_;
928		1203
929	if ($self->{cfplus_ext}) {	1204	if ($self->{cfplus_ext}) {
930	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1205	$self->send_ext_req (lookat => $x, $y, sub {
931	my ($msg) = @_;	1206	my (%msg) = @_;
932		1207
933	if (exists $msg->{npc_dialog}) {	1208	if (exists $msg{npc_dialog}) {
934	# start npc chat dialog	1209	# start npc chat dialog
935	$self->{npc_dialog} = new CFPlus::NPCDialog::	1210	$self->{npc_dialog} = new CFPlus::NPCDialog::
936	dx => $x,	1211	token => $msg{npc_dialog},
937	dy => $y,
938	title => "$msg->{npc_dialog} (NPC)",	1212	title => "$msg{npc_dialog}[0] (NPC)",
939	conn => $self,	1213	conn => $self,
940	;	1214	;
941	}	1215	}
942	});	1216	});
943	}	1217	}
…		…
950		1224
951	(delete $self->{npc_dialog})->destroy	1225	(delete $self->{npc_dialog})->destroy
952	if $self->{npc_dialog};	1226	if $self->{npc_dialog};
953		1227
954	$self->SUPER::destroy;	1228	$self->SUPER::destroy;
		1229
		1230	%$self = ();
955	}	1231	}
956		1232
957	package CFPlus::NPCDialog;	1233	package CFPlus::NPCDialog;
958		1234
959	our @ISA = 'CFPlus::UI::Toplevel';	1235	our @ISA = 'CFPlus::UI::Toplevel';
…		…
971	kw => { hi => 0, yes => 0, no => 0 },	1247	kw => { hi => 0, yes => 0, no => 0 },
972	has_close_button => 1,	1248	has_close_button => 1,
973	@_,	1249	@_,
974	);	1250	);
975		1251
976	Scalar::Util::weaken (my $this = $self);	1252	CFPlus::weaken (my $this = $self);
977		1253
978	$self->connect (delete => sub { $this->destroy; 1 });	1254	$self->connect (delete => sub { $this->destroy; 1 });
979		1255
980	# better use a pane...	1256	# better use a pane...
981	$self->add (my $hbox = new CFPlus::UI::HBox);	1257	$self->add (my $hbox = new CFPlus::UI::HBox);
…		…
1006	on_activate => sub { $this->destroy; 1 },	1282	on_activate => sub { $this->destroy; 1 },
1007	;	1283	;
1008		1284
1009	$self->update_options;	1285	$self->update_options;
1010		1286
1011	$self->{id} = $self->{conn}->send_ext_req (	1287	$self->{id} = "npc-channel-" . $self->{conn}->token;
1012	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1288	$self->{conn}->connect_ext ($self->{id} => sub {
1013	sub { $this && $this->feed (@_) }	1289	$this->feed (@_) if $this;
1014	);	1290	});
		1291
		1292	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1015		1293
1016	$self->{entry}->grab_focus;	1294	$self->{entry}->grab_focus;
1017		1295
1018	$self->{textview}->add_paragraph ({	1296	$self->{textview}->add_paragraph ({
1019	fg => [1, 1, 0, 1],	1297	fg => [1, 1, 0, 1],
…		…
1025	};	1303	};
1026		1304
1027	sub update_options {	1305	sub update_options {
1028	my ($self) = @_;	1306	my ($self) = @_;
1029		1307
1030	Scalar::Util::weaken $self;	1308	CFPlus::weaken $self;
1031		1309
1032	$self->{options}->clear;	1310	$self->{options}->clear;
1033	$self->{options}->add ($self->{bye_button});	1311	$self->{options}->add ($self->{bye_button});
1034		1312
1035	for my $kw (sort keys %{ $self->{kw} }) {	1313	for my $kw (sort keys %{ $self->{kw} }) {
…		…
1042	);	1320	);
1043	}	1321	}
1044	}	1322	}
1045		1323
1046	sub feed {	1324	sub feed {
1047	my ($self, $msg) = @_;	1325	my ($self, $type, @arg) = @_;
1048		1326
1049	Scalar::Util::weaken $self;	1327	CFPlus::weaken $self;
1050		1328
1051	if ($msg->{msgtype} eq "reply") {	1329	if ($type eq "update") {
		1330	my (%info) = @arg;
		1331
1052	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1332	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1053	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1333	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1054
1055	my $text = "\n" . CFPlus::asxml $msg->{msg};
1056	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1057	my @link;
1058	$text =~ s{
1059	($match)
1060	}{
1061	my $kw = $1;
1062
1063	push @link, new CFPlus::UI::Label
1064	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1065	can_hover => 1,
1066	can_events => 1,
1067	padding_x => 0,
1068	padding_y => 0,
1069	on_button_up => sub {
1070	$self->send ($kw);
1071	};
1072
1073	"\x{fffc}"
1074	}giex;
1075		1334
		1335	if (exists $info{msg}) {
		1336	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1337	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1338	my @link;
		1339	$text =~ s{
		1340	($match)
		1341	}{
		1342	my $kw = $1;
		1343
		1344	push @link, new CFPlus::UI::Label
		1345	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1346	can_hover => 1,
		1347	can_events => 1,
		1348	padding_x => 0,
		1349	padding_y => 0,
		1350	on_button_up => sub {
		1351	$self->send ($kw);
		1352	};
		1353
		1354	"\x{fffc}"
		1355	}giex;
		1356
1076	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1357	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1077	$self->{textview}->scroll_to_bottom;	1358	$self->{textview}->scroll_to_bottom;
		1359	}
		1360
1078	$self->update_options;	1361	$self->update_options;
1079	} else {	1362	} else {
1080	$self->destroy;	1363	$self->destroy;
1081	}	1364	}
1082		1365
…		…
1087	my ($self, $msg) = @_;	1370	my ($self, $msg) = @_;
1088		1371
1089	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1372	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1090	$self->{textview}->scroll_to_bottom;	1373	$self->{textview}->scroll_to_bottom;
1091		1374
1092	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1375	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1093	}	1376	}
1094		1377
1095	sub destroy {	1378	sub destroy {
1096	my ($self) = @_;	1379	my ($self) = @_;
1097		1380
1098	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1381	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1099		1382
1100	if ($self->{conn}) {	1383	if ($self->{conn}) {
1101	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1384	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1102	delete $self->{conn}{npc_dialog};	1385	delete $self->{conn}{npc_dialog};
1103	$self->{conn}->disconnect_ext ($self->{id});	1386	$self->{conn}->disconnect_ext ($self->{id});
1104	}	1387	}
1105		1388
1106	$self->SUPER::destroy;	1389	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.88 by root, Sun Nov 19 20:31:29 2006 UTC vs. Revision 1.137 by root, Sat Jul 28 00:45:28 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.88 by root, Sun Nov 19 20:31:29 2006 UTC vs.
Revision 1.137 by root, Sat Jul 28 00:45:28 2007 UTC