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.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
… …
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 {
60 my ($self, @a) = @_; 63 my ($self, @a) = @_;
61 64
62 return;
63 $self->{log_fh} ||= do { 65 $self->{log_fh} ||= do {
64 my $path = "$Crossfire::VARDIR/log.$self->{host}"; 66 my $path = "$Crossfire::VARDIR/log.$self->{host}";
65 67
66 open my $fh, ">>:utf8", $path 68 open my $fh, ">>:utf8", $path
67 or die "Couldn't open logfile $path: $!"; 69 or die "Couldn't open logfile $path: $!";
… …
340} 342}
341 343
342sub feed_map1a { 344sub feed_map1a {
343 my ($self, $data) = @_; 345 my ($self, $data) = @_;
344 346
345 $self->{map}->map1a_update ($data); 347 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
346 $self->{map_widget}->update; 348 $self->{map_widget}->update;
347} 349}
348 350
349sub magicmap { 351sub magicmap {
350 my ($self, $w, $h, $x, $y, $data) = @_; 352 my ($self, $w, $h, $x, $y, $data) = @_;
… …
875 $::SERVER_INFO->set_markup ( 877 $::SERVER_INFO->set_markup (
876 "server <tt>$self->{host}:$self->{port}</tt>\n" 878 "server <tt>$self->{host}:$self->{port}</tt>\n"
877 . "protocol version <tt>$self->{version}</tt>\n" 879 . "protocol version <tt>$self->{version}</tt>\n"
878 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 880 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
879 . "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"
880 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 883 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
881 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 884 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
882 . "map size $self->{mapw}×$self->{maph}\n" 885 . "map size $self->{mapw}×$self->{maph}\n"
883 ); 886 );
884} 887}
… …
923} 926}
924 927
925sub destroy { 928sub destroy {
926 my ($self) = @_; 929 my ($self) = @_;
927 930
928 $self->{npc_dialog}->destroy 931 (delete $self->{npc_dialog})->destroy
929 if $self->{npc_dialog}; 932 if $self->{npc_dialog};
930 933
931 $self->SUPER::destroy; 934 $self->SUPER::destroy;
932} 935}
933 936

Diff Legend

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