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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.110 by root, Tue Jun 26 05:06:01 2007 UTC vs.
Revision 1.160 by root, Tue Aug 21 22:46:50 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	xwidget => 1,	26	xwidget1 => 1,#d#
27	%{$arg{setup_req} \|\| {}},	27	%{$arg{setup_req} \|\| {}},
28	},	28	},
29	);	29	);
30		30
31	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
…		…
48	sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
49	@args	49	@args
50	} sort { $a->{par} <=> $b->{par} }	50	} sort { $a->{par} <=> $b->{par} }
51	CFPlus::Pod::find command => "*";	51	CFPlus::Pod::find command => "*";
52		52
53	$self->connect_ext (event_capabilities => sub {	53	$self->{json_coder}
54	my ($cap) = @_;	54	->convert_blessed
55		55	->filter_json_single_key_object (__w_ => sub {
56	if (my $ts = $cap->{tileset}) {	56	$self->{widget}{$_[0]}
57	if (my ($default) = grep $_->[2] & 1, @$ts) {
58	$self->{tileset} = $default;
59	$self->{tilesize} = $default->[3];
60	$self->setup_req (tileset => $default->[0]);
61
62	my $w = int $self->{mapw} * 32 / $self->{tilesize};
63	my $h = int $self->{maph} * 32 / $self->{tilesize};
64
65	$self->setup_req (mapsize => "${w}x${h}");
66	}
67	}
68	});
69
70	$self->connect_ext (ws_n => sub {
71	my ($arg) = @_;
72
73	$self->{widgetset}{$arg{id}} = {
74	w => {},
75	};	57	});
76	});
77		58
78	$self->connect_ext (ws_d => sub {	59	# destroy widgets on logout
79	my ($arg) = @_;
80
81	my $ws = delete $self->{widgetset}{$arg{id}}
82	or return;
83
84	$_->destroy
85	for values %{$ws->{w}};
86	});
87
88	$self->connect_ext (ws_c => sub {
89	my ($arg) = @_;
90
91	my $args = $arg->{args} \|\| {};
92
93	for my $ev (grep /^on_/, keys %$args) {
94	$args->{$ev} = sub {
95	my $id = shift->{s_id};
96	$self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
97
98	1
99	};
100	}
101
102	if (my $widget = eval {
103	local $SIG{__DIE__};
104	"CFPlus::UI::$arg->{class}"->new (
105	%$args,
106	s_ws => $arg->{ws},
107	s_id => $arg->{id},
108	)
109	}
110	) {
111	$self->{widget}{$arg->{id}}
112	= $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
113	= $widget;
114
115	$widget->connect (on_destroy => sub {
116	my ($widget) = @_;
117
118	delete $self->{widget}{$widget->{s_id}};
119	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
120	});
121	} else {
122	warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
123	$self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
124	}
125	});
126
127	$self->connect_ext (w_c => sub {
128	my ($arg) = @_;
129
130	my $w = $self->{widget}{$arg->{id}}
131	or return;
132	my $m = $arg->{name};
133
134	my @a = map {
135	"HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
136	? $self->{widget}{$_->{__widget_ref__}}
137	: $_
138	} @{ $arg->{args} \|\| [] };
139
140	if (exists $arg->{rid}) {
141	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]);
142	} else {
143	$w->$m (@a);
144	}
145	});
146
147	$self->connect_ext (w_s => sub {
148	my ($arg) = @_;
149
150	my $w = $self->{widget}{$arg->{id}}
151	or return;
152
153	$w->{$arg->{name}} = $arg->{value};
154	});
155
156	$self->connect_ext (w_g => sub {
157	my ($arg) = @_;
158
159	my $w = $self->{widget}{$arg->{id}}
160	or return;
161
162	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
163	});
164
165	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {	60	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
166	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {	61	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
167	$_->destroy	62	$_->destroy
168	for values %{delete $ws->{w} \|\| {}};	63	for values %{delete $ws->{w} \|\| {}};
169	}	64	}
…		…
190	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	85	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
191		86
192	$self	87	$self
193	}	88	}
194		89
		90	sub update_fx_want {
		91	my ($self) = @_;
		92
		93	$self->send_exti_msg (fx_want => {
		94	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		95	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		96	6 => 1, # FT_RSRC
		97	});
		98	}
		99
		100	sub ext_capabilities {
		101	my ($self, %cap) = @_;
		102
		103	#$self->send ("setup sound 0"); # we use a different protocol
		104	$self->update_fx_want;
		105
		106	$self->send_exti_req (resource => "exp_table", sub {
		107	my ($exp_table) = @_;
		108
		109	$self->register_face_handler ($exp_table, sub {
		110	my ($face) = @_;
		111
		112	$self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		113	$_->() for values %{ $self->{on_exp_update} \|\| {} };
		114	});
		115
		116	()
		117	});
		118
		119	if (my $ts = $cap{tileset}) {
		120	if (my ($default) = grep $_->[2] & 1, @$ts) {
		121	$self->{tileset} = $default;
		122	$self->{tilesize} = $default->[3];
		123	$self->setup_req (tileset => $default->[0]);
		124
		125	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		126	my $h = int $self->{maph} * 32 / $self->{tilesize};
		127
		128	$self->setup_req (mapsize => "${w}x${h}");
		129	}
		130	}
		131	}
		132
		133	sub ext_ambient_music {
		134	my ($self, $songs) = @_;
		135	&::audio_music_set_ambient ($songs);
		136	}
		137
		138	#############################################################################
		139
		140	sub widget_associate {
		141	my ($self, $ws, $id, $widget) = @_;
		142
		143	if ($widget) {
		144	$widget->{s_id} = $id;
		145	$self->{widget}{$id} = $widget;
		146
		147	if ($ws) {
		148	$widget->{s_ws} = $ws;
		149	$self->{widgetset}{$ws}{w}{$id} = $widget;
		150	}
		151
		152	$widget->connect (on_destroy => sub {
		153	my ($widget) = @_;
		154
		155	delete $self->{widget}{$widget->{s_id}};
		156	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		157	if exists $widget->{s_ws};
		158	});
		159
		160	1
		161	} else {
		162	$self->send_exti_msg (w_e => $id, undef);
		163
		164	0
		165	}
		166	}
		167
		168	# widgetset new
		169	sub ext_ws_n {
		170	my ($self, $id) = @_;
		171
		172	$self->{widgetset}{$id} = {
		173	w => {},
		174	};
		175	}
		176
		177	# widgetset destroy
		178	sub ext_ws_d {
		179	my ($self, $id) = @_;
		180
		181	my $ws = delete $self->{widgetset}{$id}
		182	or return;
		183
		184	$_->destroy
		185	for values %{$ws->{w}};
		186	}
		187
		188	# widgetset create
		189	sub ext_ws_c {
		190	my ($self, $ws, $id, $class, $args) = @_;
		191
		192	for my $ev (grep /^on_/, keys %$args) {
		193	my $rid = $args->{$ev};
		194	$args->{$ev} = sub {
		195	my $id = shift->{s_id};
		196	$self->send_exti_msg (w_e => $id, $rid, @_);
		197
		198	1
		199	};
		200	}
		201
		202	$self->widget_associate (
		203	$ws, $id => scalar eval {
		204	local $SIG{__DIE__};
		205	"CFPlus::UI::$class"->new (%$args)
		206	}
		207	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		208	}
		209
		210	# widgetset associate
		211	sub ext_ws_a {
		212	my ($self, %ass) = @_;
		213
		214	# everything that has a name, wether conceivably useful or not
		215	my %wkw = (
		216	root => $CFPlus::UI::ROOT,
		217	tooltip => $CFPlus::UI::TOOLTIP,
		218
		219	mapwidget => $::MAPWIDGET,
		220	buttonbar => $::BUTTONBAR,
		221	metaserver => $::METASERVER,
		222	buttonbar => $::BUTTONBAR,
		223	login_button => $::LOGIN_BUTTON,
		224	quit_dialog => $::QUIT_DIALOG,
		225	host_entry => $::HOST_ENTRY,
		226	metaserver => $::METASERVER,
		227	server_info => $::SERVER_INFO,
		228
		229	setup_dialog => $::SETUP_DIALOG,
		230	setup_notebook => $::SETUP_NOTEBOOK,
		231	setup_server => $::SETUP_SERVER,
		232	setup_keyboard => $::SETUP_KEYBOARD,
		233
		234	pl_notebook => $::PL_NOTEBOOK,
		235	pl_window => $::PL_WINDOW,
		236	inventory_page => $::INVENTORY_PAGE,
		237	stats_page => $::STATS_PAGE,
		238	skill_page => $::SKILL_PAGE,
		239	spell_page => $::SPELL_PAGE,
		240	spell_list => $::SPELL_LIST,
		241
		242	floorbox => $::FLOORBOX,
		243	help_window => $::HELP_WINDOW,
		244	message_window => $::MESSAGE_WINDOW,
		245	statusbox => $::SDTATUSBOX,
		246
		247	inv => $::INV,
		248	invr => $::INVR,
		249	invr_hb => $::INVR_HB,
		250	);
		251
		252	while (my ($id, $name) = each %ass) {
		253	$self->widget_associate (undef, $id => $wkw{$name})
		254	or warn "server failed to associate non-existent well-known widget $name\n";
		255	}
		256	}
		257
		258	# widget call
		259	sub ext_w_c {
		260	my ($self, $id, $rid, $method, @args) = @_;
		261
		262	my $w = $self->{widget}{$id}
		263	or return;
		264
		265	if ($rid) {
		266	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
		267	} else {
		268	$w->$method (@args);
		269	}
		270	}
		271
		272	# widget set
		273	sub ext_w_s {
		274	my ($self, $id, $attr) = @_;
		275
		276	my $w = $self->{widget}{$id}
		277	or return;
		278
		279	for (my $i = 0; $i < $#$attr; $i += 2) {
		280	my ($member, $value) = @$attr[$i, $i+1];
		281	if (defined $value) {
		282	$w->{$member} = $value;
		283	} else {
		284	delete $w->{$member};
		285	}
		286	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		287	}
		288	}
		289
		290	# widget get
		291	sub ext_w_g {
		292	my ($self, $id, $rid, $attr) = @_;
		293
		294	my $w = $self->{widget}{$id}
		295	or return;
		296
		297	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		298	}
		299
		300	# message window
		301	sub ext_channel_info {
		302	my ($self, $info) = @_;
		303	$self->{channels}->{$info->{id}} = $info;
		304	$::MESSAGE_WINDOW->add_channel ($info);
		305	}
		306
		307	#############################################################################
		308
195	sub logprint {	309	sub logprint {
196	my ($self, @a) = @_;	310	my ($self, @a) = @_;
197		311
198	$self->{log_fh} \|\|= do {	312	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
199	my $path = "$Crossfire::VARDIR/log.$self->{host}";
200
201	open my $fh, ">>:utf8", $path
202	or die "Couldn't open logfile $path: $!";
203
204	$fh->autoflush (1);
205
206	$fh;
207	};
208
209	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
210
211	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
212	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
213
214	print {$self->{log_fh}} "$ts ", @a, "\n";
215	}	313	}
216		314
217	sub _stat_numdiff {	315	sub _stat_numdiff {
218	my ($self, $name, $old, $new) = @_;	316	my ($self, $name, $old, $new) = @_;
219		317
…		…
352	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	450	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
353	$::GAUGES->{food} ->set_value ($fo, $fo_m);	451	$::GAUGES->{food} ->set_value ($fo, $fo_m);
354	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	452	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
355	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	453	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
356	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	454	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		455	$::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
357	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});	456	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
358	my $title = $stats->{+CS_STAT_TITLE};	457	my $title = $stats->{+CS_STAT_TITLE};
359	$title =~ s/^Player: //;	458	$title =~ s/^Player: //;
360	$::STATWIDS->{title} ->set_text ("Title: " . $title);	459	$::STATWIDS->{title} ->set_text ("Title: " . $title);
361		460
…		…
382	my @skills = keys %{ $self->{skill_info} };	481	my @skills = keys %{ $self->{skill_info} };
383		482
384	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	483	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
385	$sktbl->clear;	484	$sktbl->clear;
386		485
		486	my $sw = $self->{skillwid}{""} \|\|= [
387	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	487	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
388	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	488	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		489	2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
389	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	490	3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
390	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	491	4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
391	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	492	5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		493	6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
392	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	494	7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		495	];
		496
		497	my @add = @$sw;
393		498
394	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	499	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
395		500
396	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	501	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
397	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	502	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
…		…
425	}	530	}
426		531
427	1	532	1
428	};	533	};
429		534
430	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	535	my $sw = $self->{skillwid}{$idx} \|\|= [
		536	# exp
		537	(new CFPlus::UI::Label
431	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	538	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
432	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	539
		540	# level
		541	(new CFPlus::UI::Label
433	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	542	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		543
		544	# progress
		545	(new CFPlus::UI::ExperienceProgress),
		546
		547	# label
434	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	548	(new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
435	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	549	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		550	];
		551
		552	push @add,
		553	$x * 4 + 0, $y, $sw->[0],
		554	$x * 4 + 1, $y, $sw->[1],
		555	$x * 4 + 2, $y, $sw->[2],
		556	$x * 4 + 3, $y, $sw->[3],
		557	;
436		558
437	$x++ and ($x, $y) = (0, $y + 1);	559	$x++ and ($x, $y) = (0, $y + 1);
438	}	560	}
		561
		562	$sktbl->add_at (@add);
439	}	563	}
440		564
441	for (grep exists $stats->{$_}, @skills) {	565	for (grep exists $stats->{$_}, @skills) {
		566	my $sw = $self->{skillwid}{$_};
442	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	567	$sw->[0]->set_text (::formsep ($stats->{$_}[1]));
443	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	568	$sw->[1]->set_text ($stats->{$_}[0] * 1);
		569	$sw->[2]->set_value (@{$stats->{$_}});
444	}	570	}
445	}	571	}
446		572
447	sub macro_send {	573	sub macro_send {
448	my ($self, $macro) = @_;	574	my ($self, $macro) = @_;
…		…
476	}	602	}
477		603
478	sub feed_map1a {	604	sub feed_map1a {
479	my ($self, $data) = @_;	605	my ($self, $data) = @_;
480		606
481	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	607	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		608	my $delay;
		609
		610	for my $tile (@$missing) {
		611	next if $self->{delay}{$tile};
		612
		613	$delay = 1;
		614
		615	if (my $tex = $::CONN->{texture}[$tile]) {
		616	$tex->upload;
		617	} else {
		618	$self->{delay}{$tile} = 1;
		619
		620	# we assume the face is in-flight and will eventually come
		621	push @{$self->{tile_cb}{$tile}}, sub {
		622	delete $self->{delay}{$tile};
		623	$_[0]->upload;
		624	};
		625	}
		626	}
		627
		628	if ($delay) {
		629	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		630	Event->timer (after => 0.03, cb => sub {
		631	$_[0]->w->cancel;
		632	$self->{map_widget}->update;
		633	});
		634	} else {
482	$self->{map_widget}->update;	635	$self->{map_widget}->update;
		636	}
483	}	637	}
484		638
485	sub magicmap {	639	sub magicmap {
486	my ($self, $w, $h, $x, $y, $data) = @_;	640	my ($self, $w, $h, $x, $y, $data) = @_;
487		641
…		…
494	my $map_info = delete $self->{map_info}	648	my $map_info = delete $self->{map_info}
495	or return;	649	or return;
496		650
497	my ($hash, $x, $y, $w, $h) = @$map_info;	651	my ($hash, $x, $y, $w, $h) = @$map_info;
498		652
499	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	653	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
		654	$self->{map_cache_new}{$hash} = \$data;
500	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	655	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
501	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
502	}	656	}
503		657
504	sub map_clear {	658	sub map_clear {
505	my ($self) = @_;	659	my ($self) = @_;
506		660
…		…
512	}	666	}
513		667
514	sub bg_fetch {	668	sub bg_fetch {
515	my ($self) = @_;	669	my ($self) = @_;
516		670
517	my $id;	671	my $tile;
518		672
519	do {	673	do {
520	$id = pop @{$self->{bg_fetch}}	674	$tile = pop @{$self->{bg_fetch}}
521	or return;	675	or return;
522	} while $self->{texture}[$id];	676	} while $self->{texture}[$tile];
523		677
524	CFPlus::DB::get tilecache => $id, sub {	678	CFPlus::DB::get tilecache => $tile, sub {
525	my ($data) = @_;	679	my ($data) = @_;
526		680
527	return unless $self->{map}; # stop when destroyed	681	return unless $self->{map}; # stop when destroyed
528		682
529	$self->set_texture ($id => $data)
530	if defined $data;	683	if (defined $data) {
		684	$self->have_tile ($tile, $data);
		685	$self->{texture}[$tile]->upload;
		686	}
531		687
532	$self->bg_fetch;	688	$self->bg_fetch;
533	};	689	};
534	}	690	}
535		691
536	sub load_map($$$) {	692	sub load_map($$$) {
537	my ($self, $hash, $x, $y) = @_;	693	my ($self, $hash, $x, $y) = @_;
538		694
539	my $gen = $self->{map_change_gen};	695	my $gen = $self->{map_change_gen};
540		696
541	CFPlus::DB::get $self->{mapcache} => $hash, sub {	697	my $cb = sub {
542	return unless $gen == $self->{map_change_gen};	698	return unless $gen == $self->{map_change_gen};
543		699
544	my ($data) = @_;	700	my ($data) = @_;
545		701
546	if (defined $data) {	702	if (defined $data) {
		703	$self->{map_cache_new}{$hash} = \$data;
		704
547	$data = Compress::LZF::decompress $data;	705	my $data = Compress::LZF::decompress $data;
548	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
549		706
550	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	707	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
551	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	708	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
552	$self->bg_fetch unless $inprogress;	709	$self->bg_fetch unless $inprogress;
553	}	710	}
554	};	711	};
		712
		713	if (my $rdata = $self->{map_cache_old}{$hash}) {
		714	$cb->($$rdata);
		715	} else {
		716	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
		717	}
555	}	718	}
556		719
557	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	720	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
558	# (server resource,s latency, bandwidth), so this hack is warranted.	721	# (server resource,s latency, bandwidth), so this hack is warranted.
559	# the right fix is to make real tiled maps with an overview file	722	# the right fix is to make real tiled maps with an overview file
…		…
652	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	815	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
653		816
654	$self->flush_map;	817	$self->flush_map;
655		818
656	++$self->{map_change_gen};	819	++$self->{map_change_gen};
		820	$self->{map_cache_old} = delete $self->{map_cache_new};
657		821
658	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	822	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
659		823
660	my $mapmapw = $self->{mapmap}->{w};	824	my $mapmapw = $self->{mapmap}->{w};
661	my $mapmaph = $self->{mapmap}->{h};	825	my $mapmaph = $self->{mapmap}->{h};
…		…
680	}	844	}
681		845
682	sub face_find {	846	sub face_find {
683	my ($self, $facenum, $face, $cb) = @_;	847	my ($self, $facenum, $face, $cb) = @_;
684		848
685	my $hash = "$face->{chksum},$face->{name}";	849	if ($face->{type} == 0) { # FT_FACE
686
687	my $id = CFPlus::DB::get_tile_id_sync $hash;	850	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
688		851
689	$face->{id} = $id;	852	$face->{id} = $id;
690	$self->{faceid}[$facenum] = $id;
691
692	$self->{map}->set_tileid ($facenum => $id);	853	$self->{map}->set_tileid ($facenum => $id);
693		854
694	CFPlus::DB::get tilecache => $id, $cb;	855	CFPlus::DB::get tilecache => $id, $cb;
		856
		857	} elsif ($face->{type} & 1) { # with metadata
		858	CFPlus::DB::get res_meta => $face->{name}, $cb;
		859
		860	} else { # no metadata
		861	CFPlus::DB::get res_data => $face->{name}, $cb;
		862	}
695	}	863	}
696		864
697	sub face_update {	865	sub face_update {
698	my ($self, $facenum, $face, $changed) = @_;	866	my ($self, $facenum, $face, $changed) = @_;
699		867
		868	if ($face->{type} == 0) {
		869	# image, FT_FACE
700	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	870	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
701	if $changed;	871	if $changed;
702		872
703	$self->set_texture ($face->{id} => delete $face->{image});	873	$self->have_tile ($face->{id}, delete $face->{data});
		874
		875	} elsif ($face->{type} & 1) {
		876	# split metadata case, FT_MUSIC, FT_SOUND
		877	if ($changed) { # new data
		878	my ($meta, $data) = unpack "(w/a)", $face->{data};
		879	$face->{data} = $meta;
		880
		881	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		882	CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
		883	}
		884
		885	$face->{data} = $self->{json_coder}->decode ($face->{data});
		886
		887	::add_license ($face);
		888
		889	if ($face->{type} == 3) { # FT_MUSIC
		890	::message ({ markup => "downloaded song #$facenum" })
		891	if $changed;
		892
		893	&::audio_music_push ($facenum);
		894	} elsif ($face->{type} == 5) { # FT_SOUND
		895	::message ({ markup => "downloaded sound #$facenum" })
		896	if $changed;
		897
		898	&::audio_sound_push ($facenum);
		899	}
		900
		901	} else {
		902	# flat resource case, FT_RSRC
		903	CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
		904	if $changed;
		905	}
		906
		907	if (my $cbs = $self->{face_cb}{$facenum}) {
		908	$_->($face, $changed) for @$cbs;
		909	}
704	}	910	}
705		911
706	sub smooth_update {	912	sub smooth_update {
707	my ($self, $facenum, $face) = @_;	913	my ($self, $facenum, $face) = @_;
708		914
709	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	915	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
710	}	916	}
711		917
712	sub set_texture {	918	sub have_tile {
713	my ($self, $id, $data) = @_;	919	my ($self, $tile, $data) = @_;
714		920
715	$self->{texture}[$id] = my $tex =	921	return unless $self->{map};
		922
		923	my $tex = $self->{texture}[$tile] \|\|=
716	new_from_image CFPlus::Texture	924	new CFPlus::Texture
		925	tile => $tile,
		926	image => $data, delete_image => 1,
717	$data, minify => 1, mipmap => 1;	927	minify => 1, mipmap => 1;
718		928
719	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	929	if (my $cbs = delete $self->{tile_cb}{$tile}) {
720	$self->{map_widget}->update;	930	$_->($tex) for @$cbs;
		931	}
		932	}
		933
		934	# call in non-void context registers a temporary
		935	# hook with handle, otherwise its permanent
		936	sub on_face_change {
		937	my ($self, $num, $cb) = @_;
		938
		939	push @{$self->{face_cb}{$num}}, $cb;
		940
		941	defined wantarray
		942	? CFPlus::guard {
		943	@{$self->{face_cb}{$num}}
		944	= grep $_ != $cb,
		945	@{$self->{face_cb}{$num}};
		946	}
		947	: ()
		948	}
		949
		950	# call in non-void context registers a temporary
		951	# hook with handle, otherwise its permanent
		952	sub register_face_handler {
		953	my ($self, $num, $cb) = @_;
		954
		955	return unless $num;
		956
		957	# invoke if available right now
		958	$cb->($self->{face}[$num], 0)
		959	unless exists $self->{face}[$num]{loading};
		960
		961	# future changes
		962	$self->on_face_change ($num => $cb)
721	}	963	}
722		964
723	sub sound_play {	965	sub sound_play {
724	my ($self, $x, $y, $soundnum, $type) = @_;	966	my ($self, $type, $face, $dx, $dy, $vol) = @_;
725		967
726	$self->{sound_play}->($x, $y, $soundnum, $type);	968	&::audio_sound_play ($face, $dx, $dy, $vol)
		969	unless $type & 1; # odd types are silent for future expansion
727	}	970	}
728		971
729	my $LAST_QUERY; # server is stupid, stupid, stupid	972	my $LAST_QUERY; # server is stupid, stupid, stupid
730		973
731	sub query {	974	sub query {
…		…
796	$self->{$type} = $text;	1039	$self->{$type} = $text;
797	} else {	1040	} else {
798	$self->logprint ("msg: ", $text);	1041	$self->logprint ("msg: ", $text);
799	return if $color < 0; # negative color == ignore if not understood	1042	return if $color < 0; # negative color == ignore if not understood
800		1043
801	my $fg = $CF_COLOR[$color % @CF_COLOR];	1044	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
802		1045
803	## try to create single paragraphs of multiple lines sent by the server	1046	## try to create single paragraphs of multiple lines sent by the server
804	# no longer neecssary with TRT servers	1047	# no longer neecssary with TRT servers
805	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1048	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
806		1049
807	::message ({ fg => $fg, markup => $_ })	1050	::message ({
		1051	fg => $fg,
		1052	markup => $_,
		1053	type => $type,
		1054	extra => [@extra],
		1055	color_flags => $color
808	for split /\n/, $text;	1056	}) for split /\n/, $text;
809		1057
810	$self->{statusbox}->add ($text,	1058	$self->{statusbox}->add ($text,
811	group => $text,	1059	group => $text,
812	fg => $fg,	1060	fg => $fg,
813	timeout => $color >= 2 ? 180 : 10,	1061	timeout => $color >= 2 ? 180 : 10,
…		…
869	$self->{map_widget}->clr_commands;	1117	$self->{map_widget}->clr_commands;
870		1118
871	::stop_game ();	1119	::stop_game ();
872	}	1120	}
873		1121
874	sub image_info {
875	my ($self, $numfaces) = @_;
876
877	$self->{num_faces} = $numfaces;
878	$self->{face_prefetch} = [1 .. $numfaces];
879	$self->face_prefetch;
880	}
881
882	sub face_prefetch {
883	my ($self) = @_;
884
885	return unless $::CFG->{face_prefetch};
886
887	if ($self->{num_faces}) {
888	return if @{ $self->{send_queue} \|\| [] };
889	my $todo = @{ $self->{face_prefetch} }
890	or return;
891
892	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
893
894	$self->send ("requestinfo image_sums $face $face");
895
896	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
897	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
898	} elsif (!exists $self->{num_faces}) {
899	$self->send ("requestinfo image_info");
900
901	$self->{num_faces} = 0;
902
903	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
904	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
905	}
906	}
907
908	sub update_floorbox {	1122	sub update_floorbox {
909	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1123	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
910	return unless $::CONN;	1124	return unless $::CONN;
911		1125
912	$::FLOORBOX->clear;	1126	$::FLOORBOX->clear;
		1127
		1128	my @add;
913		1129
914	my $row;	1130	my $row;
915	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	1131	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
916	if ($row < 6) {	1132	if ($row < 6) {
917	local $_->{face_widget}; # hack to force recreation of widget	1133	local $_->{face_widget}; # hack to force recreation of widget
918	local $_->{desc_widget}; # hack to force recreation of widget	1134	local $_->{desc_widget}; # hack to force recreation of widget
919	CFPlus::Item::update_widgets $_;	1135	CFPlus::Item::update_widgets $_;
920		1136
		1137	push @add,
921	$::FLOORBOX->add (0, $row, $_->{face_widget});	1138	0, $row, $_->{face_widget},
922	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1139	1, $row, $_->{desc_widget};
923		1140
924	$row++;	1141	$row++;
925	} else {	1142	} else {
926	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1143	push @add, 1, $row, new CFPlus::UI::Button
927	text => "More...",	1144	text => "More...",
928	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1145	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
929	);	1146	;
930	last;	1147	last;
931	}	1148	}
932	}	1149	}
933	if ($::CONN->{open_container}) {	1150	if ($::CONN->{open_container}) {
934	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1151	push @add, 1, $row++, new CFPlus::UI::Button
935	text => "Close container",	1152	text => "Close container",
936	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1153	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
937	);	1154	;
938	}	1155	}
		1156
		1157	$::FLOORBOX->add_at (@add);
939	});	1158	});
940		1159
941	$::WANT_REFRESH++;	1160	$::WANT_REFRESH->start;
942	}	1161	}
943		1162
944	sub set_opencont {	1163	sub set_opencont {
945	my ($conn, $tag, $name) = @_;	1164	my ($conn, $tag, $name) = @_;
946	$conn->{open_container} = $tag;	1165	$conn->{open_container} = $tag;
947	update_floorbox;	1166	update_floorbox;
948		1167
949	$::INV_RIGHT_HB->clear ();	1168	$::INVR_HB->clear ();
950	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1169	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
951		1170
952	if ($tag != 0) { # Floor isn't closable, is it?	1171	if ($tag != 0) { # Floor isn't closable, is it?
953	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1172	$::INVR_HB->add (new CFPlus::UI::Button
954	text => "Close container",	1173	text => "Close container",
955	tooltip => "Close the currently open container (if one is open)",	1174	tooltip => "Close the currently open container (if one is open)",
956	on_activate => sub {	1175	on_activate => sub {
957	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1176	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
958	if $tag != 0;	1177	if $tag != 0;
959	#if $CONN->{open_container} != 0;
960	0	1178	0
961	},	1179	},
962	);	1180	);
963	}	1181	}
964		1182
…		…
1063	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1281	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1064	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1282	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1065	. "map size $self->{mapw}×$self->{maph}\n"	1283	. "map size $self->{mapw}×$self->{maph}\n"
1066	);	1284	);
1067		1285
1068	::setup_build_button ($self->{editor_support}->{builder_ui});
1069	}	1286	}
1070		1287
1071	sub logged_in {	1288	sub logged_in {
1072	my ($self) = @_;	1289	my ($self) = @_;
1073		1290
1074	$self->send_ext_req (cfplus_support => version => 1, sub {	1291	$self->send_ext_req (cfplus_support => version => 2, sub {
		1292	my (%msg) = @_;
		1293
1075	$self->{cfplus_ext} = $_[0]{version};	1294	$self->{cfplus_ext} = $msg{version};
1076	$self->update_server_info;	1295	$self->update_server_info;
1077		1296
1078	if ($self->{cfplus_ext} >= 2) {	1297	if ($self->{cfplus_ext} >= 2) {
1079	$self->send_ext_req ("editor_support", sub {	1298	$self->send_ext_req ("editor_support", sub {
1080	$self->{editor_support} = $_[0];	1299	$self->{editor_support} = { @_ };
1081	$self->update_server_info;	1300	$self->update_server_info;
1082		1301
1083	0	1302	0
1084	});	1303	});
1085	}	1304	}
…		…
1093	$self->send_command ("output-count $::CFG->{output_count}");	1312	$self->send_command ("output-count $::CFG->{output_count}");
1094	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1313	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1095	$self->send_command ("pickup $::CFG->{pickup}");	1314	$self->send_command ("pickup $::CFG->{pickup}");
1096	}	1315	}
1097		1316
1098	sub buildat {
1099	my ($self, $builditem, $x, $y) = @_;
1100
1101	if ($self->{cfplus_ext}) {
1102	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1103	}
1104	}
1105
1106	sub lookat {	1317	sub lookat {
1107	my ($self, $x, $y) = @_;	1318	my ($self, $x, $y) = @_;
1108		1319
1109	if ($self->{cfplus_ext}) {	1320	if ($self->{cfplus_ext}) {
1110	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1321	$self->send_ext_req (lookat => $x, $y, sub {
1111	my ($msg) = @_;	1322	my (%msg) = @_;
1112		1323
1113	if (exists $msg->{npc_dialog}) {	1324	if (exists $msg{npc_dialog}) {
1114	# start npc chat dialog	1325	# start npc chat dialog
1115	$self->{npc_dialog} = new CFPlus::NPCDialog::	1326	$self->{npc_dialog} = new CFPlus::NPCDialog::
1116	dx => $x,	1327	token => $msg{npc_dialog},
1117	dy => $y,
1118	title => "$msg->{npc_dialog} (NPC)",	1328	title => "$msg{npc_dialog}[0] (NPC)",
1119	conn => $self,	1329	conn => $self,
1120	;	1330	;
1121	}	1331	}
1122	});	1332	});
1123	}	1333	}
…		…
1130		1340
1131	(delete $self->{npc_dialog})->destroy	1341	(delete $self->{npc_dialog})->destroy
1132	if $self->{npc_dialog};	1342	if $self->{npc_dialog};
1133		1343
1134	$self->SUPER::destroy;	1344	$self->SUPER::destroy;
		1345
		1346	%$self = ();
1135	}	1347	}
1136		1348
1137	package CFPlus::NPCDialog;	1349	package CFPlus::NPCDialog;
1138		1350
1139	our @ISA = 'CFPlus::UI::Toplevel';	1351	our @ISA = 'CFPlus::UI::Toplevel';
…		…
1186	on_activate => sub { $this->destroy; 1 },	1398	on_activate => sub { $this->destroy; 1 },
1187	;	1399	;
1188		1400
1189	$self->update_options;	1401	$self->update_options;
1190		1402
1191	$self->{id} = $self->{conn}->send_ext_req (	1403	$self->{id} = "npc-channel-" . $self->{conn}->token;
1192	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1404	$self->{conn}->connect_ext ($self->{id} => sub {
1193	sub { $this && $this->feed (@_) }	1405	$this->feed (@_) if $this;
1194	);	1406	});
		1407
		1408	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1195		1409
1196	$self->{entry}->grab_focus;	1410	$self->{entry}->grab_focus;
1197		1411
1198	$self->{textview}->add_paragraph ({	1412	$self->{textview}->add_paragraph ({
1199	fg => [1, 1, 0, 1],	1413	fg => [1, 1, 0, 1],
…		…
1222	);	1436	);
1223	}	1437	}
1224	}	1438	}
1225		1439
1226	sub feed {	1440	sub feed {
1227	my ($self, $msg) = @_;	1441	my ($self, $type, @arg) = @_;
1228		1442
1229	CFPlus::weaken $self;	1443	CFPlus::weaken $self;
1230		1444
1231	if ($msg->{msgtype} eq "reply") {	1445	if ($type eq "update") {
		1446	my (%info) = @arg;
		1447
1232	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1448	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1233	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1449	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1234
1235	my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1236	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1237	my @link;
1238	$text =~ s{
1239	($match)
1240	}{
1241	my $kw = $1;
1242
1243	push @link, new CFPlus::UI::Label
1244	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1245	can_hover => 1,
1246	can_events => 1,
1247	padding_x => 0,
1248	padding_y => 0,
1249	on_button_up => sub {
1250	$self->send ($kw);
1251	};
1252
1253	"\x{fffc}"
1254	}giex;
1255		1450
		1451	if (exists $info{msg}) {
		1452	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1453	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1454	my @link;
		1455	$text =~ s{
		1456	($match)
		1457	}{
		1458	my $kw = $1;
		1459
		1460	push @link, new CFPlus::UI::Label
		1461	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1462	can_hover => 1,
		1463	can_events => 1,
		1464	padding_x => 0,
		1465	padding_y => 0,
		1466	on_button_up => sub {
		1467	$self->send ($kw);
		1468	};
		1469
		1470	"\x{fffc}"
		1471	}giex;
		1472
1256	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1473	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1257	$self->{textview}->scroll_to_bottom;	1474	$self->{textview}->scroll_to_bottom;
		1475	}
		1476
1258	$self->update_options;	1477	$self->update_options;
1259	} else {	1478	} else {
1260	$self->destroy;	1479	$self->destroy;
1261	}	1480	}
1262		1481
…		…
1267	my ($self, $msg) = @_;	1486	my ($self, $msg) = @_;
1268		1487
1269	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1488	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1270	$self->{textview}->scroll_to_bottom;	1489	$self->{textview}->scroll_to_bottom;
1271		1490
1272	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1491	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1273	}	1492	}
1274		1493
1275	sub destroy {	1494	sub destroy {
1276	my ($self) = @_;	1495	my ($self) = @_;
1277		1496
1278	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1497	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1279		1498
1280	if ($self->{conn}) {	1499	if ($self->{conn}) {
1281	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1500	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1282	delete $self->{conn}{npc_dialog};	1501	delete $self->{conn}{npc_dialog};
1283	$self->{conn}->disconnect_ext ($self->{id});	1502	$self->{conn}->disconnect_ext ($self->{id});
1284	}	1503	}
1285		1504
1286	$self->SUPER::destroy;	1505	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.110 by root, Tue Jun 26 05:06:01 2007 UTC vs. Revision 1.160 by root, Tue Aug 21 22:46:50 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.110 by root, Tue Jun 26 05:06:01 2007 UTC vs.
Revision 1.160 by root, Tue Aug 21 22:46:50 2007 UTC