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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.87 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.94 by root, Fri Mar 16 02:33:49 2007 UTC

 use Crossfire::Protocol::Constants;
 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';
             if ($ev->{button} == 1) {
                $::CONN->user_send ("ready_skill $name");
             } 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 <i>ready_skill $name</i> to a key"   => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
+                     ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
-                     ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
+                     ["bind <i>use_skill $shortname</i> to a key"   => sub { CFPlus::Macro::quick_macro ["use_skill $name"]   }],
                   ],
                )->popup ($ev);
             } else {
                return 0;
             }
       $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
       $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
    }
 }
+sub macro_send {
+   my ($self, $macro) = @_;
+   for my $cmd (@{ $macro->{action} }) {
+      $self->send_command ($cmd);
+   }
+}
 sub user_send {
    my ($self, $command) = @_;
-   push @{$self->{record}}, $command
+   $self->{record}->($command)
       if $self->{record};
    $self->logprint ("send: ", $command);
    $self->send_command ($command);
    ::status ($command);
 }
-sub start_record {
+sub record {
-   my ($self) = @_;
+   my ($self, $cb) = @_;
-   $self->{record} = [];
+   $self->{record} = $cb;
-}
-sub stop_record {
-   my ($self) = @_;
-   return delete $self->{record};
 }
 sub map_scroll {
    my ($self, $dx, $dy) = @_;
       [0.75, 0.61, 0.20],
       [0.99, 0.77, 0.26],
       [0.74, 0.65, 0.41],
    );
+   my $fg = $color[$color % @color];
    $self->logprint ("info: ", $text);
    # try to create single paragraphs of multiple lines sent by the server
    $text =~ s/(?<=\S)\n(?=\w)/ /g;
    $text = CFPlus::asxml $text;
    $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
    $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
-   ::message ({ fg => $color[$color], markup => $_ })
+   ::message ({ fg => $fg, markup => $_ })
       for split /\n/, $text;
    $self->{statusbox}->add ($text,
       group        => $text,
-      fg           => $color[$color],
+      fg           => $fg,
       timeout      => $color >= 2 ? 180 : 10,
       tooltip_font => $::FONT_FIXED,
    );
 }
    # try to create single paragraphs out of the multiple lines sent by the server
    $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
    $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});
 }
 sub spell_delete {
    my ($self, $spell) = @_;
-   $::SPELL_PAGE->remove_spell ($spell);
+   $::SPELL_LIST->remove_spell ($spell);
 }
 sub setup {
    my ($self, $setup) = @_;
     . "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 {
    my ($self) = @_;
    $self->update_server_info;
    $self->send_command ("output-sync $::CFG->{output_sync}");
    $self->send_command ("output-count $::CFG->{output_count}");
+   $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
    $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) = @_;
       kw      => { hi => 0, yes => 0, no => 0 },
       has_close_button => 1,
       @_,
    );
-   Scalar::Util::weaken (my $this = $self);
+   CFPlus::weaken (my $this = $self);
    $self->connect (delete => sub { $this->destroy; 1 });
    # better use a pane...
    $self->add (my $hbox = new CFPlus::UI::HBox);
 };
 sub update_options {
    my ($self) = @_;
-   Scalar::Util::weaken $self;
+   CFPlus::weaken $self;
    $self->{options}->clear;
    $self->{options}->add ($self->{bye_button});
    for my $kw (sort keys %{ $self->{kw} }) {
 }
 sub feed {
    my ($self, $msg) = @_;
-   Scalar::Util::weaken $self;
+   CFPlus::weaken $self;
    if ($msg->{msgtype} eq "reply") {
       $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
       $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.87 by root, Tue Nov 7 22:41:27 2006 UTC vs. Revision 1.94 by root, Fri Mar 16 02:33:49 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.87 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.94 by root, Fri Mar 16 02:33:49 2007 UTC