ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.592 by root, Fri Nov 9 00:11:49 2012 UTC vs.
Revision 1.597 by root, Sun Nov 11 02:14:37 2012 UTC

… …
87our %COMMAND = (); 87our %COMMAND = ();
88our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
89 89
90our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
91our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
92our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
93our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
94our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
95 97
96our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
97our @EVENT; 99our @EVENT;
… …
1431=cut 1433=cut
1432 1434
1433############################################################################# 1435#############################################################################
1434# command handling &c 1436# command handling &c
1435 1437
1436=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1437 1439
1438Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1439$name. 1441$name.
1440 1442
1441=cut 1443=cut
… …
1447 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1448 1450
1449 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1450} 1452}
1451 1453
1452=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1453 1455
1454Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1455extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1456received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1457the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1458has logged in successfully. 1460has logged in successfully.
1459 1461
1460If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1461called.
1462 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1463=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1464 1470
1465Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1466exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd packet. Exti commands are processed by the server as soon as they
1467are received, i.e. out of order w.r.t. other commands. The first argument 1473are received, i.e. out of order w.r.t. other commands. The first argument
1468is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1469log-in. 1475log-in.
1470 1476
1471If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1472called.
1473 1478
1474=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1475 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1476sub register_extcmd { 1486sub register_extcmd($$) {
1477 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1478 1488
1479 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1480} 1490}
1481 1491
1482sub register_exticmd { 1492sub register_async_extcmd($$) {
1483 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1484 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1485 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1502}
1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1486} 1508}
1487 1509
1488use File::Glob (); 1510use File::Glob ();
1489 1511
1490cf::player->attach ( 1512cf::player->attach (
… …
1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1507 1529
1508 if (ref $msg) { 1530 if (ref $msg) {
1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1510 1532
1511 my @reply;
1512
1513 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1514 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1515 } 1551 }
1516
1517 $pl->ext_reply ($reply, @reply)
1518 if $reply;
1519 1552
1520 } else { 1553 } else {
1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1522 } 1555 }
1523 1556
… …
1909} 1942}
1910 1943
1911=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1912 1945
1913Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1914
1915=item $player->ext_reply ($msgid, @msg)
1916
1917Sends an ext reply to the player.
1918
1919=cut
1920
1921sub ext_reply($$@) {
1922 my ($self, $id, @msg) = @_;
1923
1924 $self->ns->ext_reply ($id, @msg)
1925}
1926 1947
1927=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1928 1949
1929Sends an ext event to the client. 1950Sends an ext event to the client.
1930 1951
… …
3238 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
3239 3260
3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3241} 3262}
3242 3263
3243=item $client->ext_reply ($msgid, @msg)
3244
3245Sends an ext reply to the client.
3246
3247=cut
3248
3249sub cf::client::ext_reply($$@) {
3250 my ($self, $id, @msg) = @_;
3251
3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3253}
3254
3255=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
3256 3265
3257Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
3258the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3267the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
3259C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3268C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
… …
3314 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3315 3324
3316 if (ref $msg) { 3325 if (ref $msg) {
3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3318 3327
3319 my @reply;
3320
3321 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
3322 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3323 } 3346 }
3324
3325 $ns->ext_reply ($reply, @reply)
3326 if $reply;
3327
3328 } else { 3347 } else {
3329 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3330 } 3349 }
3331 3350
3332 cf::override; 3351 cf::override;
… …
3503# the server's init and main functions 3522# the server's init and main functions
3504 3523
3505our %FACEHASH; # hash => idx, #d# HACK for http server 3524our %FACEHASH; # hash => idx, #d# HACK for http server
3506 3525
3507# internal api, not fianlised 3526# internal api, not fianlised
3508sub add_face { 3527sub set_face {
3509 my ($name, $type, $data) = @_; 3528 my ($name, $type, $data) = @_;
3510 3529
3511 my $idx = cf::face::find $name; 3530 my $idx = cf::face::find $name;
3512 3531
3513 if ($idx) { 3532 if ($idx) {
… …
3543 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3544 3563
3545 cf::cede_to_tick; 3564 cf::cede_to_tick;
3546 3565
3547 { 3566 {
3548 my $faces = $facedata->{faceinfo}; 3567 my $faces = delete $facedata->{faceinfo};
3549 3568
3550 for my $face (sort keys %$faces) { 3569 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face}; 3570 my $info = $faces->{$face};
3552 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3553 3572
… …
3555 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3576 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3577 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d# 3578 $FACEHASH{$info->{hash64}} = $idx;#d#
3560 3579
3561 cf::cede_to_tick; 3580 cf::cede_to_tick;
3562 } 3581 }
3563 3582
3564 while (my ($face, $info) = each %$faces) { 3583 while (my ($face, $info) = each %$faces) {
3565 next unless $info->{smooth}; 3584 next unless $info->{smooth};
… …
3577 cf::cede_to_tick; 3596 cf::cede_to_tick;
3578 } 3597 }
3579 } 3598 }
3580 3599
3581 { 3600 {
3582 my $anims = $facedata->{animinfo}; 3601 my $anims = delete $facedata->{animinfo};
3583 3602
3584 while (my ($anim, $info) = each %$anims) { 3603 while (my ($anim, $info) = each %$anims) {
3585 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3604 cf::anim::set $anim, $info->{frames}, $info->{facings};
3586 cf::cede_to_tick; 3605 cf::cede_to_tick;
3587 } 3606 }
3588 3607
3589 cf::anim::invalidate_all; # d'oh 3608 cf::anim::invalidate_all; # d'oh
3590 } 3609 }
3591 3610
3592 { 3611 {
3593 my $res = $facedata->{resource}; 3612 my $res = delete $facedata->{resource};
3594 3613
3595 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3596 if (defined (my $type = $info->{type})) { 3615 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue 3616 # TODO: different hash - must free and use new index, or cache ixface data queue
3598 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
… …
3633} 3652}
3634 3653
3635sub reload_exp_table { 3654sub reload_exp_table {
3636 _reload_exp_table; 3655 _reload_exp_table;
3637 3656
3638 add_face "res/exp_table" => FT_RSRC, 3657 set_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode ( 3658 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 ); 3660 );
3642} 3661}
3643 3662
… …
3666 3685
3667sub reload_archetypes { 3686sub reload_archetypes {
3668 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3669 or die "unable to load archetypes\n"; 3688 or die "unable to load archetypes\n";
3670 3689
3671 add_face "res/skill_info" => FT_RSRC, 3690 set_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode ( 3691 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 ); 3693 );
3675 add_face "res/spell_paths" => FT_RSRC, 3694 set_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode ( 3695 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 ); 3697 );
3679} 3698}
3680 3699
… …
3699 3718
3700 while (my ($k, $v) = each %{$soundconf->{event}}) { 3719 while (my ($k, $v) = each %{$soundconf->{event}}) {
3701 my $face = cf::face::find "sound/$v"; 3720 my $face = cf::face::find "sound/$v";
3702 cf::sound::set $k => $face; 3721 cf::sound::set $k => $face;
3703 } 3722 }
3704}
3705
3706#d# move docstuff to help or so
3707our %DOCSTRING;
3708
3709sub reload_pod {
3710 trace "loading pods $PODDIR\n";
3711
3712 %DOCSTRING = ();
3713 my @command_list;
3714
3715 for (
3716 [0, "command_help"],
3717 [1, "emote_help"],
3718 [2, "dmcommand_help"],
3719 ) {
3720 my ($type, $path) = @$_;
3721
3722 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3723 or die "unable to load $path";
3724
3725 my $level = 1e9;
3726 my $rpar;
3727
3728 for my $par (@$paragraphs) {
3729 if ($par->{type} eq "head2") {
3730 # this code taken almost verbatim from DC/Protocol.pm
3731
3732 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3733 my $cmd = $1;
3734 my @args = split /\|/, $2;
3735 @args = (".*") unless @args;
3736
3737 $_ = $_ eq ".*" ? "" : " $_"
3738 for @args;
3739
3740 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3741
3742 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3743
3744 push @command_list, [$type, \@variants];
3745 $level = $par->{level};
3746 } else {
3747 error "$par->{markup}: unparsable command heading";
3748 }
3749 } elsif ($par->{level} > $level) {
3750 $$rpar .= &cf::pod::as_cfpod ([$par]);
3751 }
3752
3753 cf::cede_to_tick;
3754 }
3755 }
3756
3757 @command_list = sort {
3758 $a->[0] <=> $b->[0]
3759 or $a->[1] cmp $b->[1]
3760 } @command_list;
3761
3762 cf::cede_to_tick;
3763
3764 add_face "res/command_list" => FT_RSRC,
3765 JSON::XS->new->utf8->encode (\@command_list);
3766} 3723}
3767 3724
3768sub reload_resources { 3725sub reload_resources {
3769 trace "reloading resource files...\n"; 3726 trace "reloading resource files...\n";
3770 3727
… …
3773 reload_exp_table; 3730 reload_exp_table;
3774 reload_sound; 3731 reload_sound;
3775 reload_archetypes; 3732 reload_archetypes;
3776 reload_regions; 3733 reload_regions;
3777 reload_treasures; 3734 reload_treasures;
3778 reload_pod;
3779 3735
3780 trace "finished reloading resource files\n"; 3736 trace "finished reloading resource files\n";
3781} 3737}
3782 3738
3783sub reload_config { 3739sub reload_config {

Diff Legend

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