ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

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.92 by root, Sat Dec 9 21:26:46 2006 UTC

… …
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::UI; 9use CFPlus::UI;
10use CFPlus::Pod; 10use CFPlus::Pod;
11use CFPlus::Macro;
12use CFPlus::Item;
11 13
12use Crossfire::Protocol::Base 0.95; 14use Crossfire::Protocol::Base 0.95;
13 15
14use base 'Crossfire::Protocol::Base'; 16use base 'Crossfire::Protocol::Base';
15 17
… …
288 if ($ev->{button} == 1) { 290 if ($ev->{button} == 1) {
289 $::CONN->user_send ("ready_skill $name"); 291 $::CONN->user_send ("ready_skill $name");
290 } elsif ($ev->{button} == 2) { 292 } elsif ($ev->{button} == 2) {
291 $::CONN->user_send ("use_skill $name"); 293 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) { 294 } elsif ($ev->{button} == 3) {
295 my $shortname = CFPlus::shorten $name, 14;
293 (new CFPlus::UI::Menu 296 (new CFPlus::UI::Menu
294 items => [ 297 items => [
295 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 298 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
296 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 299 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
297 ], 300 ],
298 )->popup ($ev); 301 )->popup ($ev);
299 } else { 302 } else {
300 return 0; 303 return 0;
301 } 304 }
… …
318 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
319 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
320 } 323 }
321} 324}
322 325
326sub macro_send {
327 my ($self, $macro) = @_;
328
329 for my $cmd (@{ $macro->{action} }) {
330 $self->send_command ($cmd);
331 }
332}
333
323sub user_send { 334sub user_send {
324 my ($self, $command) = @_; 335 my ($self, $command) = @_;
325 336
326 push @{$self->{record}}, $command 337 $self->{record}->($command)
327 if $self->{record}; 338 if $self->{record};
328 339
329 $self->logprint ("send: ", $command); 340 $self->logprint ("send: ", $command);
330 $self->send_command ($command); 341 $self->send_command ($command);
331 ::status ($command); 342 ::status ($command);
332} 343}
333 344
334sub start_record { 345sub record {
335 my ($self) = @_; 346 my ($self, $cb) = @_;
336 347
337 $self->{record} = []; 348 $self->{record} = $cb;
338}
339
340sub stop_record {
341 my ($self) = @_;
342 return delete $self->{record};
343} 349}
344 350
345sub map_scroll { 351sub map_scroll {
346 my ($self, $dx, $dy) = @_; 352 my ($self, $dx, $dy) = @_;
347 353
… …
656 # try to create single paragraphs out of the multiple lines sent by the server 662 # try to create single paragraphs out of the multiple lines sent by the server
657 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 663 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
658 $spell->{message} =~ s/\n+$//; 664 $spell->{message} =~ s/\n+$//;
659 $spell->{message} ||= "Server did not provide a description for this spell."; 665 $spell->{message} ||= "Server did not provide a description for this spell.";
660 666
661 $::SPELL_PAGE->add_spell ($spell); 667 $::SPELL_LIST->add_spell ($spell);
662 668
663 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 669 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
664 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 670 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
665} 671}
666 672
667sub spell_delete { 673sub spell_delete {
668 my ($self, $spell) = @_; 674 my ($self, $spell) = @_;
669 675
670 $::SPELL_PAGE->remove_spell ($spell); 676 $::SPELL_LIST->remove_spell ($spell);
671} 677}
672 678
673sub setup { 679sub setup {
674 my ($self, $setup) = @_; 680 my ($self, $setup) = @_;
675 681
… …
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 899 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 900 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 901 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
896 . "map size $self->{mapw}×$self->{maph}\n" 902 . "map size $self->{mapw}×$self->{maph}\n"
897 ); 903 );
904
905 ::setup_build_button ($self->{editor_support}->{builder_ui});
898} 906}
899 907
900sub logged_in { 908sub logged_in {
901 my ($self) = @_; 909 my ($self) = @_;
902 910
… …
919 $self->update_server_info; 927 $self->update_server_info;
920 928
921 $self->send_command ("output-sync $::CFG->{output_sync}"); 929 $self->send_command ("output-sync $::CFG->{output_sync}");
922 $self->send_command ("output-count $::CFG->{output_count}"); 930 $self->send_command ("output-count $::CFG->{output_count}");
923 $self->send_command ("pickup $::CFG->{pickup}"); 931 $self->send_command ("pickup $::CFG->{pickup}");
932}
933
934sub buildat {
935 my ($self, $builditem, $x, $y) = @_;
936
937 if ($self->{cfplus_ext}) {
938 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
939 }
924} 940}
925 941
926sub lookat { 942sub lookat {
927 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
928 944
… …
971 kw => { hi => 0, yes => 0, no => 0 }, 987 kw => { hi => 0, yes => 0, no => 0 },
972 has_close_button => 1, 988 has_close_button => 1,
973 @_, 989 @_,
974 ); 990 );
975 991
976 Scalar::Util::weaken (my $this = $self); 992 CFPlus::weaken (my $this = $self);
977 993
978 $self->connect (delete => sub { $this->destroy; 1 }); 994 $self->connect (delete => sub { $this->destroy; 1 });
979 995
980 # better use a pane... 996 # better use a pane...
981 $self->add (my $hbox = new CFPlus::UI::HBox); 997 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1025}; 1041};
1026 1042
1027sub update_options { 1043sub update_options {
1028 my ($self) = @_; 1044 my ($self) = @_;
1029 1045
1030 Scalar::Util::weaken $self; 1046 CFPlus::weaken $self;
1031 1047
1032 $self->{options}->clear; 1048 $self->{options}->clear;
1033 $self->{options}->add ($self->{bye_button}); 1049 $self->{options}->add ($self->{bye_button});
1034 1050
1035 for my $kw (sort keys %{ $self->{kw} }) { 1051 for my $kw (sort keys %{ $self->{kw} }) {
… …
1044} 1060}
1045 1061
1046sub feed { 1062sub feed {
1047 my ($self, $msg) = @_; 1063 my ($self, $msg) = @_;
1048 1064
1049 Scalar::Util::weaken $self; 1065 CFPlus::weaken $self;
1050 1066
1051 if ($msg->{msgtype} eq "reply") { 1067 if ($msg->{msgtype} eq "reply") {
1052 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1068 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1053 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1069 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1054 1070

Diff Legend

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