--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/08/13 02:43:22	1.72
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/10/01 11:53:59	1.85
@@ -14,7 +14,7 @@
 sub new {
    my $class = shift;
 
-   my $self = $class->SUPER::new (@_);
+   my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
 
    $self->{map_widget}->clr_commands;
 
@@ -35,7 +35,8 @@
       map ["$cmd$_", $text],
          sort { (length $a) <=> (length $b) }
             @args
-  } CFPlus::Pod::find command_help => "*";
+  } sort { $a->{par} <=> $b->{par} }
+         CFPlus::Pod::find command => "*";
 
   $self->{map_widget}->add_command (@$_)
      for @cmd_help;
@@ -43,14 +44,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
 }
@@ -260,7 +270,6 @@
 
       my @TOOLTIP_LVL  = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
       my @TOOLTIP_EXP  = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
-      my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
 
       my ($x, $y) = (0, 1);
       for (
@@ -296,7 +305,8 @@
             text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
          $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
             text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
-         $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
+         $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
+                      can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
 
          $x++ and ($x, $y) = (0, $y + 1);
       }
@@ -340,7 +350,7 @@
 sub feed_map1a {
    my ($self, $data) = @_;
 
-   $self->{map}->map1a_update ($data);
+   $self->{map}->map1a_update ($data, $self->{setup}{extmap});
    $self->{map_widget}->update;
 }
 
@@ -875,6 +885,9 @@
     . "protocol version <tt>$self->{version}</tt>\n"
     . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
     . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
+    . "editor support $yesno[!!length $self->{cvs_root}]\n"
+    . "test server " . (length $self->{test_server} ? $self->{test_server} : $yesno[0]) . "\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"
@@ -888,6 +901,17 @@
       $self->{cfplus_ext} = $_[0]{version};
       $self->update_server_info;
 
+      if ($self->{cfplus_ext} >= 2) {
+         $self->send_ext_req ("editor_support", sub {
+            $self->{cvs_root}    = $_[0]{cvs_root};
+            $self->{upload}      = $_[0]{upload};
+            $self->{test_server} = $_[0]{server};
+            $self->update_server_info;
+
+            0
+         });
+      }
+
       0
    });
 
@@ -923,7 +947,7 @@
 sub destroy {
    my ($self) = @_;
 
-   $self->{npc_dialog}->destroy
+   (delete $self->{npc_dialog})->destroy
       if $self->{npc_dialog};
 
    $self->SUPER::destroy;
@@ -931,7 +955,7 @@
 
 package CFPlus::NPCDialog;
 
-our @ISA = 'CFPlus::UI::FancyFrame';
+our @ISA = 'CFPlus::UI::Toplevel';
 
 sub new {
    my $class = shift;
@@ -960,11 +984,7 @@
 
    $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
    $vbox->add ($self->{entry} = new CFPlus::UI::Entry
-      tooltip     => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
-                   . "Sometimes you have to tell an NPC something you cannot find out during "
-                   . "a normal conversation (such as a password). In those cases you have to use "
-                   . "this text entry. You can also enter responses manually instead of using the response "
-                   . "buttons below.",
+      tooltip     => "#npc_message_entry",
       on_activate => sub {
          my ($entry, $text) = @_;
 
@@ -1049,7 +1069,7 @@
                $self->send ($kw);
             };
 
-         chr 0xfffc
+         "\x{fffc}"
       }giex;
       
       $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
@@ -1086,3 +1106,4 @@
 }
 
 1
+