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.74 by root, Sun Aug 13 18:48:56 2006 UTC vs.
Revision 1.85 by root, Sun Oct 1 11:53:59 2006 UTC

… …
12use base 'Crossfire::Protocol::Base'; 12use base 'Crossfire::Protocol::Base';
13 13
14sub new { 14sub new {
15 my $class = shift; 15 my $class = shift;
16 16
17 my $self = $class->SUPER::new (@_); 17 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
18 18
19 $self->{map_widget}->clr_commands; 19 $self->{map_widget}->clr_commands;
20 20
21 my @cmd_help = map { 21 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
34 34
35 map ["$cmd$_", $text], 35 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 36 sort { (length $a) <=> (length $b) }
37 @args 37 @args
38 } sort { $a->{par} <=> $b->{par} } 38 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command_help => "*"; 39 CFPlus::Pod::find command => "*";
40 40
41 $self->{map_widget}->add_command (@$_) 41 $self->{map_widget}->add_command (@$_)
42 for @cmd_help; 42 for @cmd_help;
43 43
44 $self->{noface} = new_from_file CFPlus::Texture 44 $self->{noface} = new_from_file CFPlus::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
46 46
47 {
48 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
50 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
51 }
52
47 $self->{open_container} = 0; 53 $self->{open_container} = 0;
48 54
49 # "global" 55 # "global"
50 $self->{tilecache} = CFPlus::db_table "tilecache"; 56 $self->{tilecache} = CFPlus::db_table "tilecache"
57 or die "tilecache: unable to open database table";
51 $self->{facemap} = CFPlus::db_table "facemap"; 58 $self->{facemap} = CFPlus::db_table "facemap"
59 or die "facemap: unable to open database table";
52 60
53 # per server 61 # per server
54 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 62 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
63 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
55 64
56 $self 65 $self
57} 66}
58 67
59sub logprint { 68sub logprint {
… …
339} 348}
340 349
341sub feed_map1a { 350sub feed_map1a {
342 my ($self, $data) = @_; 351 my ($self, $data) = @_;
343 352
344 $self->{map}->map1a_update ($data); 353 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
345 $self->{map_widget}->update; 354 $self->{map_widget}->update;
346} 355}
347 356
348sub magicmap { 357sub magicmap {
349 my ($self, $w, $h, $x, $y, $data) = @_; 358 my ($self, $w, $h, $x, $y, $data) = @_;
… …
874 $::SERVER_INFO->set_markup ( 883 $::SERVER_INFO->set_markup (
875 "server <tt>$self->{host}:$self->{port}</tt>\n" 884 "server <tt>$self->{host}:$self->{port}</tt>\n"
876 . "protocol version <tt>$self->{version}</tt>\n" 885 . "protocol version <tt>$self->{version}</tt>\n"
877 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 886 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
878 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 887 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
888 . "editor support $yesno[!!length $self->{cvs_root}]\n"
889 . "test server " . (length $self->{test_server} ? $self->{test_server} : $yesno[0]) . "\n"
890 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
879 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 891 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
880 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 892 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
881 . "map size $self->{mapw}×$self->{maph}\n" 893 . "map size $self->{mapw}×$self->{maph}\n"
882 ); 894 );
883} 895}
… …
886 my ($self) = @_; 898 my ($self) = @_;
887 899
888 $self->send_ext_req (cfplus_support => version => 1, sub { 900 $self->send_ext_req (cfplus_support => version => 1, sub {
889 $self->{cfplus_ext} = $_[0]{version}; 901 $self->{cfplus_ext} = $_[0]{version};
890 $self->update_server_info; 902 $self->update_server_info;
903
904 if ($self->{cfplus_ext} >= 2) {
905 $self->send_ext_req ("editor_support", sub {
906 $self->{cvs_root} = $_[0]{cvs_root};
907 $self->{upload} = $_[0]{upload};
908 $self->{test_server} = $_[0]{server};
909 $self->update_server_info;
910
911 0
912 });
913 }
891 914
892 0 915 0
893 }); 916 });
894 917
895 $self->update_server_info; 918 $self->update_server_info;
… …
922} 945}
923 946
924sub destroy { 947sub destroy {
925 my ($self) = @_; 948 my ($self) = @_;
926 949
927 $self->{npc_dialog}->destroy 950 (delete $self->{npc_dialog})->destroy
928 if $self->{npc_dialog}; 951 if $self->{npc_dialog};
929 952
930 $self->SUPER::destroy; 953 $self->SUPER::destroy;
931} 954}
932 955
933package CFPlus::NPCDialog; 956package CFPlus::NPCDialog;
934 957
935our @ISA = 'CFPlus::UI::FancyFrame'; 958our @ISA = 'CFPlus::UI::Toplevel';
936 959
937sub new { 960sub new {
938 my $class = shift; 961 my $class = shift;
939 962
940 my $self = $class->SUPER::new ( 963 my $self = $class->SUPER::new (
… …
1044 padding_y => 0, 1067 padding_y => 0,
1045 on_button_up => sub { 1068 on_button_up => sub {
1046 $self->send ($kw); 1069 $self->send ($kw);
1047 }; 1070 };
1048 1071
1049 chr 0xfffc 1072 "\x{fffc}"
1050 }giex; 1073 }giex;
1051 1074
1052 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1075 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1053 $self->{textview}->scroll_to_bottom; 1076 $self->{textview}->scroll_to_bottom;
1054 $self->update_options; 1077 $self->update_options;
… …
1081 1104
1082 $self->SUPER::destroy; 1105 $self->SUPER::destroy;
1083} 1106}
1084 1107
10851 11081
1109

Diff Legend

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