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.333 by root, Sun Aug 19 09:14:50 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 2007 UTC

… …
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
… …
272Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
275returned. 275returned.
276 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
277Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
279 282
280=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
281 284
… …
575 if (1) { 578 if (1) {
576 $md5 = 579 $md5 =
577 join "\x00", 580 join "\x00",
578 $processversion, 581 $processversion,
579 map { 582 map {
580 Coro::cede; 583 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 585 } 0.. $#$src;
583 586
584 587
585 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1149 my ($type, $reply, @payload) = 1152 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1153 "ARRAY" eq ref $msg
1151 ? @$msg 1154 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1156
1157 my @reply;
1158
1154 if (my $cb = $EXTCMD{$type}) { 1159 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1160 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1160 } else { 1166 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1168 }
1163 1169
1164 cf::override; 1170 cf::override;
… …
1319 1325
1320 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1322 1328
1323 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1324 Coro::cede; 1330 cf::cede_to_tick;
1325} 1331}
1326 1332
1327sub new($) { 1333sub new($) {
1328 my ($login) = @_; 1334 my ($login) = @_;
1329 1335
… …
1457sub expand_cfpod { 1463sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1459 1465
1460 # escape & and < 1466 # escape & and <
1461 s/&/&amp;/g; 1467 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1463 1469
1464 # this is buggy, it needs to properly take care of nested <'s 1470 # this is buggy, it needs to properly take care of nested <'s
1465 1471
1466 1 while 1472 1 while
1467 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1478 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1474 }ge 1481 }ge
1475 # replace H<hint text> 1482 # replace H<hint text>
… …
1505=cut 1512=cut
1506 1513
1507sub ext_reply($$@) { 1514sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1515 my ($self, $id, @msg) = @_;
1509 1516
1510 if ($self->ns->extcmd == 2) { 1517 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1518}
1518 1519
1519=item $player->ext_msg ($type, @msg) 1520=item $player->ext_msg ($type, @msg)
1520 1521
1521Sends an ext event to the client. 1522Sends an ext event to the client.
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1853 1854
1854 my $path = $self->{path}; 1855 my $path = $self->{path};
1855 1856
1856 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1857 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1858 1860
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1860 1862
1861 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1862 1864
1863 $self->alloc; 1865 $self->alloc;
1864 1866
1865 $self->pre_load; 1867 $self->pre_load;
1866 Coro::cede; 1868 cf::cede_to_tick;
1867 1869
1868 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1869 or return; 1871 or return;
1870 1872
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1877 $self->clear_unique_items; 1879 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1879 } 1881 }
1880 } 1882 }
1881 1883
1882 Coro::cede; 1884 cf::cede_to_tick;
1883 # now do the right thing for maps 1885 # now do the right thing for maps
1884 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1888 unless $self->difficulty;
1887 Coro::cede; 1889 cf::cede_to_tick;
1888 1890
1889 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1892 $self->decay_objects;
1891 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1892 $self->update_buttons; 1894 $self->update_buttons;
1893 Coro::cede; 1895 cf::cede_to_tick;
1894 $self->set_darkness_map; 1896 $self->set_darkness_map;
1895 Coro::cede; 1897 cf::cede_to_tick;
1896 $self->activate; 1898 $self->activate;
1897 } 1899 }
1898 1900
1899 $self->{last_save} = $cf::RUNTIME; 1901 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1902 $self->last_access ($cf::RUNTIME);
… …
1950} 1952}
1951 1953
1952sub do_load_sync { 1954sub do_load_sync {
1953 my ($map) = @_; 1955 my ($map) = @_;
1954 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1955 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1956} 1961}
1957 1962
1958our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1959our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1960 1965
1961sub find_async { 1966sub find_async {
1962 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1963 1968
1964 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1965 1970
1966 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1968 } 1973 }
1969 1974
1970 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1971 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1972 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1973 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1974 if (my $map = find $path) { 1980 if (my $map = find $k) {
1975 $map->load; 1981 $map->load if $v;
1976 } 1982 }
1977 1983
1978 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1979 } 1985 }
1980 } 1986 }
1981 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1982 }; 1988 };
1983 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1986} 1992}
1987 1993
1988sub save { 1994sub save {
1989 my ($self) = @_; 1995 my ($self) = @_;
1990 1996
1991 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1992 1998
1993 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1994 2000
1995 return unless $self->dirty; 2001 return unless $self->dirty;
1996 2002
… …
2019 my ($self) = @_; 2025 my ($self) = @_;
2020 2026
2021 # save first because save cedes 2027 # save first because save cedes
2022 $self->save; 2028 $self->save;
2023 2029
2024 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
2025 2031
2026 return if $self->players; 2032 return if $self->players;
2027 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
2028 return if $self->{deny_save}; 2034 return if $self->{deny_save};
2029 2035
… …
2081my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2082 2088
2083sub nuke { 2089sub nuke {
2084 my ($self) = @_; 2090 my ($self) = @_;
2085 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2086 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2087 2096
2088 $self->unlink_save; 2097 $self->unlink_save;
2089 2098
2090 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2091 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2092 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2093 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2094 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2095 2104
2096 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2097 2107
2098 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2099} 2109}
2100 2110
2101=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2505the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2497 2507
2498=cut 2508=cut
2499 2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2500sub cf::client::send_msg { 2525sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2527
2503 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2504 2529
2505 $color &= cf::NDI_CLIENT_MASK; # just in case... 2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2506 2534
2507 if (ref $channel) { 2535 if (ref $channel) {
2508 # send meta info to client, if not yet sent 2536 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2537 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2538 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_msg (channel_info => $channel); 2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2512 } 2541 }
2513 2542
2514 $channel = $channel->{id}; 2543 $channel = $channel->{id};
2515 } 2544 }
2516 2545
… …
2557=cut 2586=cut
2558 2587
2559sub cf::client::ext_msg($$@) { 2588sub cf::client::ext_msg($$@) {
2560 my ($self, $type, @msg) = @_; 2589 my ($self, $type, @msg) = @_;
2561 2590
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) { 2591 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove 2593 } elsif ($self->extcmd == 1) { # TODO: remove
2567 push @msg, msgtype => "event_$type"; 2594 push @msg, msgtype => "event_$type";
2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2596 }
2597}
2598
2599=item $client->ext_reply ($msgid, @msg)
2600
2601Sends an ext reply to the client.
2602
2603=cut
2604
2605sub cf::client::ext_reply($$@) {
2606 my ($self, $id, @msg) = @_;
2607
2608 if ($self->extcmd == 2) {
2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2610 } elsif ($self->extcmd == 1) {
2611 #TODO: version 1, remove
2612 unshift @msg, msgtype => "reply", msgid => $id;
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 } 2614 }
2570} 2615}
2571 2616
2572=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
… …
2634 my ($type, $reply, @payload) = 2679 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg 2680 "ARRAY" eq ref $msg
2636 ? @$msg 2681 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2682 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638 2683
2684 my @reply;
2685
2639 if (my $cb = $EXTICMD{$type}) { 2686 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload); 2687 @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 } 2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2645 } else { 2693 } else {
2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2647 } 2695 }
2648 2696
2649 cf::override; 2697 cf::override;
… …
2710 2758
2711The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2712 2760
2713 cf::object 2761 cf::object
2714 contr pay_amount pay_player map x y force_find force_add 2762 contr pay_amount pay_player map x y force_find force_add
2715 insert remove name archname title slaying race 2763 insert remove name archname title slaying race decrease_ob_nr
2716 2764
2717 cf::object::player 2765 cf::object::player
2718 player 2766 player
2719 2767
2720 cf::player 2768 cf::player
… …
2725 2773
2726=cut 2774=cut
2727 2775
2728for ( 2776for (
2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2730 insert remove inv name archname title slaying race)], 2778 insert remove inv name archname title slaying race
2779 decrease_ob_nr)],
2731 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2732 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2733 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2734) { 2783) {
2735 no strict 'refs'; 2784 no strict 'refs';
… …
2811# the server's init and main functions 2860# the server's init and main functions
2812 2861
2813sub load_facedata($) { 2862sub load_facedata($) {
2814 my ($path) = @_; 2863 my ($path) = @_;
2815 2864
2865 # HACK to clear player env face cache, we need some signal framework
2866 # for this (global event?)
2867 %ext::player_env::MUSIC_FACE_CACHE = ();
2868
2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2870
2816 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2817 2872
2818 my $facedata; 2873 my $facedata;
2819 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
2820 or die "$path: $!"; 2875 or die "$path: $!";
2821 2876
2822 $facedata = Coro::Storable::thaw $facedata; 2877 $facedata = Coro::Storable::thaw $facedata;
2823 2878
2824 $facedata->{version} == 2 2879 $facedata->{version} == 2
2825 or cf::cleanup "$path: version mismatch, cannot proceed."; 2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2881
2882 # patch in the exptable
2883 $facedata->{resource}{"res/exp_table"} = {
2884 type => FT_RSRC,
2885 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2886 };
2887 cf::cede_to_tick;
2826 2888
2827 { 2889 {
2828 my $faces = $facedata->{faceinfo}; 2890 my $faces = $facedata->{faceinfo};
2829 2891
2830 while (my ($face, $info) = each %$faces) { 2892 while (my ($face, $info) = each %$faces) {
2831 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2832 cf::face::set_visibility $idx, $info->{visibility}; 2894 cf::face::set_visibility $idx, $info->{visibility};
2833 cf::face::set_magicmap $idx, $info->{magicmap}; 2895 cf::face::set_magicmap $idx, $info->{magicmap};
2834 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2835 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2836 2898
2837 cf::cede_to_tick; 2899 cf::cede_to_tick;
2838 } 2900 }
2839 2901
2840 while (my ($face, $info) = each %$faces) { 2902 while (my ($face, $info) = each %$faces) {
… …
2865 2927
2866 { 2928 {
2867 # TODO: for gcfclient pleasure, we should give resources 2929 # TODO: for gcfclient pleasure, we should give resources
2868 # that gcfclient doesn't grok a >10000 face index. 2930 # that gcfclient doesn't grok a >10000 face index.
2869 my $res = $facedata->{resource}; 2931 my $res = $facedata->{resource};
2870 my $enc = JSON::XS->new->utf8->canonical;
2871 2932
2872 my $soundconf = delete $res->{"res/sound.conf"}; 2933 my $soundconf = delete $res->{"res/sound.conf"};
2873 2934
2874 while (my ($name, $info) = each %$res) { 2935 while (my ($name, $info) = each %$res) {
2875 my $meta = $enc->encode ({
2876 name => $name,
2877 %{ $info->{meta} || {} },
2878 });
2879
2880 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2936 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data;
2881 2938
2882 if ($info->{type} & 1) { 2939 if ($info->{type} & 1) {
2883 # prepend meta info 2940 # prepend meta info
2884 2941
2942 my $meta = $enc->encode ({
2943 name => $name,
2944 %{ $info->{meta} || {} },
2945 });
2946
2885 my $data = pack "(w/a*)*", $meta, $info->{data}; 2947 $data = pack "(w/a*)*", $meta, $info->{data};
2886 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2887
2888 cf::face::set_data $idx, 0, $data, $chk;
2889 } else { 2948 } else {
2890 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2949 $data = $info->{data};
2891 } 2950 }
2892 2951
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2893 cf::face::set_type $idx, $info->{type}; 2953 cf::face::set_type $idx, $info->{type};
2894 2954
2895 cf::cede_to_tick; 2955 cf::cede_to_tick;
2896 } 2956 }
2897 2957
… …
2924 $ns->fx_want ($k, $v); 2984 $ns->fx_want ($k, $v);
2925 } 2985 }
2926}; 2986};
2927 2987
2928sub reload_regions { 2988sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2929 load_resource_file "$MAPDIR/regions" 2993 load_resource_file "$MAPDIR/regions"
2930 or die "unable to load regions file\n"; 2994 or die "unable to load regions file\n";
2931 2995
2932 for (cf::region::list) { 2996 for (cf::region::list) {
2933 $_->{match} = qr/$_->{match}/ 2997 $_->{match} = qr/$_->{match}/
… …
2969 3033
2970sub init { 3034sub init {
2971 reload_resources; 3035 reload_resources;
2972} 3036}
2973 3037
2974sub cfg_load { 3038sub reload_config {
2975 open my $fh, "<:utf8", "$CONFDIR/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2976 or return; 3040 or return;
2977 3041
2978 local $/; 3042 local $/;
2979 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
… …
2999 (async { 3063 (async {
3000 Event::one_event; 3064 Event::one_event;
3001 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
3002 }; 3066 };
3003 3067
3004 cfg_load; 3068 reload_config;
3005 db_init; 3069 db_init;
3006 load_extensions; 3070 load_extensions;
3007 3071
3008 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
3009 Event::loop; 3073 Event::loop;
… …
3202 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
3203 require cf; 3267 require cf;
3204 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3205 3269
3206 warn "loading config and database again"; 3270 warn "loading config and database again";
3207 cf::cfg_load; 3271 cf::reload_config;
3208 3272
3209 warn "loading extensions"; 3273 warn "loading extensions";
3210 cf::load_extensions; 3274 cf::load_extensions;
3211 3275
3212 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";

Diff Legend

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