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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.125 by root, Sat Jul 21 15:04:27 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	ywidget => 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_music => sub {
54	my ($ev) = @_;
55
56	return unless $::CFG->{bgm_enable};
57
58	my $faces = $ev->{faces};
59	my @songs;
60
61	# request music from server if appropriate
62	if (my $faces = $ev->{faces}) {
63	for (@$faces) {
64	my ($face, $pri, $chksum) = @$_;
65	utf8::downgrade $chksum;
66
67	$chksum = unpack "H*", $chksum;
68	$self->{music_map}{$face} = $chksum;
69
70	# check if already cached
71	CFPlus::DB::get "res-metadata" => $chksum, sub {
72	my ($meta_json) = @_;
73	my $path = CFPlus::DB::path_of_res $chksum;
74
75	if (defined $meta_json) {
76	my $meta = $self->{json_coder}->decode ($meta_json);
77	$meta->{path} = $path;
78	$self->{music_meta}{$chksum} = $meta;
79	&::audio_music_set ($self->{songs});
80	} else {
81	::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82	$self->ask_face ($face, -100 - $pri, undef, sub {
83	my $len = length $_[1];
84	my ($meta_json, $data) = unpack "(w/a)", $_[1];
85
86	CFPlus::DB::write_file $path, $data, sub {
87	CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88	my $meta = $self->{json_coder}->decode ($meta_json);
89	$meta->{path} = $path;
90	$self->{music_meta}{$chksum} = $meta;
91
92	::message ({ markup => "downloaded song #$face, size $len octets" });
93	&::audio_music_set ($self->{songs});
94	};
95	};
96	});
97	}
98	}
99	}
100	}
101
102	if (my $play = $ev->{play}) {
103	&::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104	}
105	});
106
107	$self->connect_ext (event_capabilities => sub {
108	my ($cap) = @_;
109
110	if (my $ts = $cap->{tileset}) {
111	if (my ($default) = grep $_->[2] & 1, @$ts) {
112	$self->{tileset} = $default;
113	$self->{tilesize} = $default->[3];
114	$self->setup_req (tileset => $default->[0]);
115
116	my $w = int $self->{mapw} * 32 / $self->{tilesize};
117	my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119	$self->setup_req (mapsize => "${w}x${h}");
120	}
121	}
122	});
123
124	$self->{json_coder}	53	$self->{json_coder}
125	->convert_blessed	54	->convert_blessed
126	->filter_json_single_key_object (__widget_ref__ => sub {	55	->filter_json_single_key_object (__w_ => sub {
127	$self->{widget}{$_[0]}	56	$self->{widget}{$_[0]}
128	});	57	});
129
130	# widgetset new
131	$self->connect_ext (ws_n => sub {
132	my ($arg) = @_;
133
134	$self->{widgetset}{$arg{id}} = {
135	w => {},
136	};
137	});
138
139	# widgetset destroy
140	$self->connect_ext (ws_d => sub {
141	my ($arg) = @_;
142
143	my $ws = delete $self->{widgetset}{$arg{id}}
144	or return;
145
146	$_->destroy
147	for values %{$ws->{w}};
148	});
149
150	# widgetset destroy
151	$self->connect_ext (ws_c => sub {
152	my ($arg) = @_;
153
154	my $args = $arg->{args} \|\| {};
155
156	for my $ev (grep /^on_/, keys %$args) {
157	$args->{$ev} = sub {
158	my $id = shift->{s_id};
159	$self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161	1
162	};
163	}
164
165	if (my $widget = eval {
166	local $SIG{__DIE__};
167	"CFPlus::UI::$arg->{class}"->new (
168	%$args,
169	s_ws => $arg->{ws},
170	s_id => $arg->{id},
171	)
172	}
173	) {
174	$self->{widget}{$arg->{id}}
175	= $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176	= $widget;
177
178	$widget->connect (on_destroy => sub {
179	my ($widget) = @_;
180
181	delete $self->{widget}{$widget->{s_id}};
182	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183	});
184	} else {
185	warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186	$self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187	}
188	});
189
190	# widget call
191	$self->connect_ext (w_c => sub {
192	my ($arg) = @_;
193
194	my $w = $self->{widget}{$arg->{id}}
195	or return;
196	my $m = $arg->{name};
197
198	my $a = $arg->{args} \|\| [];
199
200	if (exists $arg->{rid}) {
201	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202	} else {
203	$w->$m (@$a);
204	}
205	});
206
207	# widget set
208	$self->connect_ext (w_s => sub {
209	my ($arg) = @_;
210
211	my $w = $self->{widget}{$arg->{id}}
212	or return;
213
214	$w->{$_->[0]} = $_->[1]
215	for @{ $arg->{attr} };
216	});
217
218	# widget get
219	$self->connect_ext (w_g => sub {
220	my ($arg) = @_;
221
222	my $w = $self->{widget}{$arg->{id}}
223	or return;
224
225	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
226	});
227		58
228	# destroy widgets on logout	59	# destroy widgets on logout
229	$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 {
230	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {	61	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
231	$_->destroy	62	$_->destroy
…		…
254	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	85	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
255		86
256	$self	87	$self
257	}	88	}
258		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
259	sub logprint {	309	sub logprint {
260	my ($self, @a) = @_;	310	my ($self, @a) = @_;
261		311
262	$self->{log_fh} \|\|= do {	312	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
263	my $path = "$Crossfire::VARDIR/log.$self->{host}";
264
265	open my $fh, ">>:utf8", $path
266	or die "Couldn't open logfile $path: $!";
267
268	$fh->autoflush (1);
269
270	$fh;
271	};
272
273	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
274
275	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
276	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
277
278	print {$self->{log_fh}} "$ts ", @a, "\n";
279	}	313	}
280		314
281	sub _stat_numdiff {	315	sub _stat_numdiff {
282	my ($self, $name, $old, $new) = @_;	316	my ($self, $name, $old, $new) = @_;
283		317
…		…
416	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	450	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
417	$::GAUGES->{food} ->set_value ($fo, $fo_m);	451	$::GAUGES->{food} ->set_value ($fo, $fo_m);
418	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	452	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
419	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	453	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
420	. " (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});
421	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});	456	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
422	my $title = $stats->{+CS_STAT_TITLE};	457	my $title = $stats->{+CS_STAT_TITLE};
423	$title =~ s/^Player: //;	458	$title =~ s/^Player: //;
424	$::STATWIDS->{title} ->set_text ("Title: " . $title);	459	$::STATWIDS->{title} ->set_text ("Title: " . $title);
425		460
…		…
446	my @skills = keys %{ $self->{skill_info} };	481	my @skills = keys %{ $self->{skill_info} };
447		482
448	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	483	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
449	$sktbl->clear;	484	$sktbl->clear;
450		485
451	my @add;	486	my $sw = $self->{skillwid}{""} \|\|= [
452
453	push @add,
454	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),	487	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
455	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),
456	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),	490	3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
457	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),	491	4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
458	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),
459	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),	494	7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
460	;	495	];
		496
		497	my @add = @$sw;
461		498
462	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>";
463		500
464	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);
465	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);
…		…
493	}	530	}
494		531
495	1	532	1
496	};	533	};
497		534
		535	my $sw = $self->{skillwid}{$idx} \|\|= [
		536	# exp
		537	(new CFPlus::UI::Label
		538	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
		539
		540	# level
		541	(new CFPlus::UI::Label
		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
		548	(new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
		549	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		550	];
		551
498	push @add,	552	push @add,
499	$x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	553	$x * 4 + 0, $y, $sw->[0],
500	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),	554	$x * 4 + 1, $y, $sw->[1],
501	$x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	555	$x * 4 + 2, $y, $sw->[2],
502	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),	556	$x * 4 + 3, $y, $sw->[3],
503	$x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
504	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
505	;	557	;
506		558
507	$x++ and ($x, $y) = (0, $y + 1);	559	$x++ and ($x, $y) = (0, $y + 1);
508	}	560	}
509		561
510	$sktbl->add_at (@add);	562	$sktbl->add_at (@add);
511	}	563	}
512		564
513	for (grep exists $stats->{$_}, @skills) {	565	for (grep exists $stats->{$_}, @skills) {
		566	my $sw = $self->{skillwid}{$_};
514	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	567	$sw->[0]->set_text (::formsep ($stats->{$_}[1]));
515	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	568	$sw->[1]->set_text ($stats->{$_}[0] * 1);
		569	$sw->[2]->set_value (@{$stats->{$_}});
516	}	570	}
517	}	571	}
518		572
519	sub macro_send {	573	sub macro_send {
520	my ($self, $macro) = @_;	574	my ($self, $macro) = @_;
…		…
548	}	602	}
549		603
550	sub feed_map1a {	604	sub feed_map1a {
551	my ($self, $data) = @_;	605	my ($self, $data) = @_;
552		606
553	$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 {
554	$self->{map_widget}->update;	635	$self->{map_widget}->update;
		636	}
555	}	637	}
556		638
557	sub magicmap {	639	sub magicmap {
558	my ($self, $w, $h, $x, $y, $data) = @_;	640	my ($self, $w, $h, $x, $y, $data) = @_;
559		641
…		…
566	my $map_info = delete $self->{map_info}	648	my $map_info = delete $self->{map_info}
567	or return;	649	or return;
568		650
569	my ($hash, $x, $y, $w, $h) = @$map_info;	651	my ($hash, $x, $y, $w, $h) = @$map_info;
570		652
571	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;
572	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	655	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
573	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
574	}	656	}
575		657
576	sub map_clear {	658	sub map_clear {
577	my ($self) = @_;	659	my ($self) = @_;
578		660
…		…
584	}	666	}
585		667
586	sub bg_fetch {	668	sub bg_fetch {
587	my ($self) = @_;	669	my ($self) = @_;
588		670
589	my $id;	671	my $tile;
590		672
591	do {	673	do {
592	$id = pop @{$self->{bg_fetch}}	674	$tile = pop @{$self->{bg_fetch}}
593	or return;	675	or return;
594	} while $self->{texture}[$id];	676	} while $self->{texture}[$tile];
595		677
596	CFPlus::DB::get tilecache => $id, sub {	678	CFPlus::DB::get tilecache => $tile, sub {
597	my ($data) = @_;	679	my ($data) = @_;
598		680
599	return unless $self->{map}; # stop when destroyed	681	return unless $self->{map}; # stop when destroyed
600		682
601	$self->set_texture ($id => $data)
602	if defined $data;	683	if (defined $data) {
		684	$self->have_tile ($tile, $data);
		685	$self->{texture}[$tile]->upload;
		686	}
603		687
604	$self->bg_fetch;	688	$self->bg_fetch;
605	};	689	};
606	}	690	}
607		691
608	sub load_map($$$) {	692	sub load_map($$$) {
609	my ($self, $hash, $x, $y) = @_;	693	my ($self, $hash, $x, $y) = @_;
610		694
611	my $gen = $self->{map_change_gen};	695	my $gen = $self->{map_change_gen};
612		696
613	CFPlus::DB::get $self->{mapcache} => $hash, sub {	697	my $cb = sub {
614	return unless $gen == $self->{map_change_gen};	698	return unless $gen == $self->{map_change_gen};
615		699
616	my ($data) = @_;	700	my ($data) = @_;
617		701
618	if (defined $data) {	702	if (defined $data) {
		703	$self->{map_cache_new}{$hash} = \$data;
		704
619	$data = Compress::LZF::decompress $data;	705	my $data = Compress::LZF::decompress $data;
620	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
621		706
622	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	707	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
623	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	708	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
624	$self->bg_fetch unless $inprogress;	709	$self->bg_fetch unless $inprogress;
625	}	710	}
626	};	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	}
627	}	718	}
628		719
629	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	720	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
630	# (server resource,s latency, bandwidth), so this hack is warranted.	721	# (server resource,s latency, bandwidth), so this hack is warranted.
631	# 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
…		…
724	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	815	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
725		816
726	$self->flush_map;	817	$self->flush_map;
727		818
728	++$self->{map_change_gen};	819	++$self->{map_change_gen};
		820	$self->{map_cache_old} = delete $self->{map_cache_new};
729		821
730	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	822	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
731		823
732	my $mapmapw = $self->{mapmap}->{w};	824	my $mapmapw = $self->{mapmap}->{w};
733	my $mapmaph = $self->{mapmap}->{h};	825	my $mapmaph = $self->{mapmap}->{h};
…		…
752	}	844	}
753		845
754	sub face_find {	846	sub face_find {
755	my ($self, $facenum, $face, $cb) = @_;	847	my ($self, $facenum, $face, $cb) = @_;
756		848
757	my $hash = "$face->{chksum},$face->{name}";	849	if ($face->{type} == 0) { # FT_FACE
758
759	my $id = CFPlus::DB::get_tile_id_sync $hash;	850	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
760		851
761	$face->{id} = $id;	852	$face->{id} = $id;
762	$self->{faceid}[$facenum] = $id;
763
764	$self->{map}->set_tileid ($facenum => $id);	853	$self->{map}->set_tileid ($facenum => $id);
765		854
766	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	}
767	}	863	}
768		864
769	sub face_update {	865	sub face_update {
770	my ($self, $facenum, $face, $changed) = @_;	866	my ($self, $facenum, $face, $changed) = @_;
771		867
		868	if ($face->{type} == 0) {
		869	# image, FT_FACE
772	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	870	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
773	if $changed;	871	if $changed;
774		872
775	$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	}
776	}	910	}
777		911
778	sub smooth_update {	912	sub smooth_update {
779	my ($self, $facenum, $face) = @_;	913	my ($self, $facenum, $face) = @_;
780		914
781	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	915	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
782	}	916	}
783		917
784	sub set_texture {	918	sub have_tile {
785	my ($self, $id, $data) = @_;	919	my ($self, $tile, $data) = @_;
786		920
787	return unless $self->{map};	921	return unless $self->{map};
788		922
789	$self->{texture}[$id] = my $tex =	923	my $tex = $self->{texture}[$tile] \|\|=
790	new_from_image CFPlus::Texture	924	new CFPlus::Texture
		925	tile => $tile,
		926	image => $data, delete_image => 1,
791	$data, minify => 1, mipmap => 1;	927	minify => 1, mipmap => 1;
792		928
793	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	929	if (my $cbs = delete $self->{tile_cb}{$tile}) {
794	$self->{map_widget}->update;	930	$_->($tex) for @$cbs;
795		931	}
796	$_->() for @{(delete $self->{face_cb}{$id}) \|\| []};
797	}	932	}
798		933
799	sub connect_face_update {	934	# call in non-void context registers a temporary
		935	# hook with handle, otherwise its permanent
		936	sub on_face_change {
800	my ($self, $id, $cb) = @_;	937	my ($self, $num, $cb) = @_;
801		938
802	push @{$self->{face_cb}{$id}}, $cb;	939	push @{$self->{face_cb}{$num}}, $cb;
803		940
		941	defined wantarray
804	CFPlus::guard {	942	? CFPlus::guard {
805	@{$self->{face_cb}{$id}}	943	@{$self->{face_cb}{$num}}
806	= grep $_ != $cb,	944	= grep $_ != $cb,
807	@{$self->{face_cb}{$id}};	945	@{$self->{face_cb}{$num}};
808	}	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)
809	}	963	}
810		964
811	sub sound_play {	965	sub sound_play {
812	my ($self, $x, $y, $soundnum, $type) = @_;	966	my ($self, $type, $face, $dx, $dy, $vol) = @_;
813		967
814	$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
815	}	970	}
816		971
817	my $LAST_QUERY; # server is stupid, stupid, stupid	972	my $LAST_QUERY; # server is stupid, stupid, stupid
818		973
819	sub query {	974	sub query {
…		…
884	$self->{$type} = $text;	1039	$self->{$type} = $text;
885	} else {	1040	} else {
886	$self->logprint ("msg: ", $text);	1041	$self->logprint ("msg: ", $text);
887	return if $color < 0; # negative color == ignore if not understood	1042	return if $color < 0; # negative color == ignore if not understood
888		1043
889	my $fg = $CF_COLOR[$color % @CF_COLOR];	1044	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
890		1045
891	## 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
892	# no longer neecssary with TRT servers	1047	# no longer neecssary with TRT servers
893	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1048	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
894		1049
895	::message ({ fg => $fg, markup => $_ })	1050	::message ({
		1051	fg => $fg,
		1052	markup => $_,
		1053	type => $type,
		1054	extra => [@extra],
		1055	color_flags => $color
896	for split /\n/, $text;	1056	}) for split /\n/, $text;
897		1057
898	$self->{statusbox}->add ($text,	1058	$self->{statusbox}->add ($text,
899	group => $text,	1059	group => $text,
900	fg => $fg,	1060	fg => $fg,
901	timeout => $color >= 2 ? 180 : 10,	1061	timeout => $color >= 2 ? 180 : 10,
…		…
957	$self->{map_widget}->clr_commands;	1117	$self->{map_widget}->clr_commands;
958		1118
959	::stop_game ();	1119	::stop_game ();
960	}	1120	}
961		1121
962	sub image_info {
963	my ($self, $numfaces) = @_;
964
965	$self->{num_faces} = $numfaces;
966	$self->{face_prefetch} = [1 .. $numfaces];
967	$self->face_prefetch;
968	}
969
970	sub face_prefetch {
971	my ($self) = @_;
972
973	return unless $::CFG->{face_prefetch};
974
975	if ($self->{num_faces}) {
976	return if @{ $self->{send_queue} \|\| [] };
977	my $todo = @{ $self->{face_prefetch} }
978	or return;
979
980	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
981
982	$self->send ("requestinfo image_sums $face $face");
983
984	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
985	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
986	} elsif (!exists $self->{num_faces}) {
987	$self->send ("requestinfo image_info");
988
989	$self->{num_faces} = 0;
990
991	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
992	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
993	}
994	}
995
996	sub update_floorbox {	1122	sub update_floorbox {
997	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1123	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
998	return unless $::CONN;	1124	return unless $::CONN;
999		1125
1000	$::FLOORBOX->clear;	1126	$::FLOORBOX->clear;
…		…
1029	}	1155	}
1030		1156
1031	$::FLOORBOX->add_at (@add);	1157	$::FLOORBOX->add_at (@add);
1032	});	1158	});
1033		1159
1034	$::WANT_REFRESH++;	1160	$::WANT_REFRESH->start;
1035	}	1161	}
1036		1162
1037	sub set_opencont {	1163	sub set_opencont {
1038	my ($conn, $tag, $name) = @_;	1164	my ($conn, $tag, $name) = @_;
1039	$conn->{open_container} = $tag;	1165	$conn->{open_container} = $tag;
1040	update_floorbox;	1166	update_floorbox;
1041		1167
1042	$::INV_RIGHT_HB->clear ();	1168	$::INVR_HB->clear ();
1043	$::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);
1044		1170
1045	if ($tag != 0) { # Floor isn't closable, is it?	1171	if ($tag != 0) { # Floor isn't closable, is it?
1046	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1172	$::INVR_HB->add (new CFPlus::UI::Button
1047	text => "Close container",	1173	text => "Close container",
1048	tooltip => "Close the currently open container (if one is open)",	1174	tooltip => "Close the currently open container (if one is open)",
1049	on_activate => sub {	1175	on_activate => sub {
1050	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1176	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
1051	if $tag != 0;	1177	if $tag != 0;
1052	#if $CONN->{open_container} != 0;
1053	0	1178	0
1054	},	1179	},
1055	);	1180	);
1056	}	1181	}
1057		1182
…		…
1156	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1281	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1157	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1282	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1158	. "map size $self->{mapw}×$self->{maph}\n"	1283	. "map size $self->{mapw}×$self->{maph}\n"
1159	);	1284	);
1160		1285
1161	::setup_build_button ($self->{editor_support}->{builder_ui});
1162	}	1286	}
1163		1287
1164	sub logged_in {	1288	sub logged_in {
1165	my ($self) = @_;	1289	my ($self) = @_;
1166		1290
1167	$self->send_ext_req (cfplus_support => version => 1, sub {	1291	$self->send_ext_req (cfplus_support => version => 2, sub {
		1292	my (%msg) = @_;
		1293
1168	$self->{cfplus_ext} = $_[0]{version};	1294	$self->{cfplus_ext} = $msg{version};
1169	$self->update_server_info;	1295	$self->update_server_info;
1170		1296
1171	if ($self->{cfplus_ext} >= 2) {	1297	if ($self->{cfplus_ext} >= 2) {
1172	$self->send_ext_req ("editor_support", sub {	1298	$self->send_ext_req ("editor_support", sub {
1173	$self->{editor_support} = $_[0];	1299	$self->{editor_support} = { @_ };
1174	$self->update_server_info;	1300	$self->update_server_info;
1175		1301
1176	0	1302	0
1177	});	1303	});
1178	}	1304	}
…		…
1186	$self->send_command ("output-count $::CFG->{output_count}");	1312	$self->send_command ("output-count $::CFG->{output_count}");
1187	$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;
1188	$self->send_command ("pickup $::CFG->{pickup}");	1314	$self->send_command ("pickup $::CFG->{pickup}");
1189	}	1315	}
1190		1316
1191	sub buildat {
1192	my ($self, $builditem, $x, $y) = @_;
1193
1194	if ($self->{cfplus_ext}) {
1195	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1196	}
1197	}
1198
1199	sub lookat {	1317	sub lookat {
1200	my ($self, $x, $y) = @_;	1318	my ($self, $x, $y) = @_;
1201		1319
1202	if ($self->{cfplus_ext}) {	1320	if ($self->{cfplus_ext}) {
1203	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1321	$self->send_ext_req (lookat => $x, $y, sub {
1204	my ($msg) = @_;	1322	my (%msg) = @_;
1205		1323
1206	if (exists $msg->{npc_dialog}) {	1324	if (exists $msg{npc_dialog}) {
1207	# start npc chat dialog	1325	# start npc chat dialog
1208	$self->{npc_dialog} = new CFPlus::NPCDialog::	1326	$self->{npc_dialog} = new CFPlus::NPCDialog::
1209	dx => $x,	1327	token => $msg{npc_dialog},
1210	dy => $y,
1211	title => "$msg->{npc_dialog} (NPC)",	1328	title => "$msg{npc_dialog}[0] (NPC)",
1212	conn => $self,	1329	conn => $self,
1213	;	1330	;
1214	}	1331	}
1215	});	1332	});
1216	}	1333	}
…		…
1281	on_activate => sub { $this->destroy; 1 },	1398	on_activate => sub { $this->destroy; 1 },
1282	;	1399	;
1283		1400
1284	$self->update_options;	1401	$self->update_options;
1285		1402
1286	$self->{id} = $self->{conn}->send_ext_req (	1403	$self->{id} = "npc-channel-" . $self->{conn}->token;
1287	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1404	$self->{conn}->connect_ext ($self->{id} => sub {
1288	sub { $this && $this->feed (@_) }	1405	$this->feed (@_) if $this;
1289	);	1406	});
		1407
		1408	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1290		1409
1291	$self->{entry}->grab_focus;	1410	$self->{entry}->grab_focus;
1292		1411
1293	$self->{textview}->add_paragraph ({	1412	$self->{textview}->add_paragraph ({
1294	fg => [1, 1, 0, 1],	1413	fg => [1, 1, 0, 1],
…		…
1317	);	1436	);
1318	}	1437	}
1319	}	1438	}
1320		1439
1321	sub feed {	1440	sub feed {
1322	my ($self, $msg) = @_;	1441	my ($self, $type, @arg) = @_;
1323		1442
1324	CFPlus::weaken $self;	1443	CFPlus::weaken $self;
1325		1444
1326	if ($msg->{msgtype} eq "reply") {	1445	if ($type eq "update") {
		1446	my (%info) = @arg;
		1447
1327	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1448	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1328	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1449	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1329
1330	my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1331	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1332	my @link;
1333	$text =~ s{
1334	($match)
1335	}{
1336	my $kw = $1;
1337
1338	push @link, new CFPlus::UI::Label
1339	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1340	can_hover => 1,
1341	can_events => 1,
1342	padding_x => 0,
1343	padding_y => 0,
1344	on_button_up => sub {
1345	$self->send ($kw);
1346	};
1347
1348	"\x{fffc}"
1349	}giex;
1350		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
1351	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1473	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1352	$self->{textview}->scroll_to_bottom;	1474	$self->{textview}->scroll_to_bottom;
		1475	}
		1476
1353	$self->update_options;	1477	$self->update_options;
1354	} else {	1478	} else {
1355	$self->destroy;	1479	$self->destroy;
1356	}	1480	}
1357		1481
…		…
1362	my ($self, $msg) = @_;	1486	my ($self, $msg) = @_;
1363		1487
1364	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1488	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1365	$self->{textview}->scroll_to_bottom;	1489	$self->{textview}->scroll_to_bottom;
1366		1490
1367	$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);
1368	}	1492	}
1369		1493
1370	sub destroy {	1494	sub destroy {
1371	my ($self) = @_;	1495	my ($self) = @_;
1372		1496
1373	#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
1374		1498
1375	if ($self->{conn}) {	1499	if ($self->{conn}) {
1376	$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};
1377	delete $self->{conn}{npc_dialog};	1501	delete $self->{conn}{npc_dialog};
1378	$self->{conn}->disconnect_ext ($self->{id});	1502	$self->{conn}->disconnect_ext ($self->{id});
1379	}	1503	}
1380		1504
1381	$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.125 by root, Sat Jul 21 15:04:27 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.125 by root, Sat Jul 21 15:04:27 2007 UTC vs.
Revision 1.160 by root, Tue Aug 21 22:46:50 2007 UTC