[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.591 by root, Tue Nov 6 23:33:15 2012 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 2012 UTC

 =cut
 #############################################################################
 # command handling &c
-=item cf::register_command $name => \&callback($ob,$args);
+=item cf::register_command $name => \&callback($ob,$args)
 Register a callback for execution when the client sends the user command
 $name.
 =cut
    #warn "registering command '$name/$time' to '$caller'";
    push @{ $COMMAND{$name} }, [$caller, $cb];
 }
-=item cf::register_extcmd $name => \&callback($pl,$packet);
+=item cf::register_extcmd $name => \&callback($pl,$packet)
 Register a callback for execution when the client sends an (synchronous)
 extcmd packet. Ext commands will be processed in the order they are
 received by the server, like other user commands. The first argument is
 the logged-in player. Ext commands can only be processed after a player
 has logged in successfully.
 If the callback returns something, it is sent back as if reply was being
 called.
-=item cf::register_exticmd $name => \&callback($ns,$packet);
+=item cf::register_exticmd $name => \&callback($ns,$packet)
 Register a callback for execution when the client sends an (asynchronous)
 exticmd packet. Exti commands are processed by the server as soon as they
 are received, i.e. out of order w.r.t. other commands. The first argument
 is a client socket. Exti commands can be received anytime, even before
          if (my $cb = $EXTCMD{$type}) {
             @reply = $cb->($pl, @payload);
          }
-         $pl->ext_reply ($reply, @reply)
+         $pl->ext_msg ("reply-$reply", @reply)
             if $reply;
       } else {
          error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
       }
 }
 =item $protocol_xml = $player->expand_cfpod ($cfpod)
 Expand deliantra pod fragments into protocol xml.
-=item $player->ext_reply ($msgid, @msg)
-Sends an ext reply to the player.
-=cut
-sub ext_reply($$@) {
-   my ($self, $id, @msg) = @_;
-   $self->ns->ext_reply ($id, @msg)
-}
 =item $player->ext_msg ($type, @msg)
 Sends an ext event to the client.
    my ($self, $type, @msg) = @_;
    $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
 }
-=item $client->ext_reply ($msgid, @msg)
-Sends an ext reply to the client.
-=cut
-sub cf::client::ext_reply($$@) {
-   my ($self, $id, @msg) = @_;
-   $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
-}
 =item $success = $client->query ($flags, "text", \&cb)
 Queues a query to the client, calling the given callback with
 the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
 C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
          if (my $cb = $EXTICMD{$type}) {
             @reply = $cb->($ns, @payload);
          }
-         $ns->ext_reply ($reply, @reply)
+         $ns->ext_msg ("reply-$reply", @reply)
             if $reply;
       } else {
          error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
       }
       my $face = cf::face::find "sound/$v";
       cf::sound::set $k => $face;
    }
 }
+#d# move docstuff to help or so
+our %DOCSTRING;
 sub reload_pod {
    trace "loading pods $PODDIR\n";
+   %DOCSTRING = ();
-   my @command_help;
+   my @command_list;
    for (
       [0, "command_help"],
       [1, "emote_help"],
       [2, "dmcommand_help"],
       my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
          or die "unable to load $path";
       my $level = 1e9;
+      my $rpar;
       for my $par (@$paragraphs) {
          if ($par->{type} eq "head2") {
             # this code taken almost verbatim from DC/Protocol.pm
                $_ = $_ eq ".*" ? "" : " $_"
                   for @args;
                my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
-               push @command_help, [$type, \@variants, &cf::pod::as_cfpod ([$par])];
+               $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
+               push @command_list, [$type, \@variants];
                $level = $par->{level};
             } else {
                error "$par->{markup}: unparsable command heading";
             }
          } elsif ($par->{level} > $level) {
-            $command_help[-1][2] .= &cf::pod::as_cfpod ([$par]);
+            $$rpar .= &cf::pod::as_cfpod ([$par]);
          }
          cf::cede_to_tick;
       }
    }
-   @command_help = sort {
+   @command_list = sort {
       $a->[0] <=> $b->[0]
          or $a->[1] cmp $b->[1]
-   } @command_help;
+   } @command_list;
    cf::cede_to_tick;
-   add_face "res/command_help" => FT_RSRC,
+   add_face "res/command_list" => FT_RSRC,
-            JSON::XS->new->utf8->encode (\@command_help);
+            JSON::XS->new->utf8->encode (\@command_list);
 }
 sub reload_resources {
    trace "reloading resource files...\n";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.591 by root, Tue Nov 6 23:33:15 2012 UTC vs. Revision 1.593 by root, Fri Nov 9 01:59:33 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.591 by root, Tue Nov 6 23:33:15 2012 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 2012 UTC