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

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

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

Diff Legend

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

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

Diff Legend

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