--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/08/18 01:01:01 1.79
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2006/12/06 00:15:12 1.90
@@ -9,6 +9,8 @@
use CFPlus::UI;
use CFPlus::Pod;
+use Crossfire::Protocol::Base 0.95;
+
use base 'Crossfire::Protocol::Base';
sub new {
@@ -44,6 +46,12 @@
$self->{noface} = new_from_file CFPlus::Texture
CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
+ {
+ $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
+ CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
+ $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+ }
+
$self->{open_container} = 0;
# "global"
@@ -282,10 +290,11 @@
} elsif ($ev->{button} == 2) {
$::CONN->user_send ("use_skill $name");
} elsif ($ev->{button} == 3) {
+ my $shortname = CFPlus::shorten $name, 14;
(new CFPlus::UI::Menu
items => [
- ["bind ready_skill $name to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
- ["bind use_skill $name to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
+ ["bind ready_skill $shortname to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
+ ["bind use_skill $shortname to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
],
)->popup ($ev);
} else {
@@ -315,9 +324,8 @@
sub user_send {
my ($self, $command) = @_;
- if ($self->{record}) {
- push @{$self->{record}}, $command;
- }
+ push @{$self->{record}}, $command
+ if $self->{record};
$self->logprint ("send: ", $command);
$self->send_command ($command);
@@ -619,8 +627,6 @@
$self->logprint ("info: ", $text);
- my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
-
# try to create single paragraphs of multiple lines sent by the server
$text =~ s/(?<=\S)\n(?=\w)/ /g;
@@ -628,9 +634,8 @@
$text =~ s/\[b\](.*?)\[\/b\]/\1<\/b>/g;
$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g;
- $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
- for map "$time $_", split /\n/, $text;
- $self->{logview}->scroll_to_bottom;
+ ::message ({ fg => $color[$color], markup => $_ })
+ for split /\n/, $text;
$self->{statusbox}->add ($text,
group => $text,
@@ -654,7 +659,7 @@
$spell->{message} =~ s/\n+$//;
$spell->{message} ||= "Server did not provide a description for this spell.";
- $::SPELL_PAGE->add_spell ($spell);
+ $::SPELL_LIST->add_spell ($spell);
$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
@@ -663,7 +668,13 @@
sub spell_delete {
my ($self, $spell) = @_;
- $::SPELL_PAGE->remove_spell ($spell);
+ $::SPELL_LIST->remove_spell ($spell);
+}
+
+sub setup {
+ my ($self, $setup) = @_;
+
+ $::MAP->resize ($self->{mapw}, $self->{maph});
}
sub addme_success {
@@ -879,10 +890,14 @@
. "protocol version $self->{version}\n"
. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
+ . "editing support $yesno[!!$self->{editor_support}]\n"
+ . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
. "map size $self->{mapw}×$self->{maph}\n"
);
+
+ ::setup_build_button ($self->{editor_support}->{builder_ui});
}
sub logged_in {
@@ -892,6 +907,15 @@
$self->{cfplus_ext} = $_[0]{version};
$self->update_server_info;
+ if ($self->{cfplus_ext} >= 2) {
+ $self->send_ext_req ("editor_support", sub {
+ $self->{editor_support} = $_[0];
+ $self->update_server_info;
+
+ 0
+ });
+ }
+
0
});
@@ -902,6 +926,14 @@
$self->send_command ("pickup $::CFG->{pickup}");
}
+sub buildat {
+ my ($self, $builditem, $x, $y) = @_;
+
+ if ($self->{cfplus_ext}) {
+ $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
+ }
+}
+
sub lookat {
my ($self, $x, $y) = @_;
@@ -1086,3 +1118,4 @@
}
1
+