--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/08/02 22:00:46	1.71
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/08/13 18:48:56	1.74
@@ -18,34 +18,28 @@
 
    $self->{map_widget}->clr_commands;
 
-   my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub {
-      my ($pom) = @_;
+   my @cmd_help = map {
+      $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
+         or die "unparseable command help: $_->{kw}[0]";
+
+      my $cmd = $1;
+      my @args = split /\|/, $2;
+      @args = (".*") unless @args;
+
+      my (undef, @par) = CFPlus::Pod::section_of $_;
+      my $text = CFPlus::Pod::as_label @par;
+
+      $_ = $_ eq ".*" ? "" : " $_"
+         for @args;
+
+      map ["$cmd$_", $text],
+         sort { (length $a) <=> (length $b) }
+            @args
+  } sort { $a->{par} <=> $b->{par} }
+         CFPlus::Pod::find command_help => "*";
 
-      my @cmd_help;
-
-      for my $head2 ($pom->head1->[-2]->head2) {
-         $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
-            or next;
-
-         my $cmd = $1;
-         my @args = split /\|/, $2;
-         @args = (".*") unless @args;
-
-         $_ = $_ eq ".*" ? "" : " $_"
-            for @args;
-
-         my $text = CFPlus::Pod::as_markup $head2->content;
-
-         push @cmd_help, ["$cmd$_", $text]
-            for sort { (length $a) <=> (length $b) }
-                     @args;
-      }
-
-      \@cmd_help
-   };
-
-   $self->{map_widget}->add_command (@$_)
-      for @$cmd_help;
+  $self->{map_widget}->add_command (@$_)
+     for @cmd_help;
 
    $self->{noface} = new_from_file CFPlus::Texture
       CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
@@ -267,7 +261,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 (
@@ -303,7 +296,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);
       }
@@ -672,25 +666,20 @@
 sub addme_success {
    my ($self) = @_;
 
-   my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
-      my ($pom) = @_;
-
-      my %skill_help;
-
-      for my $head2 ($pom->head1->[3]->head2) {
-         $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content;
-      }
+   my %skill_help;
 
-      \%skill_help
+   for my $node (CFPlus::Pod::find skill_description => "*") {
+      my (undef, @par) = CFPlus::Pod::section_of $node;
+      $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
    };
-
+ 
    for my $skill (values %{$self->{skill_info}}) {
       $self->{map_widget}->add_command ("ready_skill $skill",
                                         (CFPlus::asxml "Ready the skill '$skill'\n\n")
-                                        . $skill_help->{$skill});
+                                        . $skill_help{$skill});
       $self->{map_widget}->add_command ("use_skill $skill",
                                         (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
-                                        . $skill_help->{$skill});
+                                        . $skill_help{$skill});
    }
 }
 
@@ -972,11 +961,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) = @_;