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.591 by root, Tue Nov 6 23:33:15 2012 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC

… …
58use BDB (); 58use BDB ();
59use Data::Dumper; 59use Data::Dumper;
60use Fcntl; 60use Fcntl;
61use YAML::XS (); 61use YAML::XS ();
62use IO::AIO (); 62use IO::AIO ();
63use Time::HiRes;
64use Compress::LZF; 63use Compress::LZF;
65use Digest::MD5 (); 64use Digest::MD5 ();
66 65
67AnyEvent::detect; 66AnyEvent::detect;
68 67
… …
87our %COMMAND = (); 86our %COMMAND = ();
88our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
89 88
90our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
91our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
92our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
93our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
94our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
95 96
96our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
97our @EVENT; 98our @EVENT;
… …
250Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
251from wherever your confdir points to. 252from wherever your confdir points to.
252 253
253=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
254 255
255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
256returns directly I<after> the tick processing (and consequently, can only wake one thread 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
257per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
258 260
259Note that cf::Wait_for_tick will immediately return when the server is not 261Note that cf::wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run 262ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really> 263when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
263 265
264=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
… …
899 901
900 return db_get cache => "$id/data"; 902 return db_get cache => "$id/data";
901 } 903 }
902 } 904 }
903 905
904 my $t1 = Time::HiRes::time; 906 my $t1 = EV::time;
905 my $data = $process->(\@data); 907 my $data = $process->(\@data);
906 my $t2 = Time::HiRes::time; 908 my $t2 = EV::time;
907 909
908 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
909 911
910 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
911 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
… …
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
… …
2633 2654
2634Creates and returns a persistent reference to an object that can be stored as a string. 2655Creates and returns a persistent reference to an object that can be stored as a string.
2635 2656
2636=item $ob = cf::object::deref ($refstring) 2657=item $ob = cf::object::deref ($refstring)
2637 2658
2638returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2659returns the objetc referenced by refstring. may return undef when it cannot find the object,
2639even if the object actually exists. May block. 2660even if the object actually exists. May block.
2640 2661
2641=cut 2662=cut
2642 2663
2643sub deref { 2664sub deref {
… …
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;
… …
3500=cut 3519=cut
3501 3520
3502############################################################################# 3521#############################################################################
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 3524{
3525 package cf::face;
3506 3526
3527 our %HASH; # hash => idx
3528 our @DATA; # dynamically-created facedata, only faceste 0 used
3529 our @FOFS; # file offset, if > 0
3530 our @SIZE; # size of face, in octets
3531 our @META; # meta hash of face, if any
3532 our $DATAFH; # facedata filehandle
3533
3507# internal api, not fianlised 3534 # internal api, not finalised
3508sub add_face { 3535 sub set {
3509 my ($name, $type, $data) = @_; 3536 my ($name, $type, $data) = @_;
3510 3537
3511 my $idx = cf::face::find $name; 3538 my $idx = cf::face::find $name;
3512 3539
3513 if ($idx) { 3540 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx}; 3541 delete $HASH{cf::face::get_chksum $idx};
3515 } else { 3542 } else {
3516 $idx = cf::face::alloc $name; 3543 $idx = cf::face::alloc $name;
3517 } 3544 }
3518 3545
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3546 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3520 3547
3521 cf::face::set_type $idx, $type; 3548 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash; 3549 cf::face::set_csum $idx, 0, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef; 3550
3551 # we need to destroy the SV itself, not just modify it, as a running ix
3552 # might hold a reference to it: "delete" achieves that.
3553 delete $FOFS[0][$idx];
3554 delete $DATA[0][$idx];
3555 $DATA[0][$idx] = $data;
3556 $SIZE[0][$idx] = length $data;
3557 delete $META[$idx];
3524 $FACEHASH{$hash} = $idx;#d# 3558 $HASH{$hash} = $idx;#d#
3525 3559
3526 $idx 3560 $idx
3561 }
3562
3563 sub _get_data($$$) {
3564 my ($idx, $set, $cb) = @_;
3565
3566 if (defined $DATA[$set][$idx]) {
3567 $cb->($DATA[$set][$idx]);
3568 } elsif (my $fofs = $FOFS[$set][$idx]) {
3569 my $size = $SIZE[$set][$idx];
3570 my $buf;
3571 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3572 if ($_[0] == $size) {
3573 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3574 $cb->($buf);
3575 } else {
3576 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3577 }
3578 };
3579 } else {
3580 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3581 }
3582 }
3583
3584 # rather ineffient
3585 sub cf::face::get_data($;$) {
3586 my ($idx, $set) = @_;
3587
3588 _get_data $idx, $set, Coro::rouse_cb;
3589 Coro::rouse_wait
3590 }
3591
3592 sub cf::face::ix {
3593 my ($ns, $set, $idx, $pri) = @_;
3594
3595 _get_data $idx, $set, sub {
3596 $ns->ix_send ($idx, $pri, $_[0]);
3597 };
3598 }
3527} 3599}
3528 3600
3529sub load_facedata($) { 3601sub load_facedata($) {
3530 my ($path) = @_; 3602 my ($path) = @_;
3531 3603
3532 # HACK to clear player env face cache, we need some signal framework
3533 # for this (global event?)
3534 %ext::player_env::MUSIC_FACE_CACHE = ();
3535
3536 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3604 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3537 3605
3538 trace "loading facedata from $path\n"; 3606 trace "loading facedata from $path\n";
3539 3607
3540 my $facedata = decode_storable load_file $path; 3608 my $facedata = decode_storable load_file "$path/faceinfo";
3541 3609
3542 $facedata->{version} == 2 3610 $facedata->{version} == 2
3543 or cf::cleanup "$path: version mismatch, cannot proceed."; 3611 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3544 3612
3545 cf::cede_to_tick; 3613 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3614 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3615
3616 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3617
3618 # BEGIN ATOMIC
3619 # from here on, everything must be atomic - no thread switch allowed
3620 my $t1 = EV::time;
3546 3621
3547 { 3622 {
3548 my $faces = $facedata->{faceinfo}; 3623 my $faces = $facedata->{faceinfo};
3549 3624
3550 for my $face (sort keys %$faces) { 3625 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face}; 3626 my $info = $faces->{$face};
3552 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3627 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3553 3628
3554 cf::face::set_visibility $idx, $info->{visibility}; 3629 cf::face::set_visibility $idx, $info->{visibility};
3555 cf::face::set_magicmap $idx, $info->{magicmap}; 3630 cf::face::set_magicmap $idx, $info->{magicmap};
3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3631 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3632 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3633 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3559 $FACEHASH{$info->{hash64}} = $idx;#d# 3634 $cf::face::HASH{$info->{hash64}} = $idx;
3560 3635 delete $cf::face::META[$idx];
3561 cf::cede_to_tick;
3562 } 3636 }
3563 3637
3564 while (my ($face, $info) = each %$faces) { 3638 while (my ($face, $info) = each %$faces) {
3565 next unless $info->{smooth}; 3639 next unless $info->{smooth};
3566 3640
… …
3571 cf::face::set_smooth $idx, $smooth; 3645 cf::face::set_smooth $idx, $smooth;
3572 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3646 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3573 } else { 3647 } else {
3574 error "smooth face '$info->{smooth}' not found for face '$face'"; 3648 error "smooth face '$info->{smooth}' not found for face '$face'";
3575 } 3649 }
3576
3577 cf::cede_to_tick;
3578 } 3650 }
3579 } 3651 }
3580 3652
3581 { 3653 {
3582 my $anims = $facedata->{animinfo}; 3654 my $anims = $facedata->{animinfo};
3583 3655
3584 while (my ($anim, $info) = each %$anims) { 3656 while (my ($anim, $info) = each %$anims) {
3585 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3657 cf::anim::set $anim, $info->{frames}, $info->{facings};
3586 cf::cede_to_tick;
3587 } 3658 }
3588 3659
3589 cf::anim::invalidate_all; # d'oh 3660 cf::anim::invalidate_all; # d'oh
3590 } 3661 }
3591 3662
… …
3596 if (defined (my $type = $info->{type})) { 3667 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue 3668 # 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; 3669 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3599 3670
3600 cf::face::set_type $idx, $type; 3671 cf::face::set_type $idx, $type;
3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3672 cf::face::set_csum $idx, 0, $info->{hash};
3673 $cf::face::SIZE[0][$idx] = $info->{size};
3674 $cf::face::FOFS[0][$idx] = $info->{fofs};
3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3675 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d# 3676 $cf::face::HASH{$info->{hash}} = $idx;
3604 } else { 3677 } else {
3605# $RESOURCE{$name} = $info; # unused 3678# $RESOURCE{$name} = $info; # unused
3606 } 3679 }
3607
3608 cf::cede_to_tick;
3609 } 3680 }
3610 } 3681 }
3682
3683 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3684
3685 # HACK to clear player env face cache, we need some signal framework
3686 # for this (global event?)
3687 %ext::player_env::MUSIC_FACE_CACHE = ();
3688
3689 # END ATOMIC
3690
3691 cf::debug "facedata atomic update time ", EV::time - $t1;
3611 3692
3612 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3693 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3694
3695 aio_close $fh if $fh; # close old facedata
3613 3696
3614 1 3697 1
3615} 3698}
3616 3699
3617register_exticmd fx_want => sub { 3700register_exticmd fx_want => sub {
… …
3633} 3716}
3634 3717
3635sub reload_exp_table { 3718sub reload_exp_table {
3636 _reload_exp_table; 3719 _reload_exp_table;
3637 3720
3721 cf::face::set
3638 add_face "res/exp_table" => FT_RSRC, 3722 "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode ( 3723 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3724 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 ); 3725 );
3642} 3726}
3643 3727
3644sub reload_materials { 3728sub reload_materials {
3645 _reload_materials; 3729 _reload_materials;
3646} 3730}
… …
3658 if exists $_->{match}; 3742 if exists $_->{match};
3659 } 3743 }
3660} 3744}
3661 3745
3662sub reload_facedata { 3746sub reload_facedata {
3663 load_facedata "$DATADIR/facedata" 3747 load_facedata $DATADIR
3664 or die "unable to load facedata\n"; 3748 or die "unable to load facedata\n";
3665} 3749}
3666 3750
3667sub reload_archetypes { 3751sub reload_archetypes {
3668 load_resource_file "$DATADIR/archetypes" 3752 load_resource_file "$DATADIR/archetypes"
3669 or die "unable to load archetypes\n"; 3753 or die "unable to load archetypes\n";
3670 3754
3755 cf::face::set
3671 add_face "res/skill_info" => FT_RSRC, 3756 "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode ( 3757 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3758 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 ); 3759 );
3760
3761 cf::face::set
3675 add_face "res/spell_paths" => FT_RSRC, 3762 "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode ( 3763 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3764 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 ); 3765 );
3679} 3766}
3680 3767
3681sub reload_treasures { 3768sub reload_treasures {
3682 load_resource_file "$DATADIR/treasures" 3769 load_resource_file "$DATADIR/treasures"
3683 or die "unable to load treasurelists\n"; 3770 or die "unable to load treasurelists\n";
… …
3699 3786
3700 while (my ($k, $v) = each %{$soundconf->{event}}) { 3787 while (my ($k, $v) = each %{$soundconf->{event}}) {
3701 my $face = cf::face::find "sound/$v"; 3788 my $face = cf::face::find "sound/$v";
3702 cf::sound::set $k => $face; 3789 cf::sound::set $k => $face;
3703 } 3790 }
3704}
3705
3706sub reload_pod {
3707 trace "loading pods $PODDIR\n";
3708
3709 my @command_help;
3710
3711 for (
3712 [0, "command_help"],
3713 [1, "emote_help"],
3714 [2, "dmcommand_help"],
3715 ) {
3716 my ($type, $path) = @$_;
3717
3718 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3719 or die "unable to load $path";
3720
3721 my $level = 1e9;
3722
3723 for my $par (@$paragraphs) {
3724 if ($par->{type} eq "head2") {
3725 # this code taken almost verbatim from DC/Protocol.pm
3726
3727 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3728 my $cmd = $1;
3729 my @args = split /\|/, $2;
3730 @args = (".*") unless @args;
3731
3732 $_ = $_ eq ".*" ? "" : " $_"
3733 for @args;
3734
3735 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3736
3737 push @command_help, [$type, \@variants, &cf::pod::as_cfpod ([$par])];
3738 $level = $par->{level};
3739 } else {
3740 error "$par->{markup}: unparsable command heading";
3741 }
3742 } elsif ($par->{level} > $level) {
3743 $command_help[-1][2] .= &cf::pod::as_cfpod ([$par]);
3744 }
3745
3746 cf::cede_to_tick;
3747 }
3748 }
3749
3750 @command_help = sort {
3751 $a->[0] <=> $b->[0]
3752 or $a->[1] cmp $b->[1]
3753 } @command_help;
3754
3755 cf::cede_to_tick;
3756
3757 add_face "res/command_help" => FT_RSRC,
3758 JSON::XS->new->utf8->encode (\@command_help);
3759} 3791}
3760 3792
3761sub reload_resources { 3793sub reload_resources {
3762 trace "reloading resource files...\n"; 3794 trace "reloading resource files...\n";
3763 3795
… …
3766 reload_exp_table; 3798 reload_exp_table;
3767 reload_sound; 3799 reload_sound;
3768 reload_archetypes; 3800 reload_archetypes;
3769 reload_regions; 3801 reload_regions;
3770 reload_treasures; 3802 reload_treasures;
3771 reload_pod;
3772 3803
3773 trace "finished reloading resource files\n"; 3804 trace "finished reloading resource files\n";
3774} 3805}
3775 3806
3776sub reload_config { 3807sub reload_config {

Diff Legend

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