[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.163 by root, Wed Aug 22 21:17:32 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
…		…
379	for keys %RES_TBL;	478	for keys %RES_TBL;
380		479
381	my $sktbl = $::STATWIDS->{skill_tbl};	480	my $sktbl = $::STATWIDS->{skill_tbl};
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	my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		484	map [$_, $self->{skill_info}{$_}],
		485	grep exists $stats->{$_},
		486	@skills;
		487
		488	if ($self->{stat_order} ne join ",", map $_->[0], @order) {
		489	$self->{stat_order} = join ",", map $_->[0], @order;
		490
385	$sktbl->clear;	491	$sktbl->clear;
386		492
		493	my $sw = $self->{skillwid}{""} \|\|= [
387	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	494	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
388	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	495	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		496	2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
389	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	497	3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
390	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	498	4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
391	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	499	5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		500	6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
392	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	501	7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		502	];
		503
		504	my @add = @$sw;
393		505
394	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	506	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
395		507
396	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	508	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);	509	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
398		510
399	my ($x, $y) = (0, 1);	511	my ($x, $y) = (0, 1);
400	for (	512	for (@order) {
401	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
402	map [$_, $self->{skill_info}{$_}],
403	grep exists $stats->{$_},
404	@skills
405	) {
406	my ($idx, $name) = @$_;	513	my ($idx, $name) = @$_;
407		514
408	my $spell_cb = sub {	515	my $spell_cb = sub {
409	my ($widget, $ev) = @_;	516	my ($widget, $ev) = @_;
410		517
…		…
425	}	532	}
426		533
427	1	534	1
428	};	535	};
429		536
430	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	537	my $sw = $self->{skillwid}{$idx} \|\|= [
		538	# exp
		539	(new CFPlus::UI::Label
431	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	540	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	541
		542	# level
		543	(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);	544	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		545
		546	# progress
		547	(new CFPlus::UI::ExperienceProgress),
		548
		549	# label
434	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	550	(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);	551	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		552	];
		553
		554	push @add,
		555	$x * 4 + 0, $y, $sw->[0],
		556	$x * 4 + 1, $y, $sw->[1],
		557	$x * 4 + 2, $y, $sw->[2],
		558	$x * 4 + 3, $y, $sw->[3],
		559	;
436		560
437	$x++ and ($x, $y) = (0, $y + 1);	561	$x++ and ($x, $y) = (0, $y + 1);
438	}	562	}
439	}
440		563
441	for (grep exists $stats->{$_}, @skills) {	564	$sktbl->add_at (@add);
442	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	565	}
443	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	566
		567	for (@order) {
		568	my ($idx, $name) = @$_;
		569	my $val = $stats->{$idx};
		570
		571	next if $prev->{$idx}[1] == $val->[1];
		572
		573	my $sw = $self->{skillwid}{$idx};
		574	$sw->[0]->set_text (::formsep ($val->[1]));
		575	$sw->[1]->set_text ($val->[0] * 1);
		576	$sw->[2]->set_value (@$val);
		577
		578	#$::GAUGES->{sklprg}->set_label ($name);
		579	$::GAUGES->{sklprg}->set_value (@$val);
444	}	580	}
445	}	581	}
446		582
447	sub macro_send {	583	sub macro_send {
448	my ($self, $macro) = @_;	584	my ($self, $macro) = @_;
…		…
476	}	612	}
477		613
478	sub feed_map1a {	614	sub feed_map1a {
479	my ($self, $data) = @_;	615	my ($self, $data) = @_;
480		616
481	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	617	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		618	my $delay;
		619
		620	for my $tile (@$missing) {
		621	next if $self->{delay}{$tile};
		622
		623	$delay = 1;
		624
		625	if (my $tex = $::CONN->{texture}[$tile]) {
		626	$tex->upload;
		627	} else {
		628	$self->{delay}{$tile} = 1;
		629
		630	# we assume the face is in-flight and will eventually come
		631	push @{$self->{tile_cb}{$tile}}, sub {
		632	delete $self->{delay}{$tile};
		633	$_[0]->upload;
		634	};
		635	}
		636	}
		637
		638	if ($delay) {
		639	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		640	Event->timer (after => 0.03, cb => sub {
		641	$_[0]->w->cancel;
		642	$self->{map_widget}->update
		643	if $self->{map_widget};
		644	});
		645	} else {
482	$self->{map_widget}->update;	646	$self->{map_widget}->update;
		647	}
483	}	648	}
484		649
485	sub magicmap {	650	sub magicmap {
486	my ($self, $w, $h, $x, $y, $data) = @_;	651	my ($self, $w, $h, $x, $y, $data) = @_;
487		652
…		…
494	my $map_info = delete $self->{map_info}	659	my $map_info = delete $self->{map_info}
495	or return;	660	or return;
496		661
497	my ($hash, $x, $y, $w, $h) = @$map_info;	662	my ($hash, $x, $y, $w, $h) = @$map_info;
498		663
499	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	664	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
		665	$self->{map_cache_new}{$hash} = \$data;
500	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	666	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
501	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
502	}	667	}
503		668
504	sub map_clear {	669	sub map_clear {
505	my ($self) = @_;	670	my ($self) = @_;
506		671
…		…
512	}	677	}
513		678
514	sub bg_fetch {	679	sub bg_fetch {
515	my ($self) = @_;	680	my ($self) = @_;
516		681
517	my $id;	682	my $tile;
518		683
519	do {	684	do {
520	$id = pop @{$self->{bg_fetch}}	685	$tile = pop @{$self->{bg_fetch}}
521	or return;	686	or return;
522	} while $self->{texture}[$id];	687	} while $self->{texture}[$tile];
523		688
524	CFPlus::DB::get tilecache => $id, sub {	689	CFPlus::DB::get tilecache => $tile, sub {
525	my ($data) = @_;	690	my ($data) = @_;
526		691
527	return unless $self->{map}; # stop when destroyed	692	return unless $self->{map}; # stop when destroyed
528		693
529	$self->set_texture ($id => $data)
530	if defined $data;	694	if (defined $data) {
		695	$self->have_tile ($tile, $data);
		696	$self->{texture}[$tile]->upload;
		697	}
531		698
532	$self->bg_fetch;	699	$self->bg_fetch;
533	};	700	};
534	}	701	}
535		702
536	sub load_map($$$) {	703	sub load_map($$$) {
537	my ($self, $hash, $x, $y) = @_;	704	my ($self, $hash, $x, $y) = @_;
538		705
539	my $gen = $self->{map_change_gen};	706	my $gen = $self->{map_change_gen};
540		707
541	CFPlus::DB::get $self->{mapcache} => $hash, sub {	708	my $cb = sub {
542	return unless $gen == $self->{map_change_gen};	709	return unless $gen == $self->{map_change_gen};
543		710
544	my ($data) = @_;	711	my ($data) = @_;
545		712
546	if (defined $data) {	713	if (defined $data) {
		714	$self->{map_cache_new}{$hash} = \$data;
		715
547	$data = Compress::LZF::decompress $data;	716	my $data = Compress::LZF::decompress $data;
548	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
549		717
550	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	718	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
551	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	719	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
552	$self->bg_fetch unless $inprogress;	720	$self->bg_fetch unless $inprogress;
553	}	721	}
554	};	722	};
		723
		724	if (my $rdata = $self->{map_cache_old}{$hash}) {
		725	$cb->($$rdata);
		726	} else {
		727	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
		728	}
555	}	729	}
556		730
557	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	731	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
558	# (server resource,s latency, bandwidth), so this hack is warranted.	732	# (server resource,s latency, bandwidth), so this hack is warranted.
559	# the right fix is to make real tiled maps with an overview file	733	# the right fix is to make real tiled maps with an overview file
…		…
652	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	826	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
653		827
654	$self->flush_map;	828	$self->flush_map;
655		829
656	++$self->{map_change_gen};	830	++$self->{map_change_gen};
		831	$self->{map_cache_old} = delete $self->{map_cache_new};
657		832
658	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	833	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
659		834
660	my $mapmapw = $self->{mapmap}->{w};	835	my $mapmapw = $self->{mapmap}->{w};
661	my $mapmaph = $self->{mapmap}->{h};	836	my $mapmaph = $self->{mapmap}->{h};
…		…
680	}	855	}
681		856
682	sub face_find {	857	sub face_find {
683	my ($self, $facenum, $face, $cb) = @_;	858	my ($self, $facenum, $face, $cb) = @_;
684		859
685	my $hash = "$face->{chksum},$face->{name}";	860	if ($face->{type} == 0) { # FT_FACE
686
687	my $id = CFPlus::DB::get_tile_id_sync $hash;	861	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
688		862
689	$face->{id} = $id;	863	$face->{id} = $id;
690	$self->{faceid}[$facenum] = $id;
691
692	$self->{map}->set_tileid ($facenum => $id);	864	$self->{map}->set_tileid ($facenum => $id);
693		865
694	CFPlus::DB::get tilecache => $id, $cb;	866	CFPlus::DB::get tilecache => $id, $cb;
		867
		868	} elsif ($face->{type} & 1) { # with metadata
		869	CFPlus::DB::get res_meta => $face->{name}, $cb;
		870
		871	} else { # no metadata
		872	CFPlus::DB::get res_data => $face->{name}, $cb;
		873	}
695	}	874	}
696		875
697	sub face_update {	876	sub face_update {
698	my ($self, $facenum, $face, $changed) = @_;	877	my ($self, $facenum, $face, $changed) = @_;
699		878
		879	if ($face->{type} == 0) {
		880	# image, FT_FACE
700	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	881	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
701	if $changed;	882	if $changed;
702		883
703	$self->set_texture ($face->{id} => delete $face->{image});	884	$self->have_tile ($face->{id}, delete $face->{data});
		885
		886	} elsif ($face->{type} & 1) {
		887	# split metadata case, FT_MUSIC, FT_SOUND
		888	if ($changed) { # new data
		889	my ($meta, $data) = unpack "(w/a)", $face->{data};
		890	$face->{data} = $meta;
		891
		892	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		893	CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
		894	}
		895
		896	$face->{data} = $self->{json_coder}->decode ($face->{data});
		897
		898	::add_license ($face);
		899
		900	if ($face->{type} == 3) { # FT_MUSIC
		901	::message ({ markup => "downloaded song #$facenum" })
		902	if $changed;
		903
		904	&::audio_music_push ($facenum);
		905	} elsif ($face->{type} == 5) { # FT_SOUND
		906	::message ({ markup => "downloaded sound #$facenum" })
		907	if $changed;
		908
		909	&::audio_sound_push ($facenum);
		910	}
		911
		912	} else {
		913	# flat resource case, FT_RSRC
		914	CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
		915	if $changed;
		916	}
		917
		918	if (my $cbs = $self->{face_cb}{$facenum}) {
		919	$_->($face, $changed) for @$cbs;
		920	}
704	}	921	}
705		922
706	sub smooth_update {	923	sub smooth_update {
707	my ($self, $facenum, $face) = @_;	924	my ($self, $facenum, $face) = @_;
708		925
709	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	926	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
710	}	927	}
711		928
712	sub set_texture {	929	sub have_tile {
713	my ($self, $id, $data) = @_;	930	my ($self, $tile, $data) = @_;
714		931
715	$self->{texture}[$id] = my $tex =	932	return unless $self->{map};
		933
		934	my $tex = $self->{texture}[$tile] \|\|=
716	new_from_image CFPlus::Texture	935	new CFPlus::Texture
		936	tile => $tile,
		937	image => $data, delete_image => 1,
717	$data, minify => 1, mipmap => 1;	938	minify => 1, mipmap => 1;
718		939
719	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	940	if (my $cbs = delete $self->{tile_cb}{$tile}) {
720	$self->{map_widget}->update;	941	$_->($tex) for @$cbs;
		942	}
		943	}
		944
		945	# call in non-void context registers a temporary
		946	# hook with handle, otherwise its permanent
		947	sub on_face_change {
		948	my ($self, $num, $cb) = @_;
		949
		950	push @{$self->{face_cb}{$num}}, $cb;
		951
		952	defined wantarray
		953	? CFPlus::guard {
		954	@{$self->{face_cb}{$num}}
		955	= grep $_ != $cb,
		956	@{$self->{face_cb}{$num}};
		957	}
		958	: ()
		959	}
		960
		961	# call in non-void context registers a temporary
		962	# hook with handle, otherwise its permanent
		963	sub register_face_handler {
		964	my ($self, $num, $cb) = @_;
		965
		966	return unless $num;
		967
		968	# invoke if available right now
		969	$cb->($self->{face}[$num], 0)
		970	unless exists $self->{face}[$num]{loading};
		971
		972	# future changes
		973	$self->on_face_change ($num => $cb)
721	}	974	}
722		975
723	sub sound_play {	976	sub sound_play {
724	my ($self, $x, $y, $soundnum, $type) = @_;	977	my ($self, $type, $face, $dx, $dy, $vol) = @_;
725		978
726	$self->{sound_play}->($x, $y, $soundnum, $type);	979	&::audio_sound_play ($face, $dx, $dy, $vol)
		980	unless $type & 1; # odd types are silent for future expansion
727	}	981	}
728		982
729	my $LAST_QUERY; # server is stupid, stupid, stupid	983	my $LAST_QUERY; # server is stupid, stupid, stupid
730		984
731	sub query {	985	sub query {
…		…
796	$self->{$type} = $text;	1050	$self->{$type} = $text;
797	} else {	1051	} else {
798	$self->logprint ("msg: ", $text);	1052	$self->logprint ("msg: ", $text);
799	return if $color < 0; # negative color == ignore if not understood	1053	return if $color < 0; # negative color == ignore if not understood
800		1054
801	my $fg = $CF_COLOR[$color % @CF_COLOR];	1055	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
802		1056
803	## try to create single paragraphs of multiple lines sent by the server	1057	## try to create single paragraphs of multiple lines sent by the server
804	# no longer neecssary with TRT servers	1058	# no longer neecssary with TRT servers
805	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1059	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
806		1060
807	::message ({ fg => $fg, markup => $_ })	1061	::message ({
		1062	fg => $fg,
		1063	markup => $_,
		1064	type => $type,
		1065	extra => [@extra],
		1066	color_flags => $color
808	for split /\n/, $text;	1067	}) for split /\n/, $text;
809		1068
810	$self->{statusbox}->add ($text,	1069	$self->{statusbox}->add ($text,
811	group => $text,	1070	group => $text,
812	fg => $fg,	1071	fg => $fg,
813	timeout => $color >= 2 ? 180 : 10,	1072	timeout => $color >= 2 ? 180 : 10,
…		…
869	$self->{map_widget}->clr_commands;	1128	$self->{map_widget}->clr_commands;
870		1129
871	::stop_game ();	1130	::stop_game ();
872	}	1131	}
873		1132
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 {	1133	sub update_floorbox {
909	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1134	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
910	return unless $::CONN;	1135	return unless $::CONN;
911		1136
912	$::FLOORBOX->clear;	1137	$::FLOORBOX->clear;
		1138
		1139	my @add;
913		1140
914	my $row;	1141	my $row;
915	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	1142	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
916	if ($row < 6) {	1143	if ($row < 6) {
917	local $_->{face_widget}; # hack to force recreation of widget	1144	local $_->{face_widget}; # hack to force recreation of widget
918	local $_->{desc_widget}; # hack to force recreation of widget	1145	local $_->{desc_widget}; # hack to force recreation of widget
919	CFPlus::Item::update_widgets $_;	1146	CFPlus::Item::update_widgets $_;
920		1147
		1148	push @add,
921	$::FLOORBOX->add (0, $row, $_->{face_widget});	1149	0, $row, $_->{face_widget},
922	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1150	1, $row, $_->{desc_widget};
923		1151
924	$row++;	1152	$row++;
925	} else {	1153	} else {
926	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1154	push @add, 1, $row, new CFPlus::UI::Button
927	text => "More...",	1155	text => "More...",
928	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1156	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
929	);	1157	;
930	last;	1158	last;
931	}	1159	}
932	}	1160	}
933	if ($::CONN->{open_container}) {	1161	if ($::CONN->{open_container}) {
934	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1162	push @add, 1, $row++, new CFPlus::UI::Button
935	text => "Close container",	1163	text => "Close container",
936	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1164	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
937	);	1165	;
938	}	1166	}
		1167
		1168	$::FLOORBOX->add_at (@add);
939	});	1169	});
940		1170
941	$::WANT_REFRESH++;	1171	$::WANT_REFRESH->start;
942	}	1172	}
943		1173
944	sub set_opencont {	1174	sub set_opencont {
945	my ($conn, $tag, $name) = @_;	1175	my ($conn, $tag, $name) = @_;
946	$conn->{open_container} = $tag;	1176	$conn->{open_container} = $tag;
947	update_floorbox;	1177	update_floorbox;
948		1178
949	$::INV_RIGHT_HB->clear ();	1179	$::INVR_HB->clear ();
950	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1180	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
951		1181
952	if ($tag != 0) { # Floor isn't closable, is it?	1182	if ($tag != 0) { # Floor isn't closable, is it?
953	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1183	$::INVR_HB->add (new CFPlus::UI::Button
954	text => "Close container",	1184	text => "Close container",
955	tooltip => "Close the currently open container (if one is open)",	1185	tooltip => "Close the currently open container (if one is open)",
956	on_activate => sub {	1186	on_activate => sub {
957	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1187	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
958	if $tag != 0;	1188	if $tag != 0;
959	#if $CONN->{open_container} != 0;
960	0	1189	0
961	},	1190	},
962	);	1191	);
963	}	1192	}
964		1193
…		…
1063	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1292	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1064	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1293	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1065	. "map size $self->{mapw}×$self->{maph}\n"	1294	. "map size $self->{mapw}×$self->{maph}\n"
1066	);	1295	);
1067		1296
1068	::setup_build_button ($self->{editor_support}->{builder_ui});
1069	}	1297	}
1070		1298
1071	sub logged_in {	1299	sub logged_in {
1072	my ($self) = @_;	1300	my ($self) = @_;
1073		1301
1074	$self->send_ext_req (cfplus_support => version => 1, sub {	1302	$self->send_ext_req (cfplus_support => version => 2, sub {
		1303	my (%msg) = @_;
		1304
1075	$self->{cfplus_ext} = $_[0]{version};	1305	$self->{cfplus_ext} = $msg{version};
1076	$self->update_server_info;	1306	$self->update_server_info;
1077		1307
1078	if ($self->{cfplus_ext} >= 2) {	1308	if ($self->{cfplus_ext} >= 2) {
1079	$self->send_ext_req ("editor_support", sub {	1309	$self->send_ext_req ("editor_support", sub {
1080	$self->{editor_support} = $_[0];	1310	$self->{editor_support} = { @_ };
1081	$self->update_server_info;	1311	$self->update_server_info;
1082		1312
1083	0	1313	0
1084	});	1314	});
1085	}	1315	}
…		…
1093	$self->send_command ("output-count $::CFG->{output_count}");	1323	$self->send_command ("output-count $::CFG->{output_count}");
1094	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1324	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1095	$self->send_command ("pickup $::CFG->{pickup}");	1325	$self->send_command ("pickup $::CFG->{pickup}");
1096	}	1326	}
1097		1327
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 {	1328	sub lookat {
1107	my ($self, $x, $y) = @_;	1329	my ($self, $x, $y) = @_;
1108		1330
1109	if ($self->{cfplus_ext}) {	1331	if ($self->{cfplus_ext}) {
1110	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1332	$self->send_ext_req (lookat => $x, $y, sub {
1111	my ($msg) = @_;	1333	my (%msg) = @_;
1112		1334
1113	if (exists $msg->{npc_dialog}) {	1335	if (exists $msg{npc_dialog}) {
1114	# start npc chat dialog	1336	# start npc chat dialog
1115	$self->{npc_dialog} = new CFPlus::NPCDialog::	1337	$self->{npc_dialog} = new CFPlus::NPCDialog::
1116	dx => $x,	1338	token => $msg{npc_dialog},
1117	dy => $y,
1118	title => "$msg->{npc_dialog} (NPC)",	1339	title => "$msg{npc_dialog}[0] (NPC)",
1119	conn => $self,	1340	conn => $self,
1120	;	1341	;
1121	}	1342	}
1122	});	1343	});
1123	}	1344	}
…		…
1130		1351
1131	(delete $self->{npc_dialog})->destroy	1352	(delete $self->{npc_dialog})->destroy
1132	if $self->{npc_dialog};	1353	if $self->{npc_dialog};
1133		1354
1134	$self->SUPER::destroy;	1355	$self->SUPER::destroy;
		1356
		1357	%$self = ();
1135	}	1358	}
1136		1359
1137	package CFPlus::NPCDialog;	1360	package CFPlus::NPCDialog;
1138		1361
1139	our @ISA = 'CFPlus::UI::Toplevel';	1362	our @ISA = 'CFPlus::UI::Toplevel';
…		…
1186	on_activate => sub { $this->destroy; 1 },	1409	on_activate => sub { $this->destroy; 1 },
1187	;	1410	;
1188		1411
1189	$self->update_options;	1412	$self->update_options;
1190		1413
1191	$self->{id} = $self->{conn}->send_ext_req (	1414	$self->{id} = "npc-channel-" . $self->{conn}->token;
1192	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1415	$self->{conn}->connect_ext ($self->{id} => sub {
1193	sub { $this && $this->feed (@_) }	1416	$this->feed (@_) if $this;
1194	);	1417	});
		1418
		1419	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1195		1420
1196	$self->{entry}->grab_focus;	1421	$self->{entry}->grab_focus;
1197		1422
1198	$self->{textview}->add_paragraph ({	1423	$self->{textview}->add_paragraph ({
1199	fg => [1, 1, 0, 1],	1424	fg => [1, 1, 0, 1],
…		…
1222	);	1447	);
1223	}	1448	}
1224	}	1449	}
1225		1450
1226	sub feed {	1451	sub feed {
1227	my ($self, $msg) = @_;	1452	my ($self, $type, @arg) = @_;
1228		1453
1229	CFPlus::weaken $self;	1454	CFPlus::weaken $self;
1230		1455
1231	if ($msg->{msgtype} eq "reply") {	1456	if ($type eq "update") {
		1457	my (%info) = @arg;
		1458
1232	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1459	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1233	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1460	$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		1461
		1462	if (exists $info{msg}) {
		1463	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1464	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1465	my @link;
		1466	$text =~ s{
		1467	($match)
		1468	}{
		1469	my $kw = $1;
		1470
		1471	push @link, new CFPlus::UI::Label
		1472	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1473	can_hover => 1,
		1474	can_events => 1,
		1475	padding_x => 0,
		1476	padding_y => 0,
		1477	on_button_up => sub {
		1478	$self->send ($kw);
		1479	};
		1480
		1481	"\x{fffc}"
		1482	}giex;
		1483
1256	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1484	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1257	$self->{textview}->scroll_to_bottom;	1485	$self->{textview}->scroll_to_bottom;
		1486	}
		1487
1258	$self->update_options;	1488	$self->update_options;
1259	} else {	1489	} else {
1260	$self->destroy;	1490	$self->destroy;
1261	}	1491	}
1262		1492
…		…
1267	my ($self, $msg) = @_;	1497	my ($self, $msg) = @_;
1268		1498
1269	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1499	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1270	$self->{textview}->scroll_to_bottom;	1500	$self->{textview}->scroll_to_bottom;
1271		1501
1272	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1502	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1273	}	1503	}
1274		1504
1275	sub destroy {	1505	sub destroy {
1276	my ($self) = @_;	1506	my ($self) = @_;
1277		1507
1278	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1508	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1279		1509
1280	if ($self->{conn}) {	1510	if ($self->{conn}) {
1281	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1511	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1282	delete $self->{conn}{npc_dialog};	1512	delete $self->{conn}{npc_dialog};
1283	$self->{conn}->disconnect_ext ($self->{id});	1513	$self->{conn}->disconnect_ext ($self->{id});
1284	}	1514	}
1285		1515
1286	$self->SUPER::destroy;	1516	$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.163 by root, Wed Aug 22 21:17:32 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.163 by root, Wed Aug 22 21:17:32 2007 UTC