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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.92 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.148 by root, Fri Aug 10 04:02:13 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;
11	use CFPlus::Macro;	12	use CFPlus::Macro;
12	use CFPlus::Item;	13	use CFPlus::Item;
13		14
14	use Crossfire::Protocol::Base 0.95;	15	use Crossfire::Protocol::Base 0.95;
15		16
16	use base 'Crossfire::Protocol::Base';	17	use base 'Crossfire::Protocol::Base';
17		18
18	sub new {	19	sub new {
19	my $class = shift;	20	my ($class, %arg) = @_;
20		21
21	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	);
22		30
23	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
24		32
25	my @cmd_help = map {	33	my @cmd_help = map {
26	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	34	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
…		…
37	for @args;	45	for @args;
38		46
39	map ["$cmd$_", $text],	47	map ["$cmd$_", $text],
40	sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
41	@args	49	@args
42	} sort { $a->{par} <=> $b->{par} }	50	} sort { $a->{par} <=> $b->{par} }
43	CFPlus::Pod::find command => "*";	51	CFPlus::Pod::find command => "*";
44		52
		53	$self->connect_ext (ambient_music => sub {
		54	my ($songs) = @_;
		55	&::audio_music_set_ambient ($songs);
		56	});
		57
		58	$self->connect_ext (capabilities => sub {
		59	my (%cap) = @_;
		60
		61	#$self->send ("setup sound 0"); # we use a different protocol
		62	$self->update_fx_want;
		63
		64	if (my $ts = $cap{tileset}) {
		65	if (my ($default) = grep $_->[2] & 1, @$ts) {
		66	$self->{tileset} = $default;
		67	$self->{tilesize} = $default->[3];
		68	$self->setup_req (tileset => $default->[0]);
		69
		70	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		71	my $h = int $self->{maph} * 32 / $self->{tilesize};
		72
		73	$self->setup_req (mapsize => "${w}x${h}");
		74	}
		75	}
		76	});
		77
		78	$self->{json_coder}
		79	->convert_blessed
		80	->filter_json_single_key_object (__w_ => sub {
		81	$self->{widget}{$_[0]}
		82	});
		83
		84	# widgetset new
		85	$self->connect_ext (ws_n => sub {
		86	my ($id) = @_;
		87
		88	$self->{widgetset}{$id} = {
		89	w => {},
		90	};
		91	});
		92
		93	# widgetset destroy
		94	$self->connect_ext (ws_d => sub {
		95	my ($id) = @_;
		96
		97	my $ws = delete $self->{widgetset}{$id}
		98	or return;
		99
		100	$_->destroy
		101	for values %{$ws->{w}};
		102	});
		103
		104	# widgetset create
		105	$self->connect_ext (ws_c => sub {
		106	my ($ws, $id, $class, $args) = @_;
		107
		108	for my $ev (grep /^on_/, keys %$args) {
		109	$args->{$ev} = sub {
		110	my $id = shift->{s_id};
		111	$self->send_exti_msg (w_e => $id, $ev, \@_);
		112
		113	1
		114	};
		115	}
		116
		117	if (my $widget = eval {
		118	local $SIG{__DIE__};
		119	"CFPlus::UI::$class"->new (
		120	%$args,
		121	s_ws => $ws,
		122	s_id => $id,
		123	)
		124	}
		125	) {
		126	$self->{widget}{$id}
		127	= $self->{widgetset}{$ws}{w}{$id}
		128	= $widget;
		129
		130	$widget->connect (on_destroy => sub {
		131	my ($widget) = @_;
		132
		133	delete $self->{widget}{$widget->{s_id}};
		134	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
		135	});
		136	} else {
		137	warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		138	$self->send_exti_msg (w_e => $id, "destroy");
		139	}
		140	});
		141
		142	# widget call
		143	$self->connect_ext (w_c => sub {
		144	my ($id, $rid, $method, $args) = @_;
		145
		146	my $w = $self->{widget}{$id}
		147	or return;
		148
		149	$args \|\|= [];
		150
		151	if ($rid) {
		152	$self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
		153	} else {
		154	$w->$method (@$args);
		155	}
		156	});
		157
		158	# widget set
		159	$self->connect_ext (w_s => sub {
		160	my ($id, $attr) = @_;
		161
		162	my $w = $self->{widget}{$id}
		163	or return;
		164
		165	for (my $i = 0; $i < $#$attr; $i += 2) {
		166	my ($member, $value) = @$attr[$i, $i+1];
		167	if (defined $value) {
		168	$w->{$member} = $value;
		169	} else {
		170	delete $w->{$member};
		171	}
		172	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		173	}
		174	});
		175
		176	# widget get
		177	$self->connect_ext (w_g => sub {
		178	my ($id, $rid, $attr) = @_;
		179
		180	my $w = $self->{widget}{$id}
		181	or return;
		182
		183	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		184	});
		185
		186	# message window
		187	$self->connect_ext (channel_info => sub {
		188	my ($info) = @_;
		189	$self->{channels}->{$info->{id}} = $info;
		190	$::MESSAGE_WINDOW->add_channel ($info);
		191	});
		192
		193	# destroy widgets on logout
		194	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		195	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
		196	$_->destroy
		197	for values %{delete $ws->{w} \|\| {}};
		198	}
		199	});
		200
45	$self->{map_widget}->add_command (@$_)	201	$self->{map_widget}->add_command (@$_)
46	for @cmd_help;	202	for @cmd_help;
47
48	$self->{noface} = new_from_file CFPlus::Texture
49	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50		203
51	{	204	{
52	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture	205	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;	206	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});	207	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55	}	208	}
56		209
		210	{
		211	$self->{noface} = my $tex = new_from_file CFPlus::Texture
		212	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		213	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		214	}
		215
57	$self->{open_container} = 0;	216	$self->{open_container} = 0;
58		217
59	# "global"
60	$self->{tilecache} = CFPlus::db_table "tilecache"
61	or die "tilecache: unable to open database table";
62	$self->{facemap} = CFPlus::db_table "facemap"
63	or die "facemap: unable to open database table";
64
65	# per server	218	# per server
66	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"	219	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
67	or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
68		220
69	$self	221	$self
		222	}
		223
		224	sub update_fx_want {
		225	my ($self) = @_;
		226
		227	$self->send_exti_msg (fx_want => {
		228	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		229	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		230	});
70	}	231	}
71		232
72	sub logprint {	233	sub logprint {
73	my ($self, @a) = @_;	234	my ($self, @a) = @_;
74		235
75	$self->{log_fh} \|\|= do {	236	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
76	my $path = "$Crossfire::VARDIR/log.$self->{host}";
77
78	open my $fh, ">>:utf8", $path
79	or die "Couldn't open logfile $path: $!";
80
81	$fh->autoflush (1);
82
83	$fh;
84	};
85
86	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
87
88	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
89	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
90
91	print {$self->{log_fh}} "$ts ", @a, "\n";
92	}	237	}
93		238
94	sub _stat_numdiff {	239	sub _stat_numdiff {
95	my ($self, $name, $old, $new) = @_;	240	my ($self, $name, $old, $new) = @_;
96		241
…		…
229	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	374	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
230	$::GAUGES->{food} ->set_value ($fo, $fo_m);	375	$::GAUGES->{food} ->set_value ($fo, $fo_m);
231	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	376	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
232	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	377	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	378	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234	my $rng = $stats->{+CS_STAT_RANGE};	379	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
235	$rng =~ s/^Range: //; # thank you so much dear server
236	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
237	my $title = $stats->{+CS_STAT_TITLE};	380	my $title = $stats->{+CS_STAT_TITLE};
238	$title =~ s/^Player: //;	381	$title =~ s/^Player: //;
239	$::STATWIDS->{title} ->set_text ("Title: " . $title);	382	$::STATWIDS->{title} ->set_text ("Title: " . $title);
240		383
241	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	384	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
261	my @skills = keys %{ $self->{skill_info} };	404	my @skills = keys %{ $self->{skill_info} };
262		405
263	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	406	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
264	$sktbl->clear;	407	$sktbl->clear;
265		408
		409	my @add;
		410
		411	push @add,
266	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	412	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
267	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	413	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
268	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	414	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
269	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	415	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
270	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	416	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
271	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	417	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		418	;
272		419
273	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	420	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
274		421
275	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	422	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
276	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	423	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
…		…
304	}	451	}
305		452
306	1	453	1
307	};	454	};
308		455
		456	push @add,
309	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	457	$x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
310	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	458	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
311	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	459	$x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
312	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	460	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
313	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	461	$x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
314	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	462	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		463	;
315		464
316	$x++ and ($x, $y) = (0, $y + 1);	465	$x++ and ($x, $y) = (0, $y + 1);
317	}	466	}
		467
		468	$sktbl->add_at (@add);
318	}	469	}
319		470
320	for (grep exists $stats->{$_}, @skills) {	471	for (grep exists $stats->{$_}, @skills) {
321	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	472	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
322	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	473	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
…		…
355	}	506	}
356		507
357	sub feed_map1a {	508	sub feed_map1a {
358	my ($self, $data) = @_;	509	my ($self, $data) = @_;
359		510
360	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	511	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		512	my $delay;
		513
		514	for my $tile (@$missing) {
		515	next if $self->{delay}{$tile};
		516
		517	$delay = 1;
		518
		519	if (my $tex = $::CONN->{texture}[$tile]) {
		520	$tex->upload;
		521	} else {
		522	$self->{delay}{$tile} = 1;
		523
		524	# we assume the face is in-flight and will eventually come
		525	push @{$self->{face_cb}{$tile}}, sub {
		526	delete $self->{delay}{$tile};
		527	$_[0]->upload;
		528	};
		529	}
		530	}
		531
		532	if ($delay) {
		533	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		534	Event->timer (after => 0.03, cb => sub {
		535	$_[0]->w->cancel;
		536	$self->{map_widget}->update;
		537	});
		538	} else {
361	$self->{map_widget}->update;	539	$self->{map_widget}->update;
		540	}
362	}	541	}
363		542
364	sub magicmap {	543	sub magicmap {
365	my ($self, $w, $h, $x, $y, $data) = @_;	544	my ($self, $w, $h, $x, $y, $data) = @_;
366		545
…		…
374	or return;	553	or return;
375		554
376	my ($hash, $x, $y, $w, $h) = @$map_info;	555	my ($hash, $x, $y, $w, $h) = @$map_info;
377		556
378	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	557	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
379	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	558	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
380	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	559	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
381	}	560	}
382		561
383	sub map_clear {	562	sub map_clear {
384	my ($self) = @_;	563	my ($self) = @_;
…		…
388		567
389	$self->{map}->clear;	568	$self->{map}->clear;
390	delete $self->{map_widget}{magicmap};	569	delete $self->{map_widget}{magicmap};
391	}	570	}
392		571
		572	sub bg_fetch {
		573	my ($self) = @_;
		574
		575	my $id;
		576
		577	do {
		578	$id = pop @{$self->{bg_fetch}}
		579	or return;
		580	} while $self->{texture}[$id];
		581
		582	CFPlus::DB::exists tilecache => $id, sub {
		583	my ($exists) = @_;
		584
		585	return unless $self->{map}; # stop when destroyed
		586
		587	$self->have_tile ($id)
		588	if $exists;
		589
		590	$self->bg_fetch;
		591	};
		592	}
393		593
394	sub load_map($$$) {	594	sub load_map($$$) {
395	my ($self, $hash, $x, $y) = @_;	595	my ($self, $hash, $x, $y) = @_;
396		596
397	if (defined (my $data = $self->{mapcache}->get ($hash))) {	597	my $gen = $self->{map_change_gen};
		598
		599	CFPlus::DB::get $self->{mapcache} => $hash, sub {
		600	return unless $gen == $self->{map_change_gen};
		601
		602	my ($data) = @_;
		603
		604	if (defined $data) {
398	$data = Compress::LZF::decompress $data;	605	$data = Compress::LZF::decompress $data;
399	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	606	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
400	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
401	my $data = $self->{tilecache}->get ($id)
402	or next;
403		607
404	$self->set_texture ($id => $data);	608	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
		609	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		610	$self->bg_fetch unless $inprogress;
405	}	611	}
406	}	612	};
407	}	613	}
408		614
409	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	615	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410	# (server resource,s latency, bandwidth), so this hack is warranted.	616	# (server resource,s latency, bandwidth), so this hack is warranted.
411	# the right fix is to make real tiled maps with an overview file	617	# the right fix is to make real tiled maps with an overview file
…		…
475		681
476	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	682	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	683	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478		684
479	} else {	685	} else {
		686	my $gen = $self->{map_change_gen};
480	$self->send_mapinfo ("spatial $path$tile", sub {	687	$self->send_mapinfo ("spatial $path$tile", sub {
		688	return unless $gen == $self->{map_change_gen};
		689
481	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	690	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482		691
483	return if $mode ne "spatial";	692	return if $mode ne "spatial";
484		693
485	$x += $self->{map}->ox;	694	$x += $self->{map}->ox;
…		…
499		708
500	sub map_change {	709	sub map_change {
501	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	710	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502		711
503	$self->flush_map;	712	$self->flush_map;
		713
		714	++$self->{map_change_gen};
504		715
505	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	716	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506		717
507	my $mapmapw = $self->{mapmap}->{w};	718	my $mapmapw = $self->{mapmap}->{w};
508	my $mapmaph = $self->{mapmap}->{h};	719	my $mapmaph = $self->{mapmap}->{h};
…		…
525	$self->load_map ($hash, $x, $y);	736	$self->load_map ($hash, $x, $y);
526	$self->flood_fill (0, 0, 0, "", $hash, $flags);	737	$self->flood_fill (0, 0, 0, "", $hash, $flags);
527	}	738	}
528		739
529	sub face_find {	740	sub face_find {
530	my ($self, $facenum, $face) = @_;	741	my ($self, $facenum, $face, $cb) = @_;
531		742
532	my $hash = "$face->{chksum},$face->{name}";	743	if ($face->{type} == 0) { # FT_FACE
		744	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
533		745
534	my $id = $self->{facemap}->get ($hash);	746	$face->{id} = $id;
535
536	unless ($id) {
537	# create new id for face
538	# I love transactions
539	for (1..100) {
540	my $txn = $CFPlus::DB_ENV->txn_begin;
541	my $status = $self->{facemap}->db_get (id => $id);
542	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
543	$id = ($id \|\| 64) + 1;
544	if ($self->{facemap}->put (id => $id) == 0
545	&& $self->{facemap}->put ($hash => $id) == 0) {
546	$txn->txn_commit;
547
548	goto gotid;
549	}
550	}
551	$txn->txn_abort;
552	}
553
554	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
555	}
556
557	gotid:
558	$face->{id} = $id;
559	$self->{map}->set_face ($facenum => $id);
560	$self->{faceid}[$facenum] = $id;#d#	747	$self->{faceid}[$facenum] = $id;
561		748
562	my $face = $self->{tilecache}->get ($id);	749	$self->{map}->set_tileid ($facenum => $id);
563		750
564	if ($face) {	751	CFPlus::DB::get tilecache => $id, $cb;
565	#$self->face_prefetch;	752
566	$face	753	} elsif ($face->{type} & 1) { # with metadata
567	} else {	754	CFPlus::DB::get res_meta => $face->{name}, $cb;
568	my $tex = $self->{noface};
569	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
570	undef
571	};	755	}
572	}	756	}
573		757
574	sub face_update {	758	sub face_update {
575	my ($self, $facenum, $face, $changed) = @_;	759	my ($self, $facenum, $face, $changed) = @_;
576		760
577	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;	761	if ($face->{type} == 0) { # FT_FACE
		762	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		763	if $changed;
578		764
579	$self->set_texture ($face->{id} => delete $face->{image});	765	$self->have_tile ($face->{id});
580	}
581		766
582	sub set_texture {	767	} elsif ($face->{type} & 1) { # split metadata
		768	if ($changed) { # new data
		769	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};
		770	$face->{meta} = $self->{json_coder}->decode ($meta_json);
		771
		772	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		773	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
		774	} else {
		775	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
		776	}
		777
		778	::add_license ($face);
		779
		780	if ($face->{type} == 3) { # FT_MUSIC
		781	$self->{music_meta}{$facenum} = $face;
		782
		783	::message ({ markup => "downloaded song #$facenum" })
		784	if $changed;
		785
		786	&::audio_music_push ($facenum);
		787	} elsif ($face->{type} == 5) { # FT_SOUND
		788	$self->{sound_meta}{$facenum} = $face;
		789
		790	::message ({ markup => "downloaded sound #$facenum" })
		791	if $changed;
		792
		793	&::audio_sound_push ($facenum);
		794	}
		795
		796	}
		797	}
		798
		799	sub smooth_update {
		800	my ($self, $facenum, $face) = @_;
		801
		802	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
		803	}
		804
		805	sub have_tile {
		806	my ($self, $tile) = @_;
		807
		808	return unless $self->{map};
		809
		810	my $tex = $self->{texture}[$tile] \|\|=
		811	new CFPlus::Texture
		812	tile => $tile, minify => 1, mipmap => 1, delay => 1;
		813
		814	$_->($tex) for @{(delete $self->{face_cb}{$tile}) \|\| []};
		815	}
		816
		817	sub connect_face_update {
583	my ($self, $id, $data) = @_;	818	my ($self, $id, $cb) = @_;
584		819
585	$self->{texture}[$id] \|\|= do {	820	push @{$self->{face_cb}{$id}}, $cb;
586	my $tex =
587	new_from_image CFPlus::Texture
588	$data, minify => 1, mipmap => 1;
589		821
590	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	822	CFPlus::guard {
591	$self->{map_widget}->update;	823	@{$self->{face_cb}{$id}}
592		824	= grep $_ != $cb,
593	$tex	825	@{$self->{face_cb}{$id}};
594	};	826	}
595	}	827	}
596		828
597	sub sound_play {	829	sub sound_play {
598	my ($self, $x, $y, $soundnum, $type) = @_;	830	my ($self, $type, $face, $dx, $dy, $vol) = @_;
599		831
600	$self->{sound_play}->($x, $y, $soundnum, $type);	832	&::audio_sound_play ($face, $dx, $dy, $vol)
		833	unless $type & 1; # odd types are silent for future expansion
601	}	834	}
602		835
603	my $LAST_QUERY; # server is stupid, stupid, stupid	836	my $LAST_QUERY; # server is stupid, stupid, stupid
604		837
605	sub query {	838	sub query {
…		…
609	$LAST_QUERY = $prompt;	842	$LAST_QUERY = $prompt;
610		843
611	$self->{query}-> ($self, $flags, $prompt);	844	$self->{query}-> ($self, $flags, $prompt);
612	}	845	}
613		846
614	sub drawinfo {	847	sub sanitise_xml($) {
615	my ($self, $color, $text) = @_;	848	local $_ = shift;
616		849
617	my @color = (	850	# we now weed out all tags we do not support
		851	s%<(?!/?i>\|/?u>\|/?b>\|fg \|/fg>)%<%g;
		852	# now all entities
		853	s/&(?!amp;\|lt;\|gt;\|apos;\|quot;\|#[0-9]+;\|#x[0-9a-fA-F]+;)/&/g;
		854
		855	# handle some elements
		856	s/<fg name='([^'])'>(.?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		857	s/<fg name="([^"])">(.?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		858
		859	$_
		860	}
		861
		862	our %NAME_TO_COLOR = (
		863	black => 0,
		864	white => 1,
		865	darkblue => 2,
		866	red => 3,
		867	orange => 4,
		868	lightblue => 5,
		869	darkorange => 6,
		870	green => 7,
		871	darkgreen => 8,
		872	grey => 9,
		873	brown => 10,
		874	yellow => 11,
		875	tan => 12,
		876	);
		877
		878	our @CF_COLOR = (
618	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	879	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619	[1.00, 1.00, 1.00],	880	[1.00, 1.00, 1.00],
620	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	881	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621	[1.00, 0.00, 0.00],	882	[1.00, 0.00, 0.00],
622	[1.00, 0.54, 0.00],	883	[1.00, 0.54, 0.00],
623	[0.11, 0.56, 1.00],	884	[0.11, 0.56, 1.00],
624	[0.93, 0.46, 0.00],	885	[0.93, 0.46, 0.00],
625	[0.18, 0.54, 0.34],	886	[0.18, 0.54, 0.34],
626	[0.56, 0.73, 0.56],	887	[0.56, 0.73, 0.56],
627	[0.80, 0.80, 0.80],	888	[0.80, 0.80, 0.80],
628	[0.75, 0.61, 0.20],	889	[0.75, 0.61, 0.20],
629	[0.99, 0.77, 0.26],	890	[0.99, 0.77, 0.26],
630	[0.74, 0.65, 0.41],	891	[0.74, 0.65, 0.41],
631	);	892	);
632		893
		894	sub msg {
		895	my ($self, $color, $type, $text, @extra) = @_;
		896
		897	$text = sanitise_xml $text;
		898
		899	if (my $cb = $self->{cb_msg}{$type}) {
		900	$_->($self, $color, $type, $text, @extra) for values %$cb;
		901	} elsif ($type =~ /^(?:chargen-race-title\|chargen-race-description)$/) {
		902	$type =~ s/-/_/g;
		903	$self->{$type} = $text;
		904	} else {
633	$self->logprint ("info: ", $text);	905	$self->logprint ("msg: ", $text);
		906	return if $color < 0; # negative color == ignore if not understood
634		907
		908	my $fg = $CF_COLOR[$color & 0x1f] \|\| [1, 0, 0];
		909
635	# try to create single paragraphs of multiple lines sent by the server	910	## try to create single paragraphs of multiple lines sent by the server
		911	# no longer neecssary with TRT servers
636	$text =~ s/(?<=\S)\n(?=\w)/ /g;	912	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
637		913
638	$text = CFPlus::asxml $text;	914	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
639	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
640	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
641
642	::message ({ fg => $color[$color], markup => $_ })
643	for split /\n/, $text;	915	for split /\n/, $text;
644		916
645	$self->{statusbox}->add ($text,	917	$self->{statusbox}->add ($text,
646	group => $text,	918	group => $text,
647	fg => $color[$color],	919	fg => $fg,
648	timeout => $color >= 2 ? 180 : 10,	920	timeout => $color >= 2 ? 180 : 10,
649	tooltip_font => $::FONT_FIXED,	921	tooltip_font => $::FONT_FIXED,
650	);	922	);
651	}	923	}
652
653	sub drawextinfo {
654	my ($self, $color, $type, $subtype, $message) = @_;
655
656	$self->drawinfo ($color, $message);
657	}	924	}
658		925
659	sub spell_add {	926	sub spell_add {
660	my ($self, $spell) = @_;	927	my ($self, $spell) = @_;
661		928
…		…
677	}	944	}
678		945
679	sub setup {	946	sub setup {
680	my ($self, $setup) = @_;	947	my ($self, $setup) = @_;
681		948
		949	$self->{map_widget}->set_tilesize ($self->{tilesize});
682	$::MAP->resize ($self->{mapw}, $self->{maph});	950	$::MAP->resize ($self->{mapw}, $self->{maph});
683	}	951	}
684		952
685	sub addme_success {	953	sub addme_success {
686	my ($self) = @_;	954	my ($self) = @_;
…		…
708	$self->{map_widget}->clr_commands;	976	$self->{map_widget}->clr_commands;
709		977
710	::stop_game ();	978	::stop_game ();
711	}	979	}
712		980
713	sub image_info {
714	my ($self, $numfaces) = @_;
715
716	$self->{num_faces} = $numfaces;
717	$self->{face_prefetch} = [1 .. $numfaces];
718	$self->face_prefetch;
719	}
720
721	sub face_prefetch {
722	my ($self) = @_;
723
724	return unless $::CFG->{face_prefetch};
725
726	if ($self->{num_faces}) {
727	return if @{ $self->{send_queue} \|\| [] };
728	my $todo = @{ $self->{face_prefetch} }
729	or return;
730
731	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
732
733	$self->send ("requestinfo image_sums $face $face");
734
735	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
736	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
737	} elsif (!exists $self->{num_faces}) {
738	$self->send ("requestinfo image_info");
739
740	$self->{num_faces} = 0;
741
742	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
743	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
744	}
745	}
746
747	sub update_floorbox {	981	sub update_floorbox {
748	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	982	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
749	return unless $::CONN;	983	return unless $::CONN;
750		984
751	$::FLOORBOX->clear;	985	$::FLOORBOX->clear;
		986
		987	my @add;
752		988
753	my $row;	989	my $row;
754	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	990	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
755	if ($row < 6) {	991	if ($row < 6) {
756	local $_->{face_widget}; # hack to force recreation of widget	992	local $_->{face_widget}; # hack to force recreation of widget
757	local $_->{desc_widget}; # hack to force recreation of widget	993	local $_->{desc_widget}; # hack to force recreation of widget
758	CFPlus::Item::update_widgets $_;	994	CFPlus::Item::update_widgets $_;
759		995
		996	push @add,
760	$::FLOORBOX->add (0, $row, $_->{face_widget});	997	0, $row, $_->{face_widget},
761	$::FLOORBOX->add (1, $row, $_->{desc_widget});	998	1, $row, $_->{desc_widget};
762		999
763	$row++;	1000	$row++;
764	} else {	1001	} else {
765	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1002	push @add, 1, $row, new CFPlus::UI::Button
766	text => "More...",	1003	text => "More...",
767	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1004	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
768	);	1005	;
769	last;	1006	last;
770	}	1007	}
771	}	1008	}
772	if ($::CONN->{open_container}) {	1009	if ($::CONN->{open_container}) {
773	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1010	push @add, 1, $row++, new CFPlus::UI::Button
774	text => "Close container",	1011	text => "Close container",
775	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1012	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
776	);	1013	;
777	}	1014	}
778	});
779		1015
		1016	$::FLOORBOX->add_at (@add);
		1017	});
		1018
780	$::WANT_REFRESH++;	1019	$::WANT_REFRESH->start;
781	}	1020	}
782		1021
783	sub set_opencont {	1022	sub set_opencont {
784	my ($conn, $tag, $name) = @_;	1023	my ($conn, $tag, $name) = @_;
785	$conn->{open_container} = $tag;	1024	$conn->{open_container} = $tag;
…		…
893	$::SERVER_INFO->set_markup (	1132	$::SERVER_INFO->set_markup (
894	"server <tt>$self->{host}:$self->{port}</tt>\n"	1133	"server <tt>$self->{host}:$self->{port}</tt>\n"
895	. "protocol version <tt>$self->{version}</tt>\n"	1134	. "protocol version <tt>$self->{version}</tt>\n"
896	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1135	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
897	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1136	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1137	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
898	. "editing support $yesno[!!$self->{editor_support}]\n"	1138	. "editing support $yesno[!!$self->{editor_support}]\n"
899	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"	1139	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1140	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
900	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1141	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
901	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1142	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
902	. "map size $self->{mapw}×$self->{maph}\n"	1143	. "map size $self->{mapw}×$self->{maph}\n"
903	);	1144	);
904		1145
905	::setup_build_button ($self->{editor_support}->{builder_ui});
906	}	1146	}
907		1147
908	sub logged_in {	1148	sub logged_in {
909	my ($self) = @_;	1149	my ($self) = @_;
910		1150
911	$self->send_ext_req (cfplus_support => version => 1, sub {	1151	$self->send_ext_req (cfplus_support => version => 2, sub {
		1152	my (%msg) = @_;
		1153
912	$self->{cfplus_ext} = $_[0]{version};	1154	$self->{cfplus_ext} = $msg{version};
913	$self->update_server_info;	1155	$self->update_server_info;
914		1156
915	if ($self->{cfplus_ext} >= 2) {	1157	if ($self->{cfplus_ext} >= 2) {
916	$self->send_ext_req ("editor_support", sub {	1158	$self->send_ext_req ("editor_support", sub {
917	$self->{editor_support} = $_[0];	1159	$self->{editor_support} = { @_ };
918	$self->update_server_info;	1160	$self->update_server_info;
919		1161
920	0	1162	0
921	});	1163	});
922	}	1164	}
…		…
926		1168
927	$self->update_server_info;	1169	$self->update_server_info;
928		1170
929	$self->send_command ("output-sync $::CFG->{output_sync}");	1171	$self->send_command ("output-sync $::CFG->{output_sync}");
930	$self->send_command ("output-count $::CFG->{output_count}");	1172	$self->send_command ("output-count $::CFG->{output_count}");
		1173	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
931	$self->send_command ("pickup $::CFG->{pickup}");	1174	$self->send_command ("pickup $::CFG->{pickup}");
932	}
933
934	sub buildat {
935	my ($self, $builditem, $x, $y) = @_;
936
937	if ($self->{cfplus_ext}) {
938	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
939	}
940	}	1175	}
941		1176
942	sub lookat {	1177	sub lookat {
943	my ($self, $x, $y) = @_;	1178	my ($self, $x, $y) = @_;
944		1179
945	if ($self->{cfplus_ext}) {	1180	if ($self->{cfplus_ext}) {
946	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1181	$self->send_ext_req (lookat => $x, $y, sub {
947	my ($msg) = @_;	1182	my (%msg) = @_;
948		1183
949	if (exists $msg->{npc_dialog}) {	1184	if (exists $msg{npc_dialog}) {
950	# start npc chat dialog	1185	# start npc chat dialog
951	$self->{npc_dialog} = new CFPlus::NPCDialog::	1186	$self->{npc_dialog} = new CFPlus::NPCDialog::
952	dx => $x,	1187	token => $msg{npc_dialog},
953	dy => $y,
954	title => "$msg->{npc_dialog} (NPC)",	1188	title => "$msg{npc_dialog}[0] (NPC)",
955	conn => $self,	1189	conn => $self,
956	;	1190	;
957	}	1191	}
958	});	1192	});
959	}	1193	}
…		…
966		1200
967	(delete $self->{npc_dialog})->destroy	1201	(delete $self->{npc_dialog})->destroy
968	if $self->{npc_dialog};	1202	if $self->{npc_dialog};
969		1203
970	$self->SUPER::destroy;	1204	$self->SUPER::destroy;
		1205
		1206	%$self = ();
971	}	1207	}
972		1208
973	package CFPlus::NPCDialog;	1209	package CFPlus::NPCDialog;
974		1210
975	our @ISA = 'CFPlus::UI::Toplevel';	1211	our @ISA = 'CFPlus::UI::Toplevel';
…		…
1022	on_activate => sub { $this->destroy; 1 },	1258	on_activate => sub { $this->destroy; 1 },
1023	;	1259	;
1024		1260
1025	$self->update_options;	1261	$self->update_options;
1026		1262
1027	$self->{id} = $self->{conn}->send_ext_req (	1263	$self->{id} = "npc-channel-" . $self->{conn}->token;
1028	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1264	$self->{conn}->connect_ext ($self->{id} => sub {
1029	sub { $this && $this->feed (@_) }	1265	$this->feed (@_) if $this;
1030	);	1266	});
		1267
		1268	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1031		1269
1032	$self->{entry}->grab_focus;	1270	$self->{entry}->grab_focus;
1033		1271
1034	$self->{textview}->add_paragraph ({	1272	$self->{textview}->add_paragraph ({
1035	fg => [1, 1, 0, 1],	1273	fg => [1, 1, 0, 1],
…		…
1058	);	1296	);
1059	}	1297	}
1060	}	1298	}
1061		1299
1062	sub feed {	1300	sub feed {
1063	my ($self, $msg) = @_;	1301	my ($self, $type, @arg) = @_;
1064		1302
1065	CFPlus::weaken $self;	1303	CFPlus::weaken $self;
1066		1304
1067	if ($msg->{msgtype} eq "reply") {	1305	if ($type eq "update") {
		1306	my (%info) = @arg;
		1307
1068	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1308	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1069	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1309	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1070
1071	my $text = "\n" . CFPlus::asxml $msg->{msg};
1072	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1073	my @link;
1074	$text =~ s{
1075	($match)
1076	}{
1077	my $kw = $1;
1078
1079	push @link, new CFPlus::UI::Label
1080	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1081	can_hover => 1,
1082	can_events => 1,
1083	padding_x => 0,
1084	padding_y => 0,
1085	on_button_up => sub {
1086	$self->send ($kw);
1087	};
1088
1089	"\x{fffc}"
1090	}giex;
1091		1310
		1311	if (exists $info{msg}) {
		1312	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1313	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1314	my @link;
		1315	$text =~ s{
		1316	($match)
		1317	}{
		1318	my $kw = $1;
		1319
		1320	push @link, new CFPlus::UI::Label
		1321	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1322	can_hover => 1,
		1323	can_events => 1,
		1324	padding_x => 0,
		1325	padding_y => 0,
		1326	on_button_up => sub {
		1327	$self->send ($kw);
		1328	};
		1329
		1330	"\x{fffc}"
		1331	}giex;
		1332
1092	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1333	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1093	$self->{textview}->scroll_to_bottom;	1334	$self->{textview}->scroll_to_bottom;
		1335	}
		1336
1094	$self->update_options;	1337	$self->update_options;
1095	} else {	1338	} else {
1096	$self->destroy;	1339	$self->destroy;
1097	}	1340	}
1098		1341
…		…
1103	my ($self, $msg) = @_;	1346	my ($self, $msg) = @_;
1104		1347
1105	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1348	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1106	$self->{textview}->scroll_to_bottom;	1349	$self->{textview}->scroll_to_bottom;
1107		1350
1108	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1351	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1109	}	1352	}
1110		1353
1111	sub destroy {	1354	sub destroy {
1112	my ($self) = @_;	1355	my ($self) = @_;
1113		1356
1114	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1357	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1115		1358
1116	if ($self->{conn}) {	1359	if ($self->{conn}) {
1117	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1360	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1118	delete $self->{conn}{npc_dialog};	1361	delete $self->{conn}{npc_dialog};
1119	$self->{conn}->disconnect_ext ($self->{id});	1362	$self->{conn}->disconnect_ext ($self->{id});
1120	}	1363	}
1121		1364
1122	$self->SUPER::destroy;	1365	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.92 by root, Sat Dec 9 21:26:46 2006 UTC vs. Revision 1.148 by root, Fri Aug 10 04:02:13 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.92 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.148 by root, Fri Aug 10 04:02:13 2007 UTC