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.75 by root, Sun Aug 13 19:47:05 2006 UTC vs.
Revision 1.81 by root, Sat Aug 19 02:49:55 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 => 0 });
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 $self->{open_container} = 0; 47 $self->{open_container} = 0;
48 48
49 # "global" 49 # "global"
50 $self->{tilecache} = CFPlus::db_table "tilecache"; 50 $self->{tilecache} = CFPlus::db_table "tilecache"
51 or die "tilecache: unable to open database table";
51 $self->{facemap} = CFPlus::db_table "facemap"; 52 $self->{facemap} = CFPlus::db_table "facemap"
53 or die "facemap: unable to open database table";
52 54
53 # per server 55 # per server
54 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 56 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
57 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
55 58
56 $self 59 $self
57} 60}
58 61
59sub logprint { 62sub logprint {
… …
339} 342}
340 343
341sub feed_map1a { 344sub feed_map1a {
342 my ($self, $data) = @_; 345 my ($self, $data) = @_;
343 346
344 $self->{map}->map1a_update ($data); 347 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
345 $self->{map_widget}->update; 348 $self->{map_widget}->update;
346} 349}
347 350
348sub magicmap { 351sub magicmap {
349 my ($self, $w, $h, $x, $y, $data) = @_; 352 my ($self, $w, $h, $x, $y, $data) = @_;
… …
874 $::SERVER_INFO->set_markup ( 877 $::SERVER_INFO->set_markup (
875 "server <tt>$self->{host}:$self->{port}</tt>\n" 878 "server <tt>$self->{host}:$self->{port}</tt>\n"
876 . "protocol version <tt>$self->{version}</tt>\n" 879 . "protocol version <tt>$self->{version}</tt>\n"
877 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 880 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
878 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 881 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
882 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
879 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 883 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
880 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 884 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
881 . "map size $self->{mapw}×$self->{maph}\n" 885 . "map size $self->{mapw}×$self->{maph}\n"
882 ); 886 );
883} 887}
… …
922} 926}
923 927
924sub destroy { 928sub destroy {
925 my ($self) = @_; 929 my ($self) = @_;
926 930
927 $self->{npc_dialog}->destroy 931 (delete $self->{npc_dialog})->destroy
928 if $self->{npc_dialog}; 932 if $self->{npc_dialog};
929 933
930 $self->SUPER::destroy; 934 $self->SUPER::destroy;
931} 935}
932 936
933package CFPlus::NPCDialog; 937package CFPlus::NPCDialog;
934 938
935our @ISA = 'CFPlus::UI::FancyFrame'; 939our @ISA = 'CFPlus::UI::Toplevel';
936 940
937sub new { 941sub new {
938 my $class = shift; 942 my $class = shift;
939 943
940 my $self = $class->SUPER::new ( 944 my $self = $class->SUPER::new (

Diff Legend

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