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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC vs.
Revision 1.89 by elmex, Mon Dec 4 15:17:14 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 CFClient;	8	use CFPlus;
9	use CFClient::UI;	9	use CFPlus::UI;
		10	use CFPlus::Pod;
		11
		12	use Crossfire::Protocol::Base 0.95;
10		13
11	use base 'Crossfire::Protocol::Base';	14	use base 'Crossfire::Protocol::Base';
12		15
13	sub new {	16	sub new {
14	my $class = shift;	17	my $class = shift;
15		18
16	my $self = $class->SUPER::new (@_);	19	my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
17		20
18	$self->{map_widget}->clr_commands;	21	$self->{map_widget}->clr_commands;
19		22
20	my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {	23	my @cmd_help = map {
21	my ($pom) = @_;
22
23	my @cmd_help;
24
25	for my $head2 ($pom->head1->[-2]->head2) {
26	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	24	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
27	or next;	25	or die "unparseable command help: $_->{kw}[0]";
28		26
29	my $cmd = $1;	27	my $cmd = $1;
30	my @args = split /\\|/, $2;	28	my @args = split /\\|/, $2;
31	@args = (".*") unless @args;	29	@args = (".*") unless @args;
32		30
		31	my (undef, @par) = CFPlus::Pod::section_of $_;
		32	my $text = CFPlus::Pod::as_label @par;
		33
33	$_ = $_ eq ".*" ? "" : " $_"	34	$_ = $_ eq ".*" ? "" : " $_"
34	for @args;	35	for @args;
35		36
36	my $text = CFClient::pod_to_pango $head2->content;	37	map ["$cmd$_", $text],
37
38	push @cmd_help, ["$cmd$_", $text]
39	for sort { (length $a) <=> (length $b) }	38	sort { (length $a) <=> (length $b) }
40	@args;	39	@args
41	}	40	} sort { $a->{par} <=> $b->{par} }
		41	CFPlus::Pod::find command => "*";
42		42
		43	$self->{map_widget}->add_command (@$_)
43	\@cmd_help	44	for @cmd_help;
		45
		46	$self->{noface} = new_from_file CFPlus::Texture
		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	}
		54
		55	$self->{open_container} = 0;
		56
		57	# "global"
		58	$self->{tilecache} = CFPlus::db_table "tilecache"
		59	or die "tilecache: unable to open database table";
		60	$self->{facemap} = CFPlus::db_table "facemap"
		61	or die "facemap: unable to open database table";
		62
		63	# per server
		64	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
		65	or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
		66
		67	$self
		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;
44	};	82	};
45		83
46	$self->{map_widget}->add_command (@$_)	84	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
47	for @$cmd_help;
48		85
49	$self->{noface} = new_from_file CFClient::Texture	86	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
50	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;	87	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
51		88
52	$self->{open_container} = 0;	89	print {$self->{log_fh}} "$ts ", @a, "\n";
53
54	# "global"
55	$self->{tilecache} = CFClient::db_table "tilecache";
56	$self->{facemap} = CFClient::db_table "facemap";
57
58	# per server
59	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60
61	$self
62	}	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	);
63		160
64	sub stats_update {	161	sub stats_update {
65	my ($self, $stats) = @_;	162	my ($self, $stats) = @_;
66		163
67	if (my $exp = $stats->{+CS_STAT_EXP64}) {	164	my $prev = $self->{prev_stats} \|\| { };
68	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;
69	$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);
70	if exists $self->{prev_exp} && $diff;
71	$self->{prev_exp} = $exp;
72	}	177	}
73		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
74	::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	}
75	}	321	}
76		322
77	sub user_send {	323	sub user_send {
78	my ($self, $command) = @_;	324	my ($self, $command) = @_;
79		325
80	if ($self->{record}) {
81	push @{$self->{record}}, $command;	326	push @{$self->{record}}, $command
82	}	327	if $self->{record};
83		328
		329	$self->logprint ("send: ", $command);
84	$self->send_command ($command);	330	$self->send_command ($command);
85	::status $command;	331	::status ($command);
86	}	332	}
87		333
88	sub start_record {	334	sub start_record {
89	my ($self) = @_;	335	my ($self) = @_;
90		336
103	}	349	}
104		350
105	sub feed_map1a {	351	sub feed_map1a {
106	my ($self, $data) = @_;	352	my ($self, $data) = @_;
107		353
108	$self->{map}->map1a_update ($data);	354	$self->{map}->map1a_update ($data, $self->{setup}{extmap});
109	$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);
110	}	362	}
111		363
112	sub flush_map {	364	sub flush_map {
113	my ($self) = @_;	365	my ($self) = @_;
114		366
…		…
127		379
128	$self->flush_map;	380	$self->flush_map;
129	delete $self->{neigh_map};	381	delete $self->{neigh_map};
130		382
131	$self->{map}->clear;	383	$self->{map}->clear;
		384	delete $self->{map_widget}{magicmap};
132	}	385	}
133		386
134		387
135	sub load_map($$$) {	388	sub load_map($$$) {
136	my ($self, $hash, $x, $y) = @_;	389	my ($self, $hash, $x, $y) = @_;
…		…
276		529
277	unless ($id) {	530	unless ($id) {
278	# create new id for face	531	# create new id for face
279	# I love transactions	532	# I love transactions
280	for (1..100) {	533	for (1..100) {
281	my $txn = $CFClient::DB_ENV->txn_begin;	534	my $txn = $CFPlus::DB_ENV->txn_begin;
282	my $status = $self->{facemap}->db_get (id => $id);	535	my $status = $self->{facemap}->db_get (id => $id);
283	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	536	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
284	$id = ($id \|\| 16) + 1;	537	$id = ($id \|\| 64) + 1;
285	if ($self->{facemap}->put (id => $id) == 0	538	if ($self->{facemap}->put (id => $id) == 0
286	&& $self->{facemap}->put ($hash => $id) == 0) {	539	&& $self->{facemap}->put ($hash => $id) == 0) {
287	$txn->txn_commit;	540	$txn->txn_commit;
288		541
289	goto gotid;	542	goto gotid;
290	}	543	}
291	}	544	}
292	$txn->txn_abort;	545	$txn->txn_abort;
293	}	546	}
294		547
295	CFClient::fatal "maximum number of transaction retries reached - database problems?";	548	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
296	}	549	}
297		550
298	gotid:	551	gotid:
299	$face->{id} = $id;	552	$face->{id} = $id;
300	$self->{map}->set_face ($facenum => $id);	553	$self->{map}->set_face ($facenum => $id);
…		…
311	undef	564	undef
312	};	565	};
313	}	566	}
314		567
315	sub face_update {	568	sub face_update {
316	my ($self, $facenum, $face) = @_;	569	my ($self, $facenum, $face, $changed) = @_;
317		570
318	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes	571	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
319		572
320	$self->set_texture ($face->{id} => delete $face->{image});	573	$self->set_texture ($face->{id} => delete $face->{image});
321	}	574	}
322		575
323	sub set_texture {	576	sub set_texture {
324	my ($self, $id, $data) = @_;	577	my ($self, $id, $data) = @_;
325		578
326	$self->{texture}[$id] \|\|= do {	579	$self->{texture}[$id] \|\|= do {
327	my $tex =	580	my $tex =
328	new_from_image CFClient::Texture	581	new_from_image CFPlus::Texture
329	$data, minify => 1, mipmap => 1;	582	$data, minify => 1, mipmap => 1;
330		583
331	$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}});
332	$self->{map_widget}->update;	585	$self->{map_widget}->update;
333		586
…		…
364	[0.11, 0.56, 1.00],	617	[0.11, 0.56, 1.00],
365	[0.93, 0.46, 0.00],	618	[0.93, 0.46, 0.00],
366	[0.18, 0.54, 0.34],	619	[0.18, 0.54, 0.34],
367	[0.56, 0.73, 0.56],	620	[0.56, 0.73, 0.56],
368	[0.80, 0.80, 0.80],	621	[0.80, 0.80, 0.80],
369	[0.55, 0.41, 0.13],	622	[0.75, 0.61, 0.20],
370	[0.99, 0.77, 0.26],	623	[0.99, 0.77, 0.26],
371	[0.74, 0.65, 0.41],	624	[0.74, 0.65, 0.41],
372	);	625	);
373		626
374	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	627	$self->logprint ("info: ", $text);
375		628
376	# try to create single paragraphs of multiple lines sent by the server	629	# try to create single paragraphs of multiple lines sent by the server
377	$text =~ s/(?<=\S)\n(?=\w)/ /g;	630	$text =~ s/(?<=\S)\n(?=\w)/ /g;
378		631
379	$text = CFClient::UI::Label::escape $text;	632	$text = CFPlus::asxml $text;
380	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	633	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
381	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	634	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
382		635
383	$self->{logview}->add_paragraph ($color[$color],	636	::message ({ fg => $color[$color], markup => $_ })
384	join "\n", map "$time $_", split /\n/, $text);	637	for split /\n/, $text;
385		638
386	$self->{statusbox}->add ($text,	639	$self->{statusbox}->add ($text,
387	group => $text,	640	group => $text,
388	fg => $color[$color],	641	fg => $color[$color],
389	timeout => $color >= 2 ? 60 : 10,	642	timeout => $color >= 2 ? 180 : 10,
390	tooltip_font => $::FONT_FIXED,	643	tooltip_font => $::FONT_FIXED,
391	);	644	);
392	}	645	}
393		646
394	sub drawextinfo {	647	sub drawextinfo {
…		…
398	}	651	}
399		652
400	sub spell_add {	653	sub spell_add {
401	my ($self, $spell) = @_;	654	my ($self, $spell) = @_;
402		655
403	# try to create single paragraphs of multiple lines sent by the server	656	# try to create single paragraphs out of the multiple lines sent by the server
404	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	657	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
405	$spell->{message} =~ s/\n+$//;	658	$spell->{message} =~ s/\n+$//;
406	$spell->{message} \|\|= "Server did not provide a description for this spell.";	659	$spell->{message} \|\|= "Server did not provide a description for this spell.";
407		660
408	$::SETUP_SPELLS->add_spell ($spell);	661	$::SPELL_LIST->add_spell ($spell);
409		662
410	$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});
411	$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});
412	}	665	}
413		666
414	sub spell_delete {	667	sub spell_delete {
415	my ($self, $spell) = @_;	668	my ($self, $spell) = @_;
		669
416	$::SETUP_SPELLS->remove_spell ($spell);	670	$::SPELL_LIST->remove_spell ($spell);
		671	}
		672
		673	sub setup {
		674	my ($self, $setup) = @_;
		675
		676	$::MAP->resize ($self->{mapw}, $self->{maph});
417	}	677	}
418		678
419	sub addme_success {	679	sub addme_success {
420	my ($self) = @_;	680	my ($self) = @_;
421		681
422	my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
423	my ($pom) = @_;
424
425	my %skill_help;	682	my %skill_help;
426		683
427	for my $head2 ($pom->head1->[3]->head2) {	684	for my $node (CFPlus::Pod::find skill_description => "*") {
428	$skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;	685	my (undef, @par) = CFPlus::Pod::section_of $node;
429	}	686	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
430
431	\%skill_help
432	};	687	};
433		688
434	for my $skill (values %{$self->{skill_info}}) {	689	for my $skill (values %{$self->{skill_info}}) {
435	$self->{map_widget}->add_command ("ready_skill $skill",	690	$self->{map_widget}->add_command ("ready_skill $skill",
436	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	691	(CFPlus::asxml "Ready the skill '$skill'\n\n")
437	. $skill_help->{$skill});	692	. $skill_help{$skill});
438	$self->{map_widget}->add_command ("use_skill $skill",	693	$self->{map_widget}->add_command ("use_skill $skill",
439	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	694	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")
440	. $skill_help->{$skill});	695	. $skill_help{$skill});
441	}	696	}
442	}	697	}
443		698
444	sub eof {	699	sub eof {
445	my ($self) = @_;	700	my ($self) = @_;
…		…
469		724
470	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	725	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
471		726
472	$self->send ("requestinfo image_sums $face $face");	727	$self->send ("requestinfo image_sums $face $face");
473		728
474	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	729	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
475	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);	730	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
476	} elsif (!exists $self->{num_faces}) {	731	} elsif (!exists $self->{num_faces}) {
477	$self->send ("requestinfo image_info");	732	$self->send ("requestinfo image_info");
478		733
479	$self->{num_faces} = 0;	734	$self->{num_faces} = 0;
480		735
481	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	736	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
482	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);	737	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
483	}	738	}
484	}	739	}
485		740
486	sub update_floorbox {	741	sub update_floorbox {
487	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	742	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
488	return unless $::CONN;	743	return unless $::CONN;
489		744
490	$::FLOORBOX->clear;	745	$::FLOORBOX->clear;
491		746
492	my $row;	747	my $row;
493	for (@{ $::CONN->{container}{0} }) {	748	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
494	if ($row < 6) {	749	if ($row < 6) {
495	local $_->{face_widget}; # hack to force recreation of widget	750	local $_->{face_widget}; # hack to force recreation of widget
496	local $_->{desc_widget}; # hack to force recreation of widget	751	local $_->{desc_widget}; # hack to force recreation of widget
497	CFClient::Item::update_widgets $_;	752	CFPlus::Item::update_widgets $_;
498		753
499	$::FLOORBOX->add (0, $row, $_->{face_widget});	754	$::FLOORBOX->add (0, $row, $_->{face_widget});
500	$::FLOORBOX->add (1, $row, $_->{desc_widget});	755	$::FLOORBOX->add (1, $row, $_->{desc_widget});
501		756
502	$row++;	757	$row++;
503	} else {	758	} else {
504	$::FLOORBOX->add (1, $row, new CFClient::UI::Button	759	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button
505	text => "More...",	760	text => "More...",
506	on_activate => sub { $::INV_WINDOW->toggle_visibility },	761	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
507	);	762	);
508	last;	763	last;
509	}	764	}
510	}	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	}
511	});	772	});
512		773
513	$::WANT_REFRESH++;	774	$::WANT_REFRESH++;
514	}	775	}
515		776
516	sub set_opencont {	777	sub set_opencont {
517	my ($conn, $tag, $name) = @_;	778	my ($conn, $tag, $name) = @_;
518	$conn->{open_container} = $tag;	779	$conn->{open_container} = $tag;
		780	update_floorbox;
519		781
520	$::INV_RIGHT_HB->clear ();	782	$::INV_RIGHT_HB->clear ();
521	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);	783	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
522		784
523	if ($tag != 0) { # Floor isn't closable, is it?	785	if ($tag != 0) { # Floor isn't closable, is it?
524	$::INV_RIGHT_HB->add (new CFClient::UI::Button	786	$::INV_RIGHT_HB->add (new CFPlus::UI::Button
525	text => "Close container",	787	text => "Close container",
526	tooltip => "Close the currently open container (if one is open)",	788	tooltip => "Close the currently open container (if one is open)",
527	on_activate => sub {	789	on_activate => sub {
528	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	790	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
529	if $tag != 0;	791	if $tag != 0;
530	#if $CONN->{open_container} != 0;	792	#if $CONN->{open_container} != 0;
		793	0
531	},	794	},
532	);	795	);
533	}	796	}
534		797
535	$::INVR->set_items ($conn->{container}{$tag});	798	$::INVR->set_items ($conn->{container}{$tag});
536	}	799	}
537		800
538	sub update_container {	801	sub update_containers {
539	my ($tag) = @_;	802	my ($self) = @_;
540		803
541	$::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})
542	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	});
543	}	821	}
544		822
545	sub container_add {	823	sub container_add {
546	my ($self, $tag, $items) = @_;	824	my ($self, $tag, $items) = @_;
547		825
548	#d# print "container_add: container $tag ($self->{player}{tag})\n";	826	$self->{update_container}{$tag}++;
549		827	$self->update_containers;
550	if ($tag == 0) {
551	update_floorbox;
552	update_container (0);
553	} elsif ($tag == $self->{player}{tag}) {
554	$::INV->set_items ($self->{container}{$self->{player}{tag}})
555	} else {
556	update_container ($tag);
557	}
558
559	# $self-<{player}{tag} => player inv
560	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
561	}	828	}
562		829
563	sub container_clear {	830	sub container_clear {
564	my ($self, $tag) = @_;	831	my ($self, $tag) = @_;
565		832
566	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	833	$self->{update_container}{$tag}++;
567		834	$self->update_containers;
568	if ($tag == 0) {
569	update_floorbox;
570	update_container (0);
571	} elsif ($tag == $self->{player}{tag}) {
572	$::INV->set_items ($self->{container}{$tag})
573	} else {
574	update_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 ($_->{container});
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) = @_;
626		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
627	$::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);
628	}	880	}
629		881
630	sub logged_in {	882	sub update_server_info {
631	my ($self) = @_;	883	my ($self) = @_;
632
633	$self->send_ext_req (cfplus => "version", "1", sub {
634	$self->{cfplus_ext} = $_[0];
635	});
636
637	$self->send_command ("output-sync $::CFG->{output_sync}");
638	$self->send_command ("output-count $::CFG->{output_count}");
639	$self->send_command ("pickup $::CFG->{pickup}");
640		884
641	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");	885	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
642		886
643	$::SERVER_INFO->set_markup (	887	$::SERVER_INFO->set_markup (
644	"server <tt>$self->{host}:$self->{port}</tt>\n"	888	"server <tt>$self->{host}:$self->{port}</tt>\n"
645	. "protocol version <tt>$self->{version}</tt>\n"	889	. "protocol version <tt>$self->{version}</tt>\n"
646	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	890	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
647	. "extended command support $yesno[$self->{setup}{extcmd} > 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"
648	. "cfplus support $yesno[$self->{cfplus_ext} > 0]\n"	894	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		895	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
649	. "map size $self->{mapw}×$self->{maph}\n"	896	. "map size $self->{mapw}×$self->{maph}\n"
650	);	897	);
651	}
652		898
653	1;	899	::setup_build_button ($self->{editor_support}->{builder_ui});
		900	}
		901
		902	sub logged_in {
		903	my ($self) = @_;
		904
		905	$self->send_ext_req (cfplus_support => version => 1, sub {
		906	$self->{cfplus_ext} = $_[0]{version};
		907	$self->update_server_info;
		908
		909	if ($self->{cfplus_ext} >= 2) {
		910	$self->send_ext_req ("editor_support", sub {
		911	$self->{editor_support} = $_[0];
		912	$self->update_server_info;
		913
		914	0
		915	});
		916	}
		917
		918	0
		919	});
		920
		921	$self->update_server_info;
		922
		923	$self->send_command ("output-sync $::CFG->{output_sync}");
		924	$self->send_command ("output-count $::CFG->{output_count}");
		925	$self->send_command ("pickup $::CFG->{pickup}");
		926	}
		927
		928	sub buildat {
		929	my ($self, $builditem, $x, $y) = @_;
		930
		931	if ($self->{cfplus_ext}) {
		932	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
		933	}
		934	}
		935
		936	sub lookat {
		937	my ($self, $x, $y) = @_;
		938
		939	if ($self->{cfplus_ext}) {
		940	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {
		941	my ($msg) = @_;
		942
		943	if (exists $msg->{npc_dialog}) {
		944	# start npc chat dialog
		945	$self->{npc_dialog} = new CFPlus::NPCDialog::
		946	dx => $x,
		947	dy => $y,
		948	title => "$msg->{npc_dialog} (NPC)",
		949	conn => $self,
		950	;
		951	}
		952	});
		953	}
		954
		955	$self->send ("lookat $x $y");
		956	}
		957
		958	sub destroy {
		959	my ($self) = @_;
		960
		961	(delete $self->{npc_dialog})->destroy
		962	if $self->{npc_dialog};
		963
		964	$self->SUPER::destroy;
		965	}
		966
		967	package CFPlus::NPCDialog;
		968
		969	our @ISA = 'CFPlus::UI::Toplevel';
		970
		971	sub new {
		972	my $class = shift;
		973
		974	my $self = $class->SUPER::new (
		975	x => 'center',
		976	y => 'center',
		977	name => "npc_dialog",
		978	force_w => $::WIDTH * 0.7,
		979	force_h => $::HEIGHT * 0.7,
		980	title => "NPC Dialog",
		981	kw => { hi => 0, yes => 0, no => 0 },
		982	has_close_button => 1,
		983	@_,
		984	);
		985
		986	Scalar::Util::weaken (my $this = $self);
		987
		988	$self->connect (delete => sub { $this->destroy; 1 });
		989
		990	# better use a pane...
		991	$self->add (my $hbox = new CFPlus::UI::HBox);
		992	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
		993
		994	$hbox->add (my $vbox = new CFPlus::UI::VBox);
		995
		996	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
		997	$vbox->add ($self->{entry} = new CFPlus::UI::Entry
		998	tooltip => "#npc_message_entry",
		999	on_activate => sub {
		1000	my ($entry, $text) = @_;
		1001
		1002	return unless $text =~ /\S/;
		1003
		1004	$entry->set_text ("");
		1005	$this->send ($text);
		1006
		1007	0
		1008	},
		1009	);
		1010
		1011	$vbox->add ($self->{options} = new CFPlus::UI::VBox);
		1012
		1013	$self->{bye_button} = new CFPlus::UI::Button
		1014	text => "Bye (close)",
		1015	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		1016	on_activate => sub { $this->destroy; 1 },
		1017	;
		1018
		1019	$self->update_options;
		1020
		1021	$self->{id} = $self->{conn}->send_ext_req (
		1022	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
		1023	sub { $this && $this->feed (@_) }
		1024	);
		1025
		1026	$self->{entry}->grab_focus;
		1027
		1028	$self->{textview}->add_paragraph ({
		1029	fg => [1, 1, 0, 1],
		1030	markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
		1031	});
		1032
		1033	$self->show;
		1034	$self
		1035	};
		1036
		1037	sub update_options {
		1038	my ($self) = @_;
		1039
		1040	Scalar::Util::weaken $self;
		1041
		1042	$self->{options}->clear;
		1043	$self->{options}->add ($self->{bye_button});
		1044
		1045	for my $kw (sort keys %{ $self->{kw} }) {
		1046	$self->{options}->add (new CFPlus::UI::Button
		1047	text => $kw,
		1048	on_activate => sub {
		1049	$self->send ($kw);
		1050	0
		1051	},
		1052	);
		1053	}
		1054	}
		1055
		1056	sub feed {
		1057	my ($self, $msg) = @_;
		1058
		1059	Scalar::Util::weaken $self;
		1060
		1061	if ($msg->{msgtype} eq "reply") {
		1062	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};
		1063	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};
		1064
		1065	my $text = "\n" . CFPlus::asxml $msg->{msg};
		1066	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1067	my @link;
		1068	$text =~ s{
		1069	($match)
		1070	}{
		1071	my $kw = $1;
		1072
		1073	push @link, new CFPlus::UI::Label
		1074	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1075	can_hover => 1,
		1076	can_events => 1,
		1077	padding_x => 0,
		1078	padding_y => 0,
		1079	on_button_up => sub {
		1080	$self->send ($kw);
		1081	};
		1082
		1083	"\x{fffc}"
		1084	}giex;
		1085
		1086	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
		1087	$self->{textview}->scroll_to_bottom;
		1088	$self->update_options;
		1089	} else {
		1090	$self->destroy;
		1091	}
		1092
		1093	1
		1094	}
		1095
		1096	sub send {
		1097	my ($self, $msg) = @_;
		1098
		1099	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
		1100	$self->{textview}->scroll_to_bottom;
		1101
		1102	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
		1103	}
		1104
		1105	sub destroy {
		1106	my ($self) = @_;
		1107
		1108	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
		1109
		1110	if ($self->{conn}) {
		1111	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
		1112	delete $self->{conn}{npc_dialog};
		1113	$self->{conn}->disconnect_ext ($self->{id});
		1114	}
		1115
		1116	$self->SUPER::destroy;
		1117	}
		1118
		1119	1
		1120

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC vs. Revision 1.89 by elmex, Mon Dec 4 15:17:14 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC vs.
Revision 1.89 by elmex, Mon Dec 4 15:17:14 2006 UTC