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.593 by root, Fri Nov 9 01:59:33 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;
… …
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_msg ("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
… …
3290 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3291 3324
3292 if (ref $msg) { 3325 if (ref $msg) {
3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3294 3327
3295 my @reply;
3296
3297 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}) {
3298 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3299 } 3346 }
3300
3301 $ns->ext_msg ("reply-$reply", @reply)
3302 if $reply;
3303
3304 } else { 3347 } else {
3305 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";
3306 } 3349 }
3307 3350
3308 cf::override; 3351 cf::override;
… …
3479# the server's init and main functions 3522# the server's init and main functions
3480 3523
3481our %FACEHASH; # hash => idx, #d# HACK for http server 3524our %FACEHASH; # hash => idx, #d# HACK for http server
3482 3525
3483# internal api, not fianlised 3526# internal api, not fianlised
3484sub add_face { 3527sub set_face {
3485 my ($name, $type, $data) = @_; 3528 my ($name, $type, $data) = @_;
3486 3529
3487 my $idx = cf::face::find $name; 3530 my $idx = cf::face::find $name;
3488 3531
3489 if ($idx) { 3532 if ($idx) {
… …
3519 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3520 3563
3521 cf::cede_to_tick; 3564 cf::cede_to_tick;
3522 3565
3523 { 3566 {
3524 my $faces = $facedata->{faceinfo}; 3567 my $faces = delete $facedata->{faceinfo};
3525 3568
3526 for my $face (sort keys %$faces) { 3569 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face}; 3570 my $info = $faces->{$face};
3528 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3529 3572
… …
3531 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3533 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3576 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3534 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3577 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3535 $FACEHASH{$info->{hash64}} = $idx;#d# 3578 $FACEHASH{$info->{hash64}} = $idx;#d#
3536 3579
3537 cf::cede_to_tick; 3580 cf::cede_to_tick;
3538 } 3581 }
3539 3582
3540 while (my ($face, $info) = each %$faces) { 3583 while (my ($face, $info) = each %$faces) {
3541 next unless $info->{smooth}; 3584 next unless $info->{smooth};
… …
3553 cf::cede_to_tick; 3596 cf::cede_to_tick;
3554 } 3597 }
3555 } 3598 }
3556 3599
3557 { 3600 {
3558 my $anims = $facedata->{animinfo}; 3601 my $anims = delete $facedata->{animinfo};
3559 3602
3560 while (my ($anim, $info) = each %$anims) { 3603 while (my ($anim, $info) = each %$anims) {
3561 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3604 cf::anim::set $anim, $info->{frames}, $info->{facings};
3562 cf::cede_to_tick; 3605 cf::cede_to_tick;
3563 } 3606 }
3564 3607
3565 cf::anim::invalidate_all; # d'oh 3608 cf::anim::invalidate_all; # d'oh
3566 } 3609 }
3567 3610
3568 { 3611 {
3569 my $res = $facedata->{resource}; 3612 my $res = delete $facedata->{resource};
3570 3613
3571 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3572 if (defined (my $type = $info->{type})) { 3615 if (defined (my $type = $info->{type})) {
3573 # 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
3574 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
… …
3609} 3652}
3610 3653
3611sub reload_exp_table { 3654sub reload_exp_table {
3612 _reload_exp_table; 3655 _reload_exp_table;
3613 3656
3614 add_face "res/exp_table" => FT_RSRC, 3657 set_face "res/exp_table" => FT_RSRC,
3615 JSON::XS->new->utf8->canonical->encode ( 3658 JSON::XS->new->utf8->canonical->encode (
3616 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3617 ); 3660 );
3618} 3661}
3619 3662
… …
3642 3685
3643sub reload_archetypes { 3686sub reload_archetypes {
3644 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3645 or die "unable to load archetypes\n"; 3688 or die "unable to load archetypes\n";
3646 3689
3647 add_face "res/skill_info" => FT_RSRC, 3690 set_face "res/skill_info" => FT_RSRC,
3648 JSON::XS->new->utf8->canonical->encode ( 3691 JSON::XS->new->utf8->canonical->encode (
3649 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3650 ); 3693 );
3651 add_face "res/spell_paths" => FT_RSRC, 3694 set_face "res/spell_paths" => FT_RSRC,
3652 JSON::XS->new->utf8->canonical->encode ( 3695 JSON::XS->new->utf8->canonical->encode (
3653 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3654 ); 3697 );
3655} 3698}
3656 3699
… …
3675 3718
3676 while (my ($k, $v) = each %{$soundconf->{event}}) { 3719 while (my ($k, $v) = each %{$soundconf->{event}}) {
3677 my $face = cf::face::find "sound/$v"; 3720 my $face = cf::face::find "sound/$v";
3678 cf::sound::set $k => $face; 3721 cf::sound::set $k => $face;
3679 } 3722 }
3680}
3681
3682#d# move docstuff to help or so
3683our %DOCSTRING;
3684
3685sub reload_pod {
3686 trace "loading pods $PODDIR\n";
3687
3688 %DOCSTRING = ();
3689 my @command_list;
3690
3691 for (
3692 [0, "command_help"],
3693 [1, "emote_help"],
3694 [2, "dmcommand_help"],
3695 ) {
3696 my ($type, $path) = @$_;
3697
3698 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3699 or die "unable to load $path";
3700
3701 my $level = 1e9;
3702 my $rpar;
3703
3704 for my $par (@$paragraphs) {
3705 if ($par->{type} eq "head2") {
3706 # this code taken almost verbatim from DC/Protocol.pm
3707
3708 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3709 my $cmd = $1;
3710 my @args = split /\|/, $2;
3711 @args = (".*") unless @args;
3712
3713 $_ = $_ eq ".*" ? "" : " $_"
3714 for @args;
3715
3716 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3717
3718 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3719
3720 push @command_list, [$type, \@variants];
3721 $level = $par->{level};
3722 } else {
3723 error "$par->{markup}: unparsable command heading";
3724 }
3725 } elsif ($par->{level} > $level) {
3726 $$rpar .= &cf::pod::as_cfpod ([$par]);
3727 }
3728
3729 cf::cede_to_tick;
3730 }
3731 }
3732
3733 @command_list = sort {
3734 $a->[0] <=> $b->[0]
3735 or $a->[1] cmp $b->[1]
3736 } @command_list;
3737
3738 cf::cede_to_tick;
3739
3740 add_face "res/command_list" => FT_RSRC,
3741 JSON::XS->new->utf8->encode (\@command_list);
3742} 3723}
3743 3724
3744sub reload_resources { 3725sub reload_resources {
3745 trace "reloading resource files...\n"; 3726 trace "reloading resource files...\n";
3746 3727
… …
3749 reload_exp_table; 3730 reload_exp_table;
3750 reload_sound; 3731 reload_sound;
3751 reload_archetypes; 3732 reload_archetypes;
3752 reload_regions; 3733 reload_regions;
3753 reload_treasures; 3734 reload_treasures;
3754 reload_pod;
3755 3735
3756 trace "finished reloading resource files\n"; 3736 trace "finished reloading resource files\n";
3757} 3737}
3758 3738
3759sub reload_config { 3739sub reload_config {

Diff Legend

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