--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/08/14 01:21:02	1.76
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/11/19 20:31:29	1.88
@@ -9,12 +9,14 @@
 use CFPlus::UI;
 use CFPlus::Pod;
 
+use Crossfire::Protocol::Base 0.95;
+
 use base 'Crossfire::Protocol::Base';
 
 sub new {
    my $class = shift;
 
-   my $self = $class->SUPER::new (@_);
+   my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
 
    $self->{map_widget}->clr_commands;
 
@@ -36,7 +38,7 @@
          sort { (length $a) <=> (length $b) }
             @args
   } sort { $a->{par} <=> $b->{par} }
-         CFPlus::Pod::find command_help => "*";
+         CFPlus::Pod::find command => "*";
 
   $self->{map_widget}->add_command (@$_)
      for @cmd_help;
@@ -44,14 +46,23 @@
    $self->{noface} = new_from_file CFPlus::Texture
       CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
 
+   {
+      $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
+         CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
+      $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+   }
+
    $self->{open_container} = 0;
 
    # "global"
-   $self->{tilecache} = CFPlus::db_table "tilecache";
-   $self->{facemap}   = CFPlus::db_table "facemap";
+   $self->{tilecache} = CFPlus::db_table "tilecache"
+      or die "tilecache: unable to open database table";
+   $self->{facemap}   = CFPlus::db_table "facemap"
+      or die "facemap: unable to open database table";
 
    # per server
-   $self->{mapcache}  = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";
+   $self->{mapcache}  = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
+      or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
 
    $self
 }
@@ -312,9 +323,8 @@
 sub user_send {
    my ($self, $command) = @_;
 
-   if ($self->{record}) {
-      push @{$self->{record}}, $command;
-   }
+   push @{$self->{record}}, $command
+      if $self->{record};
 
    $self->logprint ("send: ", $command);
    $self->send_command ($command);
@@ -341,7 +351,7 @@
 sub feed_map1a {
    my ($self, $data) = @_;
 
-   $self->{map}->map1a_update ($data);
+   $self->{map}->map1a_update ($data, $self->{setup}{extmap});
    $self->{map_widget}->update;
 }
 
@@ -616,8 +626,6 @@
 
    $self->logprint ("info: ", $text);
 
-   my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
-
    # try to create single paragraphs of multiple lines sent by the server
    $text =~ s/(?<=\S)\n(?=\w)/ /g;
 
@@ -625,9 +633,8 @@
    $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
    $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
 
-   $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
-      for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
-   $self->{logview}->scroll_to_bottom;
+   ::message ({ fg => $color[$color], markup => $_ })
+      for split /\n/, $text;
 
    $self->{statusbox}->add ($text,
       group        => $text,
@@ -651,7 +658,7 @@
    $spell->{message} =~ s/\n+$//;
    $spell->{message} ||= "Server did not provide a description for this spell.";
 
-   $::SPELL_PAGE->add_spell ($spell);
+   $::SPELL_LIST->add_spell ($spell);
 
    $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
    $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
@@ -660,7 +667,13 @@
 sub spell_delete {
    my ($self, $spell) = @_;
 
-   $::SPELL_PAGE->remove_spell ($spell);
+   $::SPELL_LIST->remove_spell ($spell);
+}
+
+sub setup {
+   my ($self, $setup) = @_;
+
+   $::MAP->resize ($self->{mapw}, $self->{maph});
 }
 
 sub addme_success {
@@ -876,6 +889,8 @@
     . "protocol version <tt>$self->{version}</tt>\n"
     . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
     . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
+    . "editing support $yesno[!!$self->{editor_support}]\n"
+    . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
     . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
       . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
     . "map size $self->{mapw}×$self->{maph}\n"
@@ -889,6 +904,15 @@
       $self->{cfplus_ext} = $_[0]{version};
       $self->update_server_info;
 
+      if ($self->{cfplus_ext} >= 2) {
+         $self->send_ext_req ("editor_support", sub {
+            $self->{editor_support} = $_[0];
+            $self->update_server_info;
+
+            0
+         });
+      }
+
       0
    });
 
@@ -924,7 +948,7 @@
 sub destroy {
    my ($self) = @_;
 
-   $self->{npc_dialog}->destroy
+   (delete $self->{npc_dialog})->destroy
       if $self->{npc_dialog};
 
    $self->SUPER::destroy;
@@ -1083,3 +1107,4 @@
 }
 
 1
+