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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.5 by elmex, Sat May 27 10:32:35 2006 UTC vs.
Revision 1.88 by root, Sun Nov 19 20:31:29 2006 UTC

…		…
1	package CFClient::Protocol;	1	package CFPlus::Protocol;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Crossfire::Protocol::Constants;	6	use Crossfire::Protocol::Constants;
7		7
		8	use CFPlus;
8	use CFClient::UI;	9	use CFPlus::UI;
		10	use CFPlus::Pod;
		11
		12	use Crossfire::Protocol::Base 0.95;
9		13
10	use base 'Crossfire::Protocol::Base';	14	use base 'Crossfire::Protocol::Base';
11		15
12	sub new {	16	sub new {
13	my $class = shift;	17	my $class = shift;
14		18
15	my $self = $class->SUPER::new (@_);	19	my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
16		20
17	$self->{map_widget}->clr_commands;	21	$self->{map_widget}->clr_commands;
18		22
19	my $parser = new Pod::POM;	23	my @cmd_help = map {
20	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
21
22	for my $head2 ($pod->head1->[-2]->head2) {
23	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	24	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
24	or next;	25	or die "unparseable command help: $_->{kw}[0]";
25		26
26	my $cmd = $1;	27	my $cmd = $1;
27	my @args = split /\\|/, $2;	28	my @args = split /\\|/, $2;
28	@args = (".*") unless @args;	29	@args = (".*") unless @args;
29		30
30	my $text = CFClient::pod_to_pango $head2->content;	31	my (undef, @par) = CFPlus::Pod::section_of $_;
		32	my $text = CFPlus::Pod::as_label @par;
31		33
32	for my $arg (@args) {
33	$arg = $arg eq ".*" ? "" : " $arg";	34	$_ = $_ eq ".*" ? "" : " $_"
		35	for @args;
34		36
35	$self->{map_widget}->add_command ("$cmd$arg", $text);	37	map ["$cmd$_", $text],
36	}	38	sort { (length $a) <=> (length $b) }
37	}	39	@args
		40	} sort { $a->{par} <=> $b->{par} }
		41	CFPlus::Pod::find command => "*";
38		42
		43	$self->{map_widget}->add_command (@$_)
		44	for @cmd_help;
		45
39	$self->{noface} = new_from_file CFClient::Texture	46	$self->{noface} = new_from_file CFPlus::Texture
40	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;	47	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		48
		49	{
		50	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
		51	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
		52	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		53	}
41		54
42	$self->{open_container} = 0;	55	$self->{open_container} = 0;
43		56
44	# "global"	57	# "global"
45	$self->{tilecache} = CFClient::db_table "tilecache";	58	$self->{tilecache} = CFPlus::db_table "tilecache"
		59	or die "tilecache: unable to open database table";
46	$self->{facemap} = CFClient::db_table "facemap";	60	$self->{facemap} = CFPlus::db_table "facemap"
		61	or die "facemap: unable to open database table";
47		62
48	# per server	63	# per server
49	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";	64	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
		65	or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
50		66
51	$self	67	$self
52	}	68	}
		69
		70	sub logprint {
		71	my ($self, @a) = @_;
		72
		73	$self->{log_fh} \|\|= do {
		74	my $path = "$Crossfire::VARDIR/log.$self->{host}";
		75
		76	open my $fh, ">>:utf8", $path
		77	or die "Couldn't open logfile $path: $!";
		78
		79	$fh->autoflush (1);
		80
		81	$fh;
		82	};
		83
		84	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
		85
		86	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
		87	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
		88
		89	print {$self->{log_fh}} "$ts ", @a, "\n";
		90	}
		91
		92	sub _stat_numdiff {
		93	my ($self, $name, $old, $new) = @_;
		94
		95	my $diff = $new - $old;
		96
		97	$diff = 0.01 * int $diff * 100;
		98
		99	0.1 >= abs $diff ? ()
		100	: $diff < 0 ? "$name$diff" : "$name+$diff"
		101	}
		102
		103	sub _stat_skillmaskdiff {
		104	my ($self, $name, $old, $new) = @_;
		105
		106	my $diff = $old ^ $new
		107	or return;
		108
		109	my @diff = map
		110	{
		111	$diff & $_
		112	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
		113	: ()
		114	}
		115	sort { $a <=> $b } keys %{$self->{spell_paths}};
		116
		117	join "", @diff
		118	}
		119
		120	# all stats that are chacked against changes
		121	my @statchange = (
		122	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
		123	[&CS_STAT_INT => \&_stat_numdiff, "Int"],
		124	[&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
		125	[&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
		126	[&CS_STAT_CON => \&_stat_numdiff, "Con"],
		127	[&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
		128	[&CS_STAT_POW => \&_stat_numdiff, "Pow"],
		129	[&CS_STAT_WC => \&_stat_numdiff, "Wc"],
		130	[&CS_STAT_AC => \&_stat_numdiff, "Ac"],
		131	[&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
		132	[&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
		133	[&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
		134	[&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
		135	[&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
		136	[&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
		137	[&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
		138	[&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
		139	[&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
		140	[&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
		141	[&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
		142	[&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
		143	[&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
		144	[&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
		145	[&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
		146	[&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
		147	[&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
		148	[&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
		149	[&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
		150	[&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
		151	[&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
		152	[&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
		153	[&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
		154	[&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
		155	[&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
		156	[&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
		157	[&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
		158	[&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
		159	);
53		160
54	sub stats_update {	161	sub stats_update {
55	my ($self, $stats) = @_;	162	my ($self, $stats) = @_;
56		163
57	if (my $exp = $stats->{+CS_STAT_EXP64}) {	164	my $prev = $self->{prev_stats} \|\| { };
58	my $diff = $exp - $self->{prev_exp};	165
		166	if (my @diffs =
		167	(
		168	($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
		169	map {
		170	$stats->{$_} && $prev->{$_}
		171	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
		172	} sort { $a <=> $b } keys %{$self->{skill_info}}
		173	)
		174	) {
		175	my $msg = join " ", @diffs;
59	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)	176	$self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
60	if exists $self->{prev_exp} && $diff;
61	$self->{prev_exp} = $exp;
62	}	177	}
63		178
		179	if (
		180	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
		181	) {
		182	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
		183	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
		184	}
		185
64	::update_stats_window ($stats);	186	$self->update_stats_window ($stats, $prev);
		187
		188	$self->{prev_stats} = { %$stats };
		189	}
		190
		191	my %RES_TBL = (
		192	phys => CS_STAT_RES_PHYS,
		193	magic => CS_STAT_RES_MAG,
		194	fire => CS_STAT_RES_FIRE,
		195	elec => CS_STAT_RES_ELEC,
		196	cold => CS_STAT_RES_COLD,
		197	conf => CS_STAT_RES_CONF,
		198	acid => CS_STAT_RES_ACID,
		199	drain => CS_STAT_RES_DRAIN,
		200	ghit => CS_STAT_RES_GHOSTHIT,
		201	pois => CS_STAT_RES_POISON,
		202	slow => CS_STAT_RES_SLOW,
		203	para => CS_STAT_RES_PARA,
		204	tund => CS_STAT_TURN_UNDEAD,
		205	fear => CS_STAT_RES_FEAR,
		206	depl => CS_STAT_RES_DEPLETE,
		207	deat => CS_STAT_RES_DEATH,
		208	holyw => CS_STAT_RES_HOLYWORD,
		209	blind => CS_STAT_RES_BLIND,
		210	);
		211
		212	sub update_stats_window {
		213	my ($self, $stats, $prev) = @_;
		214
		215	# I love text protocols...
		216
		217	my $hp = $stats->{+CS_STAT_HP} * 1;
		218	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
		219	my $sp = $stats->{+CS_STAT_SP} * 1;
		220	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
		221	my $fo = $stats->{+CS_STAT_FOOD} * 1;
		222	my $fo_m = 999;
		223	my $gr = $stats->{+CS_STAT_GRACE} * 1;
		224	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
		225
		226	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
		227	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
		228	$::GAUGES->{food} ->set_value ($fo, $fo_m);
		229	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
		230	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
		231	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		232	my $rng = $stats->{+CS_STAT_RANGE};
		233	$rng =~ s/^Range: //; # thank you so much dear server
		234	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
		235	my $title = $stats->{+CS_STAT_TITLE};
		236	$title =~ s/^Player: //;
		237	$::STATWIDS->{title} ->set_text ("Title: " . $title);
		238
		239	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
		240	$::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
		241	$::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
		242	$::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
		243	$::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
		244	$::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
		245	$::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
		246	$::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
		247	$::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
		248	$::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
		249	$::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
		250	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
		251	$::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
		252
		253	$self->update_weight;
		254
		255	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
		256	for keys %RES_TBL;
		257
		258	my $sktbl = $::STATWIDS->{skill_tbl};
		259	my @skills = keys %{ $self->{skill_info} };
		260
		261	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
		262	$sktbl->clear;
		263
		264	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
		265	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
		266	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
		267	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
		268	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
		269	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
		270
		271	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
		272
		273	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		274	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		275
		276	my ($x, $y) = (0, 1);
		277	for (
		278	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		279	map [$_, $self->{skill_info}{$_}],
		280	grep exists $stats->{$_},
		281	@skills
		282	) {
		283	my ($idx, $name) = @$_;
		284
		285	my $spell_cb = sub {
		286	my ($widget, $ev) = @_;
		287
		288	if ($ev->{button} == 1) {
		289	$::CONN->user_send ("ready_skill $name");
		290	} elsif ($ev->{button} == 2) {
		291	$::CONN->user_send ("use_skill $name");
		292	} elsif ($ev->{button} == 3) {
		293	(new CFPlus::UI::Menu
		294	items => [
		295	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
		296	["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
		297	],
		298	)->popup ($ev);
		299	} else {
		300	return 0;
		301	}
		302
		303	1
		304	};
		305
		306	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
		307	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
		308	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
		309	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
		310	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
		311	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
		312
		313	$x++ and ($x, $y) = (0, $y + 1);
		314	}
		315	}
		316
		317	for (grep exists $stats->{$_}, @skills) {
		318	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
		319	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
		320	}
65	}	321	}
66		322
67	sub user_send {	323	sub user_send {
68	my ($self, $command) = @_;	324	my ($self, $command) = @_;
69		325
		326	push @{$self->{record}}, $command
		327	if $self->{record};
		328
		329	$self->logprint ("send: ", $command);
70	$self->send_command ($command);	330	$self->send_command ($command);
71	::status $command;	331	::status ($command);
		332	}
		333
		334	sub start_record {
		335	my ($self) = @_;
		336
		337	$self->{record} = [];
		338	}
		339
		340	sub stop_record {
		341	my ($self) = @_;
		342	return delete $self->{record};
72	}	343	}
73		344
74	sub map_scroll {	345	sub map_scroll {
75	my ($self, $dx, $dy) = @_;	346	my ($self, $dx, $dy) = @_;
76		347
78	}	349	}
79		350
80	sub feed_map1a {	351	sub feed_map1a {
81	my ($self, $data) = @_;	352	my ($self, $data) = @_;
82		353
83	$self->{map}->map1a_update ($data);	354	$self->{map}->map1a_update ($data, $self->{setup}{extmap});
84	$self->{map_widget}->update;	355	$self->{map_widget}->update;
		356	}
		357
		358	sub magicmap {
		359	my ($self, $w, $h, $x, $y, $data) = @_;
		360
		361	$self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
85	}	362	}
86		363
87	sub flush_map {	364	sub flush_map {
88	my ($self) = @_;	365	my ($self) = @_;
89		366
…		…
102		379
103	$self->flush_map;	380	$self->flush_map;
104	delete $self->{neigh_map};	381	delete $self->{neigh_map};
105		382
106	$self->{map}->clear;	383	$self->{map}->clear;
		384	delete $self->{map_widget}{magicmap};
107	}	385	}
108		386
109		387
110	sub load_map($$$) {	388	sub load_map($$$) {
111	my ($self, $hash, $x, $y) = @_;	389	my ($self, $hash, $x, $y) = @_;
…		…
251		529
252	unless ($id) {	530	unless ($id) {
253	# create new id for face	531	# create new id for face
254	# I love transactions	532	# I love transactions
255	for (1..100) {	533	for (1..100) {
256	my $txn = $CFClient::DB_ENV->txn_begin;	534	my $txn = $CFPlus::DB_ENV->txn_begin;
257	my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW);	535	my $status = $self->{facemap}->db_get (id => $id);
258	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	536	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
259	$id = ($id \|\| 16) + 1;	537	$id = ($id \|\| 64) + 1;
260	if ($self->{facemap}->put (id => $id) == 0	538	if ($self->{facemap}->put (id => $id) == 0
261	&& $self->{facemap}->put ($hash => $id) == 0) {	539	&& $self->{facemap}->put ($hash => $id) == 0) {
262	$txn->txn_commit;	540	$txn->txn_commit;
263		541
264	goto gotid;	542	goto gotid;
265	}	543	}
266	}	544	}
267	$txn->abort;	545	$txn->txn_abort;
268	}	546	}
269		547
270	CFClient::fatal "maximum number of transaction retries reached - database problems?";	548	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
271	}	549	}
272		550
273	gotid:	551	gotid:
274	$face->{id} = $id;	552	$face->{id} = $id;
275	$self->{map}->set_face ($facenum => $id);	553	$self->{map}->set_face ($facenum => $id);
…		…
286	undef	564	undef
287	};	565	};
288	}	566	}
289		567
290	sub face_update {	568	sub face_update {
291	my ($self, $facenum, $face) = @_;	569	my ($self, $facenum, $face, $changed) = @_;
292		570
293	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes	571	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
294		572
295	$self->set_texture ($face->{id} => delete $face->{image});	573	$self->set_texture ($face->{id} => delete $face->{image});
296	}	574	}
297		575
298	sub set_texture {	576	sub set_texture {
299	my ($self, $id, $data) = @_;	577	my ($self, $id, $data) = @_;
300		578
301	$self->{texture}[$id] \|\|= do {	579	$self->{texture}[$id] \|\|= do {
302	my $tex =	580	my $tex =
303	new_from_image CFClient::Texture	581	new_from_image CFPlus::Texture
304	$data, minify => 1, mipmap => 1;	582	$data, minify => 1, mipmap => 1;
305		583
306	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	584	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
307	$self->{map_widget}->update;	585	$self->{map_widget}->update;
308		586
…		…
322	my ($self, $flags, $prompt) = @_;	600	my ($self, $flags, $prompt) = @_;
323		601
324	$prompt = $LAST_QUERY unless length $prompt;	602	$prompt = $LAST_QUERY unless length $prompt;
325	$LAST_QUERY = $prompt;	603	$LAST_QUERY = $prompt;
326		604
327	my $dialog = new CFClient::UI::FancyFrame	605	$self->{query}-> ($self, $flags, $prompt);
328	title => "Query",
329	child => my $vbox = new CFClient::UI::VBox;
330
331	$vbox->add (new CFClient::UI::Label
332	max_w => $::WIDTH * 0.4,
333	ellipsise => 0,
334	text => $prompt);
335
336	if ($flags & CS_QUERY_YESNO) {
337	$vbox->add (my $hbox = new CFClient::UI::HBox);
338	$hbox->add (new CFClient::UI::Button
339	text => "No",
340	connect_activate => sub {
341	$self->send ("reply n");
342	$dialog->destroy;
343	$self->{map_widget}->focus_in;
344	}
345	);
346	$hbox->add (new CFClient::UI::Button
347	text => "Yes",
348	connect_activate => sub {
349	$self->send ("reply y");
350	$dialog->destroy;
351	},
352	);
353
354	$dialog->focus_in;
355
356	} elsif ($flags & CS_QUERY_SINGLECHAR) {
357	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
358	$vbox->add (my $entry = new CFClient::UI::Entry
359	connect_changed => sub {
360	$self->send ("reply $_[1]");
361	$dialog->destroy;
362	},
363	);
364
365	$entry->focus_in;
366
367	} else {
368	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
369
370	$vbox->add (my $entry = new CFClient::UI::Entry
371	$flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
372	connect_activate => sub {
373	$self->send ("reply $_[1]");
374	$dialog->destroy;
375	},
376	);
377
378	$entry->focus_in;
379	}
380
381	$dialog->show_centered;
382	}	606	}
383		607
384	sub drawinfo {	608	sub drawinfo {
385	my ($self, $color, $text) = @_;	609	my ($self, $color, $text) = @_;
386		610
…		…
393	[0.11, 0.56, 1.00],	617	[0.11, 0.56, 1.00],
394	[0.93, 0.46, 0.00],	618	[0.93, 0.46, 0.00],
395	[0.18, 0.54, 0.34],	619	[0.18, 0.54, 0.34],
396	[0.56, 0.73, 0.56],	620	[0.56, 0.73, 0.56],
397	[0.80, 0.80, 0.80],	621	[0.80, 0.80, 0.80],
398	[0.55, 0.41, 0.13],	622	[0.75, 0.61, 0.20],
399	[0.99, 0.77, 0.26],	623	[0.99, 0.77, 0.26],
400	[0.74, 0.65, 0.41],	624	[0.74, 0.65, 0.41],
401	);	625	);
402		626
403	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	627	$self->logprint ("info: ", $text);
404		628
405	$text = CFClient::UI::Label::escape $text;	629	# try to create single paragraphs of multiple lines sent by the server
		630	$text =~ s/(?<=\S)\n(?=\w)/ /g;
		631
		632	$text = CFPlus::asxml $text;
406	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	633	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
407	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	634	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
408		635
409	$self->{logview}->add_paragraph ($color[$color],	636	::message ({ fg => $color[$color], markup => $_ })
410	join "\n", map "$time $_", split /\n/, $text);	637	for split /\n/, $text;
411		638
412	$self->{statusbox}->add ($text,	639	$self->{statusbox}->add ($text,
413	group => $text,	640	group => $text,
414	fg => $color[$color],	641	fg => $color[$color],
415	timeout => 10,	642	timeout => $color >= 2 ? 180 : 10,
416	tooltip_font => $::FONT_FIXED,	643	tooltip_font => $::FONT_FIXED,
417	);	644	);
418	}	645	}
419		646
420	sub drawextinfo {	647	sub drawextinfo {
…		…
424	}	651	}
425		652
426	sub spell_add {	653	sub spell_add {
427	my ($self, $spell) = @_;	654	my ($self, $spell) = @_;
428		655
429	# TODO	656	# try to create single paragraphs out of the multiple lines sent by the server
430	# create a widget dynamically, using spell face (CF::Protocol downloads them)	657	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
		658	$spell->{message} =~ s/\n+$//;
		659	$spell->{message} \|\|= "Server did not provide a description for this spell.";
		660
		661	$::SPELL_LIST->add_spell ($spell);
		662
431	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	663	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
432	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	664	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
433	}	665	}
434		666
435	sub spell_delete {	667	sub spell_delete {
436	my ($self, $spell) = @_;	668	my ($self, $spell) = @_;
		669
		670	$::SPELL_LIST->remove_spell ($spell);
		671	}
		672
		673	sub setup {
		674	my ($self, $setup) = @_;
		675
		676	$::MAP->resize ($self->{mapw}, $self->{maph});
437	}	677	}
438		678
439	sub addme_success {	679	sub addme_success {
440	my ($self) = @_;	680	my ($self) = @_;
441		681
442	$self->send ("command output-sync $::CFG->{output_sync}");
443	$self->send ("command output-count $::CFG->{output_count}");
444
445	my $parser = new Pod::POM;
446	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
447
448	my %skill_tooltip;	682	my %skill_help;
449		683
450	for my $head2 ($pod->head1->[-2]->head2) {	684	for my $node (CFPlus::Pod::find skill_description => "*") {
451	$skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;	685	my (undef, @par) = CFPlus::Pod::section_of $node;
		686	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
452	}	687	};
453		688
454	for my $skill (values %{$self->{skill_info}}) {	689	for my $skill (values %{$self->{skill_info}}) {
455	$self->{map_widget}->add_command ("ready_skill $skill",	690	$self->{map_widget}->add_command ("ready_skill $skill",
456	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	691	(CFPlus::asxml "Ready the skill '$skill'\n\n")
457	. $skill_tooltip{$skill});	692	. $skill_help{$skill});
458	$self->{map_widget}->add_command ("use_skill $skill",	693	$self->{map_widget}->add_command ("use_skill $skill",
459	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	694	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")
460	. $skill_tooltip{$skill});	695	. $skill_help{$skill});
461	}	696	}
462	}	697	}
463		698
464	sub eof {	699	sub eof {
465	my ($self) = @_;	700	my ($self) = @_;
…		…
489		724
490	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	725	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
491		726
492	$self->send ("requestinfo image_sums $face $face");	727	$self->send ("requestinfo image_sums $face $face");
493		728
494	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	729	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
495	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	730	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
496	} elsif (!exists $self->{num_faces}) {	731	} elsif (!exists $self->{num_faces}) {
497	$self->send ("requestinfo image_info");	732	$self->send ("requestinfo image_info");
498		733
499	$self->{num_faces} = 0;	734	$self->{num_faces} = 0;
500		735
501	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	736	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
502	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	737	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
503	}	738	}
504	}	739	}
505		740
506	sub update_floorbox {	741	sub update_floorbox {
507	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	742	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
508	return unless $::CONN;	743	return unless $::CONN;
509		744
510	$::FLOORBOX->clear;	745	$::FLOORBOX->clear;
511		746
512	my $row;	747	my $row;
513	for (@{ $::CONN->{container}{0} }) {	748	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
514	if ($row < 7) {	749	if ($row < 6) {
515	local $_->{face_widget}; # hack to force recreation of widget	750	local $_->{face_widget}; # hack to force recreation of widget
516	local $_->{desc_widget}; # hack to force recreation of widget	751	local $_->{desc_widget}; # hack to force recreation of widget
517	CFClient::Item::update_widgets $_;	752	CFPlus::Item::update_widgets $_;
518		753
519	$::FLOORBOX->add (0, $row, $_->{face_widget});	754	$::FLOORBOX->add (0, $row, $_->{face_widget});
520	$::FLOORBOX->add (1, $row, $_->{desc_widget});	755	$::FLOORBOX->add (1, $row, $_->{desc_widget});
521		756
522	$row++;	757	$row++;
523	} else {	758	} else {
524	$::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More...");	759	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button
		760	text => "More...",
		761	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
		762	);
525	last;	763	last;
526	}	764	}
527	}	765	}
		766	if ($::CONN->{open_container}) {
		767	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
		768	text => "Close container",
		769	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
		770	);
		771	}
528	});	772	});
529		773
530	$::WANT_REFRESH++;	774	$::WANT_REFRESH++;
531	}	775	}
532		776
533	sub set_opencont {	777	sub set_opencont {
534	my ($conn, $tag, $name) = @_;	778	my ($conn, $tag, $name) = @_;
535	$conn->{open_container} = $tag;	779	$conn->{open_container} = $tag;
536	$::INVR_LBL->set_text ($name);	780	update_floorbox;
		781
		782	$::INV_RIGHT_HB->clear ();
		783	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
		784
		785	if ($tag != 0) { # Floor isn't closable, is it?
		786	$::INV_RIGHT_HB->add (new CFPlus::UI::Button
		787	text => "Close container",
		788	tooltip => "Close the currently open container (if one is open)",
		789	on_activate => sub {
		790	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
		791	if $tag != 0;
		792	#if $CONN->{open_container} != 0;
		793	0
		794	},
		795	);
		796	}
		797
537	$::INVR->set_items ($conn->{container}{$tag});	798	$::INVR->set_items ($conn->{container}{$tag});
538	}	799	}
539		800
540	sub update_container {	801	sub update_containers {
541	my ($tag) = @_;	802	my ($self) = @_;
542		803
543	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	804	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		805	my $todo = delete $self->{update_container}
		806	or return;
		807
		808	for my $tag (keys %$todo) {
		809	update_floorbox if $tag == 0 or $tag == $self->{open_container};
		810	if ($tag == 0) {
		811	$::INVR->set_items ($self->{container}{0})
544	if $tag == $::CONN->{open_container};	812	if $tag == $self->{open_container};
		813	} elsif ($tag == $self->{player}{tag}) {
		814	$::INV->set_items ($self->{container}{$tag})
		815	} else {
		816	$::INVR->set_items ($self->{container}{$tag})
		817	if $tag == $self->{open_container};
		818	}
		819	}
		820	});
545	}	821	}
546		822
547	sub container_add {	823	sub container_add {
548	my ($self, $tag, $items) = @_;	824	my ($self, $tag, $items) = @_;
549		825
550	#d# print "container_add: container $tag ($self->{player}{tag})\n";	826	$self->{update_container}{$tag}++;
551		827	$self->update_containers;
552	if ($tag == 0) {
553	update_floorbox;
554	update_container (0);
555	} elsif ($tag == $self->{player}{tag}) {
556	$::INV->set_items ($self->{container}{$self->{player}{tag}})
557	} else {
558	update_container ($tag);
559	}
560
561	# $self-<{player}{tag} => player inv
562	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
563	}	828	}
564		829
565	sub container_clear {	830	sub container_clear {
566	my ($self, $tag) = @_;	831	my ($self, $tag) = @_;
567		832
568	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	833	$self->{update_container}{$tag}++;
569		834	$self->update_containers;
570	if ($tag == 0) {
571	update_floorbox;
572	update_container (0);
573	} elsif ($tag == $self->{player}{tag}) {
574	$::INV->set_items ($self->{container}{$tag})
575	}
576
577	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
578	}	835	}
579		836
580	sub item_delete {	837	sub item_delete {
581	my ($self, @items) = @_;	838	my ($self, @items) = @_;
582		839
		840	$self->{update_container}{$_->{container}}++
583	for (@items) {	841	for @items;
584	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
585
586	if ($_->{container} == 0) {
587	update_floorbox;
588	update_container ($_->{tag});
589	} elsif ($_->{container} == $self->{player}{tag}) {
590	$::INV->set_items ($self->{container}{$self->{player}{tag}})
591	} else {
592	update_container ($_->{tag});
593	}
594	}	842
		843	$self->update_containers;
595	}	844	}
596		845
597	sub item_update {	846	sub item_update {
598	my ($self, $item) = @_;	847	my ($self, $item) = @_;
599		848
600	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	849	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
601		850
602	if ($item->{tag} == $self->{player}{tag}) {
603	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
604	return;
605	}
606
607	CFClient::Item::update_widgets $item;	851	CFPlus::Item::update_widgets $item;
608		852
609	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	853	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
610	set_opencont ($::CONN, 0, "Floor");	854	set_opencont ($::CONN, 0, "Floor");
611		855
612	} elsif ($item->{flags} & F_OPEN) {	856	} elsif ($item->{flags} & F_OPEN) {
613	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	857	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
		858
614	} else {	859	} else {
615	if ($item->{container} == 0) {	860	$self->{update_container}{$item->{container}}++;
616	update_floorbox;
617	update_container (0);	861	$self->update_containers;
618	} elsif ($item->{container} == $self->{player}{tag}) {
619	$::INV->set_items ($self->{container}{$item->{container}})
620	}
621	}	862	}
622	}	863	}
623		864
624	sub player_update {	865	sub player_update {
625	my ($self, $player) = @_;	866	my ($self, $player) = @_;
		867
		868	$self->update_weight;
		869	}
		870
		871	sub update_weight {
		872	my ($self) = @_;
		873
		874	my $weight = .001 * $self->{player}{weight};
		875	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
		876
626	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	877	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
		878	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
		879	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
627	}	880	}
628		881
629	1;	882	sub update_server_info {
		883	my ($self) = @_;
		884
		885	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
		886
		887	$::SERVER_INFO->set_markup (
		888	"server <tt>$self->{host}:$self->{port}</tt>\n"
		889	. "protocol version <tt>$self->{version}</tt>\n"
		890	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
		891	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		892	. "editing support $yesno[!!$self->{editor_support}]\n"
		893	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		894	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		895	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
		896	. "map size $self->{mapw}×$self->{maph}\n"
		897	);
		898	}
		899
		900	sub logged_in {
		901	my ($self) = @_;
		902
		903	$self->send_ext_req (cfplus_support => version => 1, sub {
		904	$self->{cfplus_ext} = $_[0]{version};
		905	$self->update_server_info;
		906
		907	if ($self->{cfplus_ext} >= 2) {
		908	$self->send_ext_req ("editor_support", sub {
		909	$self->{editor_support} = $_[0];
		910	$self->update_server_info;
		911
		912	0
		913	});
		914	}
		915
		916	0
		917	});
		918
		919	$self->update_server_info;
		920
		921	$self->send_command ("output-sync $::CFG->{output_sync}");
		922	$self->send_command ("output-count $::CFG->{output_count}");
		923	$self->send_command ("pickup $::CFG->{pickup}");
		924	}
		925
		926	sub lookat {
		927	my ($self, $x, $y) = @_;
		928
		929	if ($self->{cfplus_ext}) {
		930	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {
		931	my ($msg) = @_;
		932
		933	if (exists $msg->{npc_dialog}) {
		934	# start npc chat dialog
		935	$self->{npc_dialog} = new CFPlus::NPCDialog::
		936	dx => $x,
		937	dy => $y,
		938	title => "$msg->{npc_dialog} (NPC)",
		939	conn => $self,
		940	;
		941	}
		942	});
		943	}
		944
		945	$self->send ("lookat $x $y");
		946	}
		947
		948	sub destroy {
		949	my ($self) = @_;
		950
		951	(delete $self->{npc_dialog})->destroy
		952	if $self->{npc_dialog};
		953
		954	$self->SUPER::destroy;
		955	}
		956
		957	package CFPlus::NPCDialog;
		958
		959	our @ISA = 'CFPlus::UI::Toplevel';
		960
		961	sub new {
		962	my $class = shift;
		963
		964	my $self = $class->SUPER::new (
		965	x => 'center',
		966	y => 'center',
		967	name => "npc_dialog",
		968	force_w => $::WIDTH * 0.7,
		969	force_h => $::HEIGHT * 0.7,
		970	title => "NPC Dialog",
		971	kw => { hi => 0, yes => 0, no => 0 },
		972	has_close_button => 1,
		973	@_,
		974	);
		975
		976	Scalar::Util::weaken (my $this = $self);
		977
		978	$self->connect (delete => sub { $this->destroy; 1 });
		979
		980	# better use a pane...
		981	$self->add (my $hbox = new CFPlus::UI::HBox);
		982	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
		983
		984	$hbox->add (my $vbox = new CFPlus::UI::VBox);
		985
		986	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
		987	$vbox->add ($self->{entry} = new CFPlus::UI::Entry
		988	tooltip => "#npc_message_entry",
		989	on_activate => sub {
		990	my ($entry, $text) = @_;
		991
		992	return unless $text =~ /\S/;
		993
		994	$entry->set_text ("");
		995	$this->send ($text);
		996
		997	0
		998	},
		999	);
		1000
		1001	$vbox->add ($self->{options} = new CFPlus::UI::VBox);
		1002
		1003	$self->{bye_button} = new CFPlus::UI::Button
		1004	text => "Bye (close)",
		1005	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		1006	on_activate => sub { $this->destroy; 1 },
		1007	;
		1008
		1009	$self->update_options;
		1010
		1011	$self->{id} = $self->{conn}->send_ext_req (
		1012	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
		1013	sub { $this && $this->feed (@_) }
		1014	);
		1015
		1016	$self->{entry}->grab_focus;
		1017
		1018	$self->{textview}->add_paragraph ({
		1019	fg => [1, 1, 0, 1],
		1020	markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
		1021	});
		1022
		1023	$self->show;
		1024	$self
		1025	};
		1026
		1027	sub update_options {
		1028	my ($self) = @_;
		1029
		1030	Scalar::Util::weaken $self;
		1031
		1032	$self->{options}->clear;
		1033	$self->{options}->add ($self->{bye_button});
		1034
		1035	for my $kw (sort keys %{ $self->{kw} }) {
		1036	$self->{options}->add (new CFPlus::UI::Button
		1037	text => $kw,
		1038	on_activate => sub {
		1039	$self->send ($kw);
		1040	0
		1041	},
		1042	);
		1043	}
		1044	}
		1045
		1046	sub feed {
		1047	my ($self, $msg) = @_;
		1048
		1049	Scalar::Util::weaken $self;
		1050
		1051	if ($msg->{msgtype} eq "reply") {
		1052	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};
		1053	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};
		1054
		1055	my $text = "\n" . CFPlus::asxml $msg->{msg};
		1056	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1057	my @link;
		1058	$text =~ s{
		1059	($match)
		1060	}{
		1061	my $kw = $1;
		1062
		1063	push @link, new CFPlus::UI::Label
		1064	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1065	can_hover => 1,
		1066	can_events => 1,
		1067	padding_x => 0,
		1068	padding_y => 0,
		1069	on_button_up => sub {
		1070	$self->send ($kw);
		1071	};
		1072
		1073	"\x{fffc}"
		1074	}giex;
		1075
		1076	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
		1077	$self->{textview}->scroll_to_bottom;
		1078	$self->update_options;
		1079	} else {
		1080	$self->destroy;
		1081	}
		1082
		1083	1
		1084	}
		1085
		1086	sub send {
		1087	my ($self, $msg) = @_;
		1088
		1089	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
		1090	$self->{textview}->scroll_to_bottom;
		1091
		1092	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
		1093	}
		1094
		1095	sub destroy {
		1096	my ($self) = @_;
		1097
		1098	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
		1099
		1100	if ($self->{conn}) {
		1101	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
		1102	delete $self->{conn}{npc_dialog};
		1103	$self->{conn}->disconnect_ext ($self->{id});
		1104	}
		1105
		1106	$self->SUPER::destroy;
		1107	}
		1108
		1109	1
		1110

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.5 by elmex, Sat May 27 10:32:35 2006 UTC vs. Revision 1.88 by root, Sun Nov 19 20:31:29 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.5 by elmex, Sat May 27 10:32:35 2006 UTC vs.
Revision 1.88 by root, Sun Nov 19 20:31:29 2006 UTC