--- deliantra/Deliantra-Client/DC.pm 2006/05/25 16:35:42 1.63
+++ deliantra/Deliantra-Client/DC.pm 2006/05/25 23:06:05 1.69
@@ -173,7 +173,7 @@
sub view_verbatim {
(join "",
- map +("\t" x ($indent / 2)) . "$_\n",
+ map +("\t" x ($indent / 2)) . "$_\n",
split /\n/, CFClient::UI::Label::escape ($_[1]))
. "\n"
}
@@ -183,12 +183,17 @@
}
sub view_head1 {
- "" . $_[1]->title->present ($_[0]) . "\n\n"
+ "\n\n" . $_[1]->title->present ($_[0]) . "\n\n"
. $_[1]->content->present ($_[0])
};
sub view_head2 {
- "" . $_[1]->title->present ($_[0]) . "\n\n"
+ "\n" . $_[1]->title->present ($_[0]) . "\n\n"
+ . $_[1]->content->present ($_[0])
+};
+
+sub view_head3 {
+ "\n" . $_[1]->title->present ($_[0]) . "\n\n"
. $_[1]->content->present ($_[0])
};
@@ -265,7 +270,7 @@
my $targ = $::CONN->{player}{tag};
if ($self->{container} == $::CONN->{player}{tag}) {
- $targ = $main::OPENCONT;
+ $targ = $::CONN->{open_container};
}
$::CONN->send ("move $targ $self->{tag} 0");
@@ -285,7 +290,7 @@
)
: (
["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
- ["drop", sub { $::CONN->send ("move $main::OPENCONT $self->{tag} 0") }],
+ ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
)
),
);
@@ -306,11 +311,13 @@
$self->{face_widget} ||= new CFClient::UI::Face
can_events => 1,
can_hover => 1,
+ anim => $self->{anim},
+ animspeed => $self->{animspeed}, # TODO# must be set at creation time
connect_button_down => $button_cb,
;
$self->{face_widget}{face} = $self->{face};
$self->{face_widget}{anim} = $self->{anim};
- $self->{face_widget}{animspeed} = $self->{animespeed};
+ $self->{face_widget}{animspeed} = $self->{animspeed};
$self->{face_widget}->set_tooltip (
"Face/Animation.\n"
. "Item uses face #$self->{face}. "
@@ -322,7 +329,7 @@
can_events => 1,
can_hover => 1,
ellipsise => 2,
- xalign => 0,
+ align => -1,
connect_button_down => $button_cb,
;
my $desc = CFClient::Item::desc_string $self;
@@ -333,7 +340,7 @@
can_events => 1,
can_hover => 1,
ellipsise => 0,
- xalign => 0.5,
+ align => 0,
connect_button_down => $button_cb,
;
$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);