--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/06/05 01:59:59	1.18
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/06/05 21:10:04	1.21
@@ -5,6 +5,7 @@
 
 use Crossfire::Protocol::Constants;
 
+use CFClient;
 use CFClient::UI;
 
 use base 'Crossfire::Protocol::Base';
@@ -16,26 +17,34 @@
 
    $self->{map_widget}->clr_commands;
 
-   my $parser = new Pod::POM;
-   my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
+   my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
+      my ($pom) = @_;
 
-   for my $head2 ($pod->head1->[-2]->head2) {
-      $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
-         or next;
+      my @cmd_help;
 
-      my $cmd = $1;
-      my @args = split /\|/, $2;
-      @args = (".*") unless @args;
+      for my $head2 ($pom->head1->[-2]->head2) {
+         $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
+            or next;
 
-      $_ = $_ eq ".*" ? "" : " $_"
-         for @args;
+         my $cmd = $1;
+         my @args = split /\|/, $2;
+         @args = (".*") unless @args;
+
+         $_ = $_ eq ".*" ? "" : " $_"
+            for @args;
+
+         my $text = CFClient::pod_to_pango $head2->content;
+
+         push @cmd_help, ["$cmd$_", $text]
+            for sort { (length $a) <=> (length $b) }
+                     @args;
+      }
 
-      my $text = CFClient::pod_to_pango $head2->content;
+      \@cmd_help
+   };
 
-      $self->{map_widget}->add_command ("$cmd$_", $text)
-         for sort { (length $a) <=> (length $b) }
-                  @args;
-   }
+   $self->{map_widget}->add_command (@$_)
+      for @$cmd_help;
 
    $self->{noface} = new_from_file CFClient::Texture
       CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
@@ -461,22 +470,25 @@
 sub addme_success {
    my ($self) = @_;
 
-   my $parser = new Pod::POM;
-   my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
+   my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
+      my ($pom) = @_;
 
-   my %skill_tooltip;
+      my %skill_help;
 
-   for my $head2 ($pod->head1->[-2]->head2) {
-      $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
-   }
+      for my $head2 ($pom->head1->[3]->head2) {
+         $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;
+      }
+
+      \%skill_help
+   };
 
    for my $skill (values %{$self->{skill_info}}) {
       $self->{map_widget}->add_command ("ready_skill $skill",
                                         (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
-                                        . $skill_tooltip{$skill});
+                                        . $skill_help->{$skill});
       $self->{map_widget}->add_command ("use_skill $skill",
                                         (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
-                                        . $skill_tooltip{$skill});
+                                        . $skill_help->{$skill});
    }
 }
 
@@ -511,14 +523,14 @@
       $self->send ("requestinfo image_sums $face $face");
 
       $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
-         group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
+         group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
    } elsif (!exists $self->{num_faces}) {
       $self->send ("requestinfo image_info");
 
       $self->{num_faces} = 0;
 
       $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
-         group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
+         group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
    }
 }