--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/10/08 21:22:30 1.86
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2006/12/09 02:21:25 1.91
@@ -8,6 +8,10 @@
use CFPlus;
use CFPlus::UI;
use CFPlus::Pod;
+use CFPlus::Macro;
+use CFPlus::Item;
+
+use Crossfire::Protocol::Base 0.95;
use base 'Crossfire::Protocol::Base';
@@ -288,10 +292,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 { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
+ ["bind use_skill $shortname to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
],
)->popup ($ev);
} else {
@@ -318,27 +323,29 @@
}
}
+sub macro_send {
+ my ($self, $macro) = @_;
+
+ for my $cmd (@{ $macro->{action} }) {
+ $self->send_command ($cmd);
+ }
+}
+
sub user_send {
my ($self, $command) = @_;
- if ($self->{record}) {
- push @{$self->{record}}, $command;
- }
+ $self->{record}->($command)
+ if $self->{record};
$self->logprint ("send: ", $command);
$self->send_command ($command);
::status ($command);
}
-sub start_record {
- my ($self) = @_;
-
- $self->{record} = [];
-}
+sub record {
+ my ($self, $cb) = @_;
-sub stop_record {
- my ($self) = @_;
- return delete $self->{record};
+ $self->{record} = $cb;
}
sub map_scroll {
@@ -657,7 +664,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});
@@ -666,7 +673,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 {
@@ -888,6 +901,8 @@
. ($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 {
@@ -916,6 +931,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) = @_;