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.78 by elmex, Mon Aug 14 14:35:31 2006 UTC vs.
Revision 1.91 by root, Sat Dec 9 02:21:25 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;
13
14use Crossfire::Protocol::Base 0.95;
11 15
12use base 'Crossfire::Protocol::Base'; 16use base 'Crossfire::Protocol::Base';
13 17
14sub new { 18sub new {
15 my $class = shift; 19 my $class = shift;
16 20
17 my $self = $class->SUPER::new (@_); 21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
18 22
19 $self->{map_widget}->clr_commands; 23 $self->{map_widget}->clr_commands;
20 24
21 my @cmd_help = map { 25 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
42 for @cmd_help; 46 for @cmd_help;
43 47
44 $self->{noface} = new_from_file CFPlus::Texture 48 $self->{noface} = new_from_file CFPlus::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
46 50
51 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 }
56
47 $self->{open_container} = 0; 57 $self->{open_container} = 0;
48 58
49 # "global" 59 # "global"
50 $self->{tilecache} = CFPlus::db_table "tilecache"; 60 $self->{tilecache} = CFPlus::db_table "tilecache"
61 or die "tilecache: unable to open database table";
51 $self->{facemap} = CFPlus::db_table "facemap"; 62 $self->{facemap} = CFPlus::db_table "facemap"
63 or die "facemap: unable to open database table";
52 64
53 # per server 65 # per server
54 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
55 68
56 $self 69 $self
57} 70}
58 71
59sub logprint { 72sub logprint {
60 my ($self, @a) = @_; 73 my ($self, @a) = @_;
61 74
62 return;
63 $self->{log_fh} ||= do { 75 $self->{log_fh} ||= do {
64 my $path = "$Crossfire::VARDIR/log.$self->{host}"; 76 my $path = "$Crossfire::VARDIR/log.$self->{host}";
65 77
66 open my $fh, ">>:utf8", $path 78 open my $fh, ">>:utf8", $path
67 or die "Couldn't open logfile $path: $!"; 79 or die "Couldn't open logfile $path: $!";
… …
278 if ($ev->{button} == 1) { 290 if ($ev->{button} == 1) {
279 $::CONN->user_send ("ready_skill $name"); 291 $::CONN->user_send ("ready_skill $name");
280 } elsif ($ev->{button} == 2) { 292 } elsif ($ev->{button} == 2) {
281 $::CONN->user_send ("use_skill $name"); 293 $::CONN->user_send ("use_skill $name");
282 } elsif ($ev->{button} == 3) { 294 } elsif ($ev->{button} == 3) {
295 my $shortname = CFPlus::shorten $name, 14;
283 (new CFPlus::UI::Menu 296 (new CFPlus::UI::Menu
284 items => [ 297 items => [
285 ["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"] }],
286 ["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"] }],
287 ], 300 ],
288 )->popup ($ev); 301 )->popup ($ev);
289 } else { 302 } else {
290 return 0; 303 return 0;
291 } 304 }
… …
308 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
309 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
310 } 323 }
311} 324}
312 325
326sub macro_send {
327 my ($self, $macro) = @_;
328
329 for my $cmd (@{ $macro->{action} }) {
330 $self->send_command ($cmd);
331 }
332}
333
313sub user_send { 334sub user_send {
314 my ($self, $command) = @_; 335 my ($self, $command) = @_;
315 336
337 $self->{record}->($command)
316 if ($self->{record}) { 338 if $self->{record};
317 push @{$self->{record}}, $command;
318 }
319 339
320 $self->logprint ("send: ", $command); 340 $self->logprint ("send: ", $command);
321 $self->send_command ($command); 341 $self->send_command ($command);
322 ::status ($command); 342 ::status ($command);
323} 343}
324 344
325sub start_record { 345sub record {
326 my ($self) = @_; 346 my ($self, $cb) = @_;
327 347
328 $self->{record} = []; 348 $self->{record} = $cb;
329}
330
331sub stop_record {
332 my ($self) = @_;
333 return delete $self->{record};
334} 349}
335 350
336sub map_scroll { 351sub map_scroll {
337 my ($self, $dx, $dy) = @_; 352 my ($self, $dx, $dy) = @_;
338 353
… …
340} 355}
341 356
342sub feed_map1a { 357sub feed_map1a {
343 my ($self, $data) = @_; 358 my ($self, $data) = @_;
344 359
345 $self->{map}->map1a_update ($data); 360 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
346 $self->{map_widget}->update; 361 $self->{map_widget}->update;
347} 362}
348 363
349sub magicmap { 364sub magicmap {
350 my ($self, $w, $h, $x, $y, $data) = @_; 365 my ($self, $w, $h, $x, $y, $data) = @_;
… …
615 [0.74, 0.65, 0.41], 630 [0.74, 0.65, 0.41],
616 ); 631 );
617 632
618 $self->logprint ("info: ", $text); 633 $self->logprint ("info: ", $text);
619 634
620 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
621
622 # try to create single paragraphs of multiple lines sent by the server 635 # try to create single paragraphs of multiple lines sent by the server
623 $text =~ s/(?<=\S)\n(?=\w)/ /g; 636 $text =~ s/(?<=\S)\n(?=\w)/ /g;
624 637
625 $text = CFPlus::asxml $text; 638 $text = CFPlus::asxml $text;
626 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 639 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
627 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 640 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
628 641
629 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 642 ::message ({ fg => $color[$color], markup => $_ })
630 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 643 for split /\n/, $text;
631 $self->{logview}->scroll_to_bottom;
632 644
633 $self->{statusbox}->add ($text, 645 $self->{statusbox}->add ($text,
634 group => $text, 646 group => $text,
635 fg => $color[$color], 647 fg => $color[$color],
636 timeout => $color >= 2 ? 180 : 10, 648 timeout => $color >= 2 ? 180 : 10,
… …
650 # 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
651 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 663 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
652 $spell->{message} =~ s/\n+$//; 664 $spell->{message} =~ s/\n+$//;
653 $spell->{message} ||= "Server did not provide a description for this spell."; 665 $spell->{message} ||= "Server did not provide a description for this spell.";
654 666
655 $::SPELL_PAGE->add_spell ($spell); 667 $::SPELL_LIST->add_spell ($spell);
656 668
657 $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});
658 $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});
659} 671}
660 672
661sub spell_delete { 673sub spell_delete {
662 my ($self, $spell) = @_; 674 my ($self, $spell) = @_;
663 675
664 $::SPELL_PAGE->remove_spell ($spell); 676 $::SPELL_LIST->remove_spell ($spell);
677}
678
679sub setup {
680 my ($self, $setup) = @_;
681
682 $::MAP->resize ($self->{mapw}, $self->{maph});
665} 683}
666 684
667sub addme_success { 685sub addme_success {
668 my ($self) = @_; 686 my ($self) = @_;
669 687
… …
875 $::SERVER_INFO->set_markup ( 893 $::SERVER_INFO->set_markup (
876 "server <tt>$self->{host}:$self->{port}</tt>\n" 894 "server <tt>$self->{host}:$self->{port}</tt>\n"
877 . "protocol version <tt>$self->{version}</tt>\n" 895 . "protocol version <tt>$self->{version}</tt>\n"
878 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 896 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
879 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 897 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
898 . "editing support $yesno[!!$self->{editor_support}]\n"
899 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
880 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 900 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
881 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 901 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
882 . "map size $self->{mapw}×$self->{maph}\n" 902 . "map size $self->{mapw}×$self->{maph}\n"
883 ); 903 );
904
905 ::setup_build_button ($self->{editor_support}->{builder_ui});
884} 906}
885 907
886sub logged_in { 908sub logged_in {
887 my ($self) = @_; 909 my ($self) = @_;
888 910
889 $self->send_ext_req (cfplus_support => version => 1, sub { 911 $self->send_ext_req (cfplus_support => version => 1, sub {
890 $self->{cfplus_ext} = $_[0]{version}; 912 $self->{cfplus_ext} = $_[0]{version};
891 $self->update_server_info; 913 $self->update_server_info;
892 914
915 if ($self->{cfplus_ext} >= 2) {
916 $self->send_ext_req ("editor_support", sub {
917 $self->{editor_support} = $_[0];
918 $self->update_server_info;
919
920 0
921 });
922 }
923
893 0 924 0
894 }); 925 });
895 926
896 $self->update_server_info; 927 $self->update_server_info;
897 928
898 $self->send_command ("output-sync $::CFG->{output_sync}"); 929 $self->send_command ("output-sync $::CFG->{output_sync}");
899 $self->send_command ("output-count $::CFG->{output_count}"); 930 $self->send_command ("output-count $::CFG->{output_count}");
900 $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 }
901} 940}
902 941
903sub lookat { 942sub lookat {
904 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
905 944
… …
923} 962}
924 963
925sub destroy { 964sub destroy {
926 my ($self) = @_; 965 my ($self) = @_;
927 966
928 $self->{npc_dialog}->destroy 967 (delete $self->{npc_dialog})->destroy
929 if $self->{npc_dialog}; 968 if $self->{npc_dialog};
930 969
931 $self->SUPER::destroy; 970 $self->SUPER::destroy;
932} 971}
933 972
… …
1082 1121
1083 $self->SUPER::destroy; 1122 $self->SUPER::destroy;
1084} 1123}
1085 1124
10861 11251
1126

Diff Legend

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