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.87 by root, Tue Nov 7 22:41:27 2006 UTC

… …
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::UI; 9use CFPlus::UI;
10use CFPlus::Pod; 10use CFPlus::Pod;
11 11
12use Crossfire::Protocol::Base 0.95;
13
12use base 'Crossfire::Protocol::Base'; 14use base 'Crossfire::Protocol::Base';
13 15
14sub new { 16sub new {
15 my $class = shift; 17 my $class = shift;
16 18
17 my $self = $class->SUPER::new (@_); 19 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
18 20
19 $self->{map_widget}->clr_commands; 21 $self->{map_widget}->clr_commands;
20 22
21 my @cmd_help = map { 23 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 24 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
42 for @cmd_help; 44 for @cmd_help;
43 45
44 $self->{noface} = new_from_file CFPlus::Texture 46 $self->{noface} = new_from_file CFPlus::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
46 48
49 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 }
54
47 $self->{open_container} = 0; 55 $self->{open_container} = 0;
48 56
49 # "global" 57 # "global"
50 $self->{tilecache} = CFPlus::db_table "tilecache"; 58 $self->{tilecache} = CFPlus::db_table "tilecache"
59 or die "tilecache: unable to open database table";
51 $self->{facemap} = CFPlus::db_table "facemap"; 60 $self->{facemap} = CFPlus::db_table "facemap"
61 or die "facemap: unable to open database table";
52 62
53 # per server 63 # per server
54 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
55 66
56 $self 67 $self
57} 68}
58 69
59sub logprint { 70sub logprint {
60 my ($self, @a) = @_; 71 my ($self, @a) = @_;
61 72
62 return;
63 $self->{log_fh} ||= do { 73 $self->{log_fh} ||= do {
64 my $path = "$Crossfire::VARDIR/log.$self->{host}"; 74 my $path = "$Crossfire::VARDIR/log.$self->{host}";
65 75
66 open my $fh, ">>:utf8", $path 76 open my $fh, ">>:utf8", $path
67 or die "Couldn't open logfile $path: $!"; 77 or die "Couldn't open logfile $path: $!";
… …
311} 321}
312 322
313sub user_send { 323sub user_send {
314 my ($self, $command) = @_; 324 my ($self, $command) = @_;
315 325
316 if ($self->{record}) {
317 push @{$self->{record}}, $command; 326 push @{$self->{record}}, $command
318 } 327 if $self->{record};
319 328
320 $self->logprint ("send: ", $command); 329 $self->logprint ("send: ", $command);
321 $self->send_command ($command); 330 $self->send_command ($command);
322 ::status ($command); 331 ::status ($command);
323} 332}
… …
340} 349}
341 350
342sub feed_map1a { 351sub feed_map1a {
343 my ($self, $data) = @_; 352 my ($self, $data) = @_;
344 353
345 $self->{map}->map1a_update ($data); 354 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
346 $self->{map_widget}->update; 355 $self->{map_widget}->update;
347} 356}
348 357
349sub magicmap { 358sub magicmap {
350 my ($self, $w, $h, $x, $y, $data) = @_; 359 my ($self, $w, $h, $x, $y, $data) = @_;
… …
615 [0.74, 0.65, 0.41], 624 [0.74, 0.65, 0.41],
616 ); 625 );
617 626
618 $self->logprint ("info: ", $text); 627 $self->logprint ("info: ", $text);
619 628
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 629 # try to create single paragraphs of multiple lines sent by the server
623 $text =~ s/(?<=\S)\n(?=\w)/ /g; 630 $text =~ s/(?<=\S)\n(?=\w)/ /g;
624 631
625 $text = CFPlus::asxml $text; 632 $text = CFPlus::asxml $text;
626 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 633 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
627 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 634 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
628 635
629 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 636 ::message ({ fg => $color[$color], markup => $_ })
630 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 637 for split /\n/, $text;
631 $self->{logview}->scroll_to_bottom;
632 638
633 $self->{statusbox}->add ($text, 639 $self->{statusbox}->add ($text,
634 group => $text, 640 group => $text,
635 fg => $color[$color], 641 fg => $color[$color],
636 timeout => $color >= 2 ? 180 : 10, 642 timeout => $color >= 2 ? 180 : 10,
… …
660 666
661sub spell_delete { 667sub spell_delete {
662 my ($self, $spell) = @_; 668 my ($self, $spell) = @_;
663 669
664 $::SPELL_PAGE->remove_spell ($spell); 670 $::SPELL_PAGE->remove_spell ($spell);
671}
672
673sub setup {
674 my ($self, $setup) = @_;
675
676 $::MAP->resize ($self->{mapw}, $self->{maph});
665} 677}
666 678
667sub addme_success { 679sub addme_success {
668 my ($self) = @_; 680 my ($self) = @_;
669 681
… …
875 $::SERVER_INFO->set_markup ( 887 $::SERVER_INFO->set_markup (
876 "server <tt>$self->{host}:$self->{port}</tt>\n" 888 "server <tt>$self->{host}:$self->{port}</tt>\n"
877 . "protocol version <tt>$self->{version}</tt>\n" 889 . "protocol version <tt>$self->{version}</tt>\n"
878 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
879 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
880 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
881 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
882 . "map size $self->{mapw}×$self->{maph}\n" 896 . "map size $self->{mapw}×$self->{maph}\n"
883 ); 897 );
884} 898}
… …
887 my ($self) = @_; 901 my ($self) = @_;
888 902
889 $self->send_ext_req (cfplus_support => version => 1, sub { 903 $self->send_ext_req (cfplus_support => version => 1, sub {
890 $self->{cfplus_ext} = $_[0]{version}; 904 $self->{cfplus_ext} = $_[0]{version};
891 $self->update_server_info; 905 $self->update_server_info;
906
907 if ($self->{cfplus_ext} >= 2) {
908 $self->send_ext_req ("editor_support", sub {
909 $self->{editor_support} = $_[0];
910 $self->update_server_info;
911
912 0
913 });
914 }
892 915
893 0 916 0
894 }); 917 });
895 918
896 $self->update_server_info; 919 $self->update_server_info;
… …
923} 946}
924 947
925sub destroy { 948sub destroy {
926 my ($self) = @_; 949 my ($self) = @_;
927 950
928 $self->{npc_dialog}->destroy 951 (delete $self->{npc_dialog})->destroy
929 if $self->{npc_dialog}; 952 if $self->{npc_dialog};
930 953
931 $self->SUPER::destroy; 954 $self->SUPER::destroy;
932} 955}
933 956
… …
1082 1105
1083 $self->SUPER::destroy; 1106 $self->SUPER::destroy;
1084} 1107}
1085 1108
10861 11091
1110

Diff Legend

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