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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.27 by root, Wed Jun 7 07:00:30 2006 UTC vs. Revision 1.93 by root, Fri Dec 22 03:43:05 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.27 by root, Wed Jun 7 07:00:30 2006 UTC vs.
Revision 1.93 by root, Fri Dec 22 03:43:05 2006 UTC