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.73 by root, Sun Aug 13 15:14:17 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
… …
33 for @args; 35 for @args;
34 36
35 map ["$cmd$_", $text], 37 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 38 sort { (length $a) <=> (length $b) }
37 @args 39 @args
40 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 41 CFPlus::Pod::find command => "*";
39 42
40 $self->{map_widget}->add_command (@$_) 43 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 44 for @cmd_help;
42 45
43 $self->{noface} = new_from_file CFPlus::Texture 46 $self->{noface} = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
45 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
46 $self->{open_container} = 0; 55 $self->{open_container} = 0;
47 56
48 # "global" 57 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache"; 58 $self->{tilecache} = CFPlus::db_table "tilecache"
59 or die "tilecache: unable to open database table";
50 $self->{facemap} = CFPlus::db_table "facemap"; 60 $self->{facemap} = CFPlus::db_table "facemap"
61 or die "facemap: unable to open database table";
51 62
52 # per server 63 # per server
53 $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";
54 66
55 $self 67 $self
56} 68}
57 69
58sub logprint { 70sub logprint {
… …
258 270
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 271 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 272
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 273 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
262 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 274 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 275
265 my ($x, $y) = (0, 1); 276 my ($x, $y) = (0, 1);
266 for ( 277 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 278 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 279 map [$_, $self->{skill_info}{$_}],
… …
294 305
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 306 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 307 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 308 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 309 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 310 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
311 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
300 312
301 $x++ and ($x, $y) = (0, $y + 1); 313 $x++ and ($x, $y) = (0, $y + 1);
302 } 314 }
303 } 315 }
304 316
… …
309} 321}
310 322
311sub user_send { 323sub user_send {
312 my ($self, $command) = @_; 324 my ($self, $command) = @_;
313 325
314 if ($self->{record}) {
315 push @{$self->{record}}, $command; 326 push @{$self->{record}}, $command
316 } 327 if $self->{record};
317 328
318 $self->logprint ("send: ", $command); 329 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 330 $self->send_command ($command);
320 ::status ($command); 331 ::status ($command);
321} 332}
… …
338} 349}
339 350
340sub feed_map1a { 351sub feed_map1a {
341 my ($self, $data) = @_; 352 my ($self, $data) = @_;
342 353
343 $self->{map}->map1a_update ($data); 354 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 355 $self->{map_widget}->update;
345} 356}
346 357
347sub magicmap { 358sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 359 my ($self, $w, $h, $x, $y, $data) = @_;
… …
613 [0.74, 0.65, 0.41], 624 [0.74, 0.65, 0.41],
614 ); 625 );
615 626
616 $self->logprint ("info: ", $text); 627 $self->logprint ("info: ", $text);
617 628
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
619
620 # 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
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 630 $text =~ s/(?<=\S)\n(?=\w)/ /g;
622 631
623 $text = CFPlus::asxml $text; 632 $text = CFPlus::asxml $text;
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 633 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 634 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 635
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 636 ::message ({ fg => $color[$color], markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 637 for split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630 638
631 $self->{statusbox}->add ($text, 639 $self->{statusbox}->add ($text,
632 group => $text, 640 group => $text,
633 fg => $color[$color], 641 fg => $color[$color],
634 timeout => $color >= 2 ? 180 : 10, 642 timeout => $color >= 2 ? 180 : 10,
… …
658 666
659sub spell_delete { 667sub spell_delete {
660 my ($self, $spell) = @_; 668 my ($self, $spell) = @_;
661 669
662 $::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});
663} 677}
664 678
665sub addme_success { 679sub addme_success {
666 my ($self) = @_; 680 my ($self) = @_;
667 681
… …
873 $::SERVER_INFO->set_markup ( 887 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 888 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 889 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "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"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 896 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 897 );
882} 898}
… …
885 my ($self) = @_; 901 my ($self) = @_;
886 902
887 $self->send_ext_req (cfplus_support => version => 1, sub { 903 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 904 $self->{cfplus_ext} = $_[0]{version};
889 $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 }
890 915
891 0 916 0
892 }); 917 });
893 918
894 $self->update_server_info; 919 $self->update_server_info;
… …
921} 946}
922 947
923sub destroy { 948sub destroy {
924 my ($self) = @_; 949 my ($self) = @_;
925 950
926 $self->{npc_dialog}->destroy 951 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 952 if $self->{npc_dialog};
928 953
929 $self->SUPER::destroy; 954 $self->SUPER::destroy;
930} 955}
931 956
932package CFPlus::NPCDialog; 957package CFPlus::NPCDialog;
933 958
934our @ISA = 'CFPlus::UI::FancyFrame'; 959our @ISA = 'CFPlus::UI::Toplevel';
935 960
936sub new { 961sub new {
937 my $class = shift; 962 my $class = shift;
938 963
939 my $self = $class->SUPER::new ( 964 my $self = $class->SUPER::new (
… …
1043 padding_y => 0, 1068 padding_y => 0,
1044 on_button_up => sub { 1069 on_button_up => sub {
1045 $self->send ($kw); 1070 $self->send ($kw);
1046 }; 1071 };
1047 1072
1048 chr 0xfffc 1073 "\x{fffc}"
1049 }giex; 1074 }giex;
1050 1075
1051 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1076 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1052 $self->{textview}->scroll_to_bottom; 1077 $self->{textview}->scroll_to_bottom;
1053 $self->update_options; 1078 $self->update_options;
… …
1080 1105
1081 $self->SUPER::destroy; 1106 $self->SUPER::destroy;
1082} 1107}
1083 1108
10841 11091
1110

Diff Legend

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