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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.93 by root, Fri Dec 22 03:43:05 2006 UTC vs.
Revision 1.153 by root, Mon Aug 13 14:24:17 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
…		…
373	my $map_info = delete $self->{map_info}	552	my $map_info = delete $self->{map_info}
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 = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
379	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	558	$self->{map_cache_new}{$hash} = \$data;
380	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	559	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
381	}	560	}
382		561
383	sub map_clear {	562	sub map_clear {
384	my ($self) = @_;	563	my ($self) = @_;
385		564
…		…
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	if ($exists) {
		588	$self->have_tile ($id);
		589	$self->{texture}[$id]->upload;
		590	}
		591
		592	$self->bg_fetch;
		593	};
		594	}
393		595
394	sub load_map($$$) {	596	sub load_map($$$) {
395	my ($self, $hash, $x, $y) = @_;	597	my ($self, $hash, $x, $y) = @_;
396		598
397	if (defined (my $data = $self->{mapcache}->get ($hash))) {	599	my $gen = $self->{map_change_gen};
		600
		601	my $cb = sub {
		602	return unless $gen == $self->{map_change_gen};
		603
		604	my ($data) = @_;
		605
		606	if (defined $data) {
		607	$self->{map_cache_new}{$hash} = \$data;
		608
398	$data = Compress::LZF::decompress $data;	609	my $data = Compress::LZF::decompress $data;
399	#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		610
404	$self->set_texture ($id => $data);	611	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
		612	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		613	$self->bg_fetch unless $inprogress;
405	}	614	}
		615	};
		616
		617	if (my $rdata = $self->{map_cache_old}{$hash}) {
		618	$cb->($$rdata);
		619	} else {
		620	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
406	}	621	}
407	}	622	}
408		623
409	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	624	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410	# (server resource,s latency, bandwidth), so this hack is warranted.	625	# (server resource,s latency, bandwidth), so this hack is warranted.
…		…
475		690
476	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	691	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	692	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478		693
479	} else {	694	} else {
		695	my $gen = $self->{map_change_gen};
480	$self->send_mapinfo ("spatial $path$tile", sub {	696	$self->send_mapinfo ("spatial $path$tile", sub {
		697	return unless $gen == $self->{map_change_gen};
		698
481	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	699	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482		700
483	return if $mode ne "spatial";	701	return if $mode ne "spatial";
484		702
485	$x += $self->{map}->ox;	703	$x += $self->{map}->ox;
…		…
499		717
500	sub map_change {	718	sub map_change {
501	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	719	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502		720
503	$self->flush_map;	721	$self->flush_map;
		722
		723	++$self->{map_change_gen};
		724	$self->{map_cache_old} = delete $self->{map_cache_new};
504		725
505	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	726	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506		727
507	my $mapmapw = $self->{mapmap}->{w};	728	my $mapmapw = $self->{mapmap}->{w};
508	my $mapmaph = $self->{mapmap}->{h};	729	my $mapmaph = $self->{mapmap}->{h};
…		…
525	$self->load_map ($hash, $x, $y);	746	$self->load_map ($hash, $x, $y);
526	$self->flood_fill (0, 0, 0, "", $hash, $flags);	747	$self->flood_fill (0, 0, 0, "", $hash, $flags);
527	}	748	}
528		749
529	sub face_find {	750	sub face_find {
530	my ($self, $facenum, $face) = @_;	751	my ($self, $facenum, $face, $cb) = @_;
531		752
532	my $hash = "$face->{chksum},$face->{name}";	753	if ($face->{type} == 0) { # FT_FACE
		754	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
533		755
534	my $id = $self->{facemap}->get ($hash);	756	$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#	757	$self->{faceid}[$facenum] = $id;
561		758
562	my $face = $self->{tilecache}->get ($id);	759	$self->{map}->set_tileid ($facenum => $id);
563		760
564	if ($face) {	761	CFPlus::DB::get tilecache => $id, $cb;
565	#$self->face_prefetch;	762
566	$face	763	} elsif ($face->{type} & 1) { # with metadata
567	} else {	764	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	};	765	}
572	}	766	}
573		767
574	sub face_update {	768	sub face_update {
575	my ($self, $facenum, $face, $changed) = @_;	769	my ($self, $facenum, $face, $changed) = @_;
576		770
577	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;	771	if ($face->{type} == 0) { # FT_FACE
		772	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		773	if $changed;
578		774
579	$self->set_texture ($face->{id} => delete $face->{image});	775	$self->have_tile ($face->{id});
580	}
581		776
582	sub set_texture {	777	} elsif ($face->{type} & 1) { # split metadata
		778	if ($changed) { # new data
		779	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};
		780	$face->{meta} = $self->{json_coder}->decode ($meta_json);
		781
		782	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		783	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
		784	} else {
		785	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
		786	}
		787
		788	::add_license ($face);
		789
		790	if ($face->{type} == 3) { # FT_MUSIC
		791	$self->{music_meta}{$facenum} = $face;
		792
		793	::message ({ markup => "downloaded song #$facenum" })
		794	if $changed;
		795
		796	&::audio_music_push ($facenum);
		797	} elsif ($face->{type} == 5) { # FT_SOUND
		798	$self->{sound_meta}{$facenum} = $face;
		799
		800	::message ({ markup => "downloaded sound #$facenum" })
		801	if $changed;
		802
		803	&::audio_sound_push ($facenum);
		804	}
		805
		806	}
		807	}
		808
		809	sub smooth_update {
		810	my ($self, $facenum, $face) = @_;
		811
		812	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
		813	}
		814
		815	sub have_tile {
		816	my ($self, $tile) = @_;
		817
		818	return unless $self->{map};
		819
		820	my $tex = $self->{texture}[$tile] \|\|=
		821	new CFPlus::Texture
		822	tile => $tile, minify => 1, mipmap => 1, delay => 1;
		823
		824	$_->($tex) for @{(delete $self->{face_cb}{$tile}) \|\| []};
		825	}
		826
		827	sub connect_face_update {
583	my ($self, $id, $data) = @_;	828	my ($self, $id, $cb) = @_;
584		829
585	$self->{texture}[$id] \|\|= do {	830	push @{$self->{face_cb}{$id}}, $cb;
586	my $tex =
587	new_from_image CFPlus::Texture
588	$data, minify => 1, mipmap => 1;
589		831
590	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	832	CFPlus::guard {
591	$self->{map_widget}->update;	833	@{$self->{face_cb}{$id}}
592		834	= grep $_ != $cb,
593	$tex	835	@{$self->{face_cb}{$id}};
594	};	836	}
595	}	837	}
596		838
597	sub sound_play {	839	sub sound_play {
598	my ($self, $x, $y, $soundnum, $type) = @_;	840	my ($self, $type, $face, $dx, $dy, $vol) = @_;
599		841
600	$self->{sound_play}->($x, $y, $soundnum, $type);	842	&::audio_sound_play ($face, $dx, $dy, $vol)
		843	unless $type & 1; # odd types are silent for future expansion
601	}	844	}
602		845
603	my $LAST_QUERY; # server is stupid, stupid, stupid	846	my $LAST_QUERY; # server is stupid, stupid, stupid
604		847
605	sub query {	848	sub query {
…		…
609	$LAST_QUERY = $prompt;	852	$LAST_QUERY = $prompt;
610		853
611	$self->{query}-> ($self, $flags, $prompt);	854	$self->{query}-> ($self, $flags, $prompt);
612	}	855	}
613		856
614	sub drawinfo {	857	sub sanitise_xml($) {
615	my ($self, $color, $text) = @_;	858	local $_ = shift;
616		859
617	my @color = (	860	# we now weed out all tags we do not support
		861	s%<(?!/?i>\|/?u>\|/?b>\|fg \|/fg>)%<%g;
		862	# now all entities
		863	s/&(?!amp;\|lt;\|gt;\|apos;\|quot;\|#[0-9]+;\|#x[0-9a-fA-F]+;)/&/g;
		864
		865	# handle some elements
		866	s/<fg name='([^'])'>(.?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		867	s/<fg name="([^"])">(.?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		868
		869	$_
		870	}
		871
		872	our %NAME_TO_COLOR = (
		873	black => 0,
		874	white => 1,
		875	darkblue => 2,
		876	red => 3,
		877	orange => 4,
		878	lightblue => 5,
		879	darkorange => 6,
		880	green => 7,
		881	darkgreen => 8,
		882	grey => 9,
		883	brown => 10,
		884	yellow => 11,
		885	tan => 12,
		886	);
		887
		888	our @CF_COLOR = (
618	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	889	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619	[1.00, 1.00, 1.00],	890	[1.00, 1.00, 1.00],
620	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	891	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621	[1.00, 0.00, 0.00],	892	[1.00, 0.00, 0.00],
622	[1.00, 0.54, 0.00],	893	[1.00, 0.54, 0.00],
623	[0.11, 0.56, 1.00],	894	[0.11, 0.56, 1.00],
624	[0.93, 0.46, 0.00],	895	[0.93, 0.46, 0.00],
625	[0.18, 0.54, 0.34],	896	[0.18, 0.54, 0.34],
626	[0.56, 0.73, 0.56],	897	[0.56, 0.73, 0.56],
627	[0.80, 0.80, 0.80],	898	[0.80, 0.80, 0.80],
628	[0.75, 0.61, 0.20],	899	[0.75, 0.61, 0.20],
629	[0.99, 0.77, 0.26],	900	[0.99, 0.77, 0.26],
630	[0.74, 0.65, 0.41],	901	[0.74, 0.65, 0.41],
631	);	902	);
632		903
633	my $fg = $color[$color % @color];	904	sub msg {
		905	my ($self, $color, $type, $text, @extra) = @_;
634		906
		907	$text = sanitise_xml $text;
		908
		909	if (my $cb = $self->{cb_msg}{$type}) {
		910	$_->($self, $color, $type, $text, @extra) for values %$cb;
		911	} elsif ($type =~ /^(?:chargen-race-title\|chargen-race-description)$/) {
		912	$type =~ s/-/_/g;
		913	$self->{$type} = $text;
		914	} else {
635	$self->logprint ("info: ", $text);	915	$self->logprint ("msg: ", $text);
		916	return if $color < 0; # negative color == ignore if not understood
636		917
		918	my $fg = $CF_COLOR[$color & 0x1f] \|\| [1, 0, 0];
		919
637	# try to create single paragraphs of multiple lines sent by the server	920	## try to create single paragraphs of multiple lines sent by the server
		921	# no longer neecssary with TRT servers
638	$text =~ s/(?<=\S)\n(?=\w)/ /g;	922	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
639		923
640	$text = CFPlus::asxml $text;	924	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
641	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
642	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
643
644	::message ({ fg => $fg, markup => $_ })
645	for split /\n/, $text;	925	for split /\n/, $text;
646		926
647	$self->{statusbox}->add ($text,	927	$self->{statusbox}->add ($text,
648	group => $text,	928	group => $text,
649	fg => $fg,	929	fg => $fg,
650	timeout => $color >= 2 ? 180 : 10,	930	timeout => $color >= 2 ? 180 : 10,
651	tooltip_font => $::FONT_FIXED,	931	tooltip_font => $::FONT_FIXED,
652	);	932	);
653	}	933	}
654
655	sub drawextinfo {
656	my ($self, $color, $type, $subtype, $message) = @_;
657
658	$self->drawinfo ($color, $message);
659	}	934	}
660		935
661	sub spell_add {	936	sub spell_add {
662	my ($self, $spell) = @_;	937	my ($self, $spell) = @_;
663		938
…		…
679	}	954	}
680		955
681	sub setup {	956	sub setup {
682	my ($self, $setup) = @_;	957	my ($self, $setup) = @_;
683		958
		959	$self->{map_widget}->set_tilesize ($self->{tilesize});
684	$::MAP->resize ($self->{mapw}, $self->{maph});	960	$::MAP->resize ($self->{mapw}, $self->{maph});
685	}	961	}
686		962
687	sub addme_success {	963	sub addme_success {
688	my ($self) = @_;	964	my ($self) = @_;
…		…
710	$self->{map_widget}->clr_commands;	986	$self->{map_widget}->clr_commands;
711		987
712	::stop_game ();	988	::stop_game ();
713	}	989	}
714		990
715	sub image_info {
716	my ($self, $numfaces) = @_;
717
718	$self->{num_faces} = $numfaces;
719	$self->{face_prefetch} = [1 .. $numfaces];
720	$self->face_prefetch;
721	}
722
723	sub face_prefetch {
724	my ($self) = @_;
725
726	return unless $::CFG->{face_prefetch};
727
728	if ($self->{num_faces}) {
729	return if @{ $self->{send_queue} \|\| [] };
730	my $todo = @{ $self->{face_prefetch} }
731	or return;
732
733	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
734
735	$self->send ("requestinfo image_sums $face $face");
736
737	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
738	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
739	} elsif (!exists $self->{num_faces}) {
740	$self->send ("requestinfo image_info");
741
742	$self->{num_faces} = 0;
743
744	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
745	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
746	}
747	}
748
749	sub update_floorbox {	991	sub update_floorbox {
750	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	992	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
751	return unless $::CONN;	993	return unless $::CONN;
752		994
753	$::FLOORBOX->clear;	995	$::FLOORBOX->clear;
		996
		997	my @add;
754		998
755	my $row;	999	my $row;
756	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	1000	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
757	if ($row < 6) {	1001	if ($row < 6) {
758	local $_->{face_widget}; # hack to force recreation of widget	1002	local $_->{face_widget}; # hack to force recreation of widget
759	local $_->{desc_widget}; # hack to force recreation of widget	1003	local $_->{desc_widget}; # hack to force recreation of widget
760	CFPlus::Item::update_widgets $_;	1004	CFPlus::Item::update_widgets $_;
761		1005
		1006	push @add,
762	$::FLOORBOX->add (0, $row, $_->{face_widget});	1007	0, $row, $_->{face_widget},
763	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1008	1, $row, $_->{desc_widget};
764		1009
765	$row++;	1010	$row++;
766	} else {	1011	} else {
767	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1012	push @add, 1, $row, new CFPlus::UI::Button
768	text => "More...",	1013	text => "More...",
769	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1014	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
770	);	1015	;
771	last;	1016	last;
772	}	1017	}
773	}	1018	}
774	if ($::CONN->{open_container}) {	1019	if ($::CONN->{open_container}) {
775	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1020	push @add, 1, $row++, new CFPlus::UI::Button
776	text => "Close container",	1021	text => "Close container",
777	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1022	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
778	);	1023	;
779	}	1024	}
780	});
781		1025
		1026	$::FLOORBOX->add_at (@add);
		1027	});
		1028
782	$::WANT_REFRESH++;	1029	$::WANT_REFRESH->start;
783	}	1030	}
784		1031
785	sub set_opencont {	1032	sub set_opencont {
786	my ($conn, $tag, $name) = @_;	1033	my ($conn, $tag, $name) = @_;
787	$conn->{open_container} = $tag;	1034	$conn->{open_container} = $tag;
…		…
895	$::SERVER_INFO->set_markup (	1142	$::SERVER_INFO->set_markup (
896	"server <tt>$self->{host}:$self->{port}</tt>\n"	1143	"server <tt>$self->{host}:$self->{port}</tt>\n"
897	. "protocol version <tt>$self->{version}</tt>\n"	1144	. "protocol version <tt>$self->{version}</tt>\n"
898	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1145	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
899	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1146	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1147	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
900	. "editing support $yesno[!!$self->{editor_support}]\n"	1148	. "editing support $yesno[!!$self->{editor_support}]\n"
901	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"	1149	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1150	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
902	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1151	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
903	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1152	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
904	. "map size $self->{mapw}×$self->{maph}\n"	1153	. "map size $self->{mapw}×$self->{maph}\n"
905	);	1154	);
906		1155
907	::setup_build_button ($self->{editor_support}->{builder_ui});
908	}	1156	}
909		1157
910	sub logged_in {	1158	sub logged_in {
911	my ($self) = @_;	1159	my ($self) = @_;
912		1160
913	$self->send_ext_req (cfplus_support => version => 1, sub {	1161	$self->send_ext_req (cfplus_support => version => 2, sub {
		1162	my (%msg) = @_;
		1163
914	$self->{cfplus_ext} = $_[0]{version};	1164	$self->{cfplus_ext} = $msg{version};
915	$self->update_server_info;	1165	$self->update_server_info;
916		1166
917	if ($self->{cfplus_ext} >= 2) {	1167	if ($self->{cfplus_ext} >= 2) {
918	$self->send_ext_req ("editor_support", sub {	1168	$self->send_ext_req ("editor_support", sub {
919	$self->{editor_support} = $_[0];	1169	$self->{editor_support} = { @_ };
920	$self->update_server_info;	1170	$self->update_server_info;
921		1171
922	0	1172	0
923	});	1173	});
924	}	1174	}
…		…
928		1178
929	$self->update_server_info;	1179	$self->update_server_info;
930		1180
931	$self->send_command ("output-sync $::CFG->{output_sync}");	1181	$self->send_command ("output-sync $::CFG->{output_sync}");
932	$self->send_command ("output-count $::CFG->{output_count}");	1182	$self->send_command ("output-count $::CFG->{output_count}");
		1183	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
933	$self->send_command ("pickup $::CFG->{pickup}");	1184	$self->send_command ("pickup $::CFG->{pickup}");
934	}
935
936	sub buildat {
937	my ($self, $builditem, $x, $y) = @_;
938
939	if ($self->{cfplus_ext}) {
940	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
941	}
942	}	1185	}
943		1186
944	sub lookat {	1187	sub lookat {
945	my ($self, $x, $y) = @_;	1188	my ($self, $x, $y) = @_;
946		1189
947	if ($self->{cfplus_ext}) {	1190	if ($self->{cfplus_ext}) {
948	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1191	$self->send_ext_req (lookat => $x, $y, sub {
949	my ($msg) = @_;	1192	my (%msg) = @_;
950		1193
951	if (exists $msg->{npc_dialog}) {	1194	if (exists $msg{npc_dialog}) {
952	# start npc chat dialog	1195	# start npc chat dialog
953	$self->{npc_dialog} = new CFPlus::NPCDialog::	1196	$self->{npc_dialog} = new CFPlus::NPCDialog::
954	dx => $x,	1197	token => $msg{npc_dialog},
955	dy => $y,
956	title => "$msg->{npc_dialog} (NPC)",	1198	title => "$msg{npc_dialog}[0] (NPC)",
957	conn => $self,	1199	conn => $self,
958	;	1200	;
959	}	1201	}
960	});	1202	});
961	}	1203	}
…		…
968		1210
969	(delete $self->{npc_dialog})->destroy	1211	(delete $self->{npc_dialog})->destroy
970	if $self->{npc_dialog};	1212	if $self->{npc_dialog};
971		1213
972	$self->SUPER::destroy;	1214	$self->SUPER::destroy;
		1215
		1216	%$self = ();
973	}	1217	}
974		1218
975	package CFPlus::NPCDialog;	1219	package CFPlus::NPCDialog;
976		1220
977	our @ISA = 'CFPlus::UI::Toplevel';	1221	our @ISA = 'CFPlus::UI::Toplevel';
…		…
1024	on_activate => sub { $this->destroy; 1 },	1268	on_activate => sub { $this->destroy; 1 },
1025	;	1269	;
1026		1270
1027	$self->update_options;	1271	$self->update_options;
1028		1272
1029	$self->{id} = $self->{conn}->send_ext_req (	1273	$self->{id} = "npc-channel-" . $self->{conn}->token;
1030	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1274	$self->{conn}->connect_ext ($self->{id} => sub {
1031	sub { $this && $this->feed (@_) }	1275	$this->feed (@_) if $this;
1032	);	1276	});
		1277
		1278	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1033		1279
1034	$self->{entry}->grab_focus;	1280	$self->{entry}->grab_focus;
1035		1281
1036	$self->{textview}->add_paragraph ({	1282	$self->{textview}->add_paragraph ({
1037	fg => [1, 1, 0, 1],	1283	fg => [1, 1, 0, 1],
…		…
1060	);	1306	);
1061	}	1307	}
1062	}	1308	}
1063		1309
1064	sub feed {	1310	sub feed {
1065	my ($self, $msg) = @_;	1311	my ($self, $type, @arg) = @_;
1066		1312
1067	CFPlus::weaken $self;	1313	CFPlus::weaken $self;
1068		1314
1069	if ($msg->{msgtype} eq "reply") {	1315	if ($type eq "update") {
		1316	my (%info) = @arg;
		1317
1070	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1318	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1071	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1319	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1072
1073	my $text = "\n" . CFPlus::asxml $msg->{msg};
1074	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1075	my @link;
1076	$text =~ s{
1077	($match)
1078	}{
1079	my $kw = $1;
1080
1081	push @link, new CFPlus::UI::Label
1082	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1083	can_hover => 1,
1084	can_events => 1,
1085	padding_x => 0,
1086	padding_y => 0,
1087	on_button_up => sub {
1088	$self->send ($kw);
1089	};
1090
1091	"\x{fffc}"
1092	}giex;
1093		1320
		1321	if (exists $info{msg}) {
		1322	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1323	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1324	my @link;
		1325	$text =~ s{
		1326	($match)
		1327	}{
		1328	my $kw = $1;
		1329
		1330	push @link, new CFPlus::UI::Label
		1331	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1332	can_hover => 1,
		1333	can_events => 1,
		1334	padding_x => 0,
		1335	padding_y => 0,
		1336	on_button_up => sub {
		1337	$self->send ($kw);
		1338	};
		1339
		1340	"\x{fffc}"
		1341	}giex;
		1342
1094	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1343	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1095	$self->{textview}->scroll_to_bottom;	1344	$self->{textview}->scroll_to_bottom;
		1345	}
		1346
1096	$self->update_options;	1347	$self->update_options;
1097	} else {	1348	} else {
1098	$self->destroy;	1349	$self->destroy;
1099	}	1350	}
1100		1351
…		…
1105	my ($self, $msg) = @_;	1356	my ($self, $msg) = @_;
1106		1357
1107	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1358	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1108	$self->{textview}->scroll_to_bottom;	1359	$self->{textview}->scroll_to_bottom;
1109		1360
1110	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1361	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1111	}	1362	}
1112		1363
1113	sub destroy {	1364	sub destroy {
1114	my ($self) = @_;	1365	my ($self) = @_;
1115		1366
1116	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1367	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1117		1368
1118	if ($self->{conn}) {	1369	if ($self->{conn}) {
1119	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1370	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1120	delete $self->{conn}{npc_dialog};	1371	delete $self->{conn}{npc_dialog};
1121	$self->{conn}->disconnect_ext ($self->{id});	1372	$self->{conn}->disconnect_ext ($self->{id});
1122	}	1373	}
1123		1374
1124	$self->SUPER::destroy;	1375	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.93 by root, Fri Dec 22 03:43:05 2006 UTC vs. Revision 1.153 by root, Mon Aug 13 14:24:17 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.93 by root, Fri Dec 22 03:43:05 2006 UTC vs.
Revision 1.153 by root, Mon Aug 13 14:24:17 2007 UTC