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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.351 by root, Sun Sep 2 00:57:38 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
… …
1505=cut 1511=cut
1506 1512
1507sub ext_reply($$@) { 1513sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1514 my ($self, $id, @msg) = @_;
1509 1515
1510 if ($self->ns->extcmd == 2) { 1516 $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} 1517}
1518 1518
1519=item $player->ext_msg ($type, @msg) 1519=item $player->ext_msg ($type, @msg)
1520 1520
1521Sends an ext event to the client. 1521Sends an ext event to the client.
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1853 1853
1854 my $path = $self->{path}; 1854 my $path = $self->{path};
1855 1855
1856 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1857 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1858 1859
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1860 1861
1861 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1862 1863
1863 $self->alloc; 1864 $self->alloc;
1864 1865
1865 $self->pre_load; 1866 $self->pre_load;
1866 Coro::cede; 1867 cf::cede_to_tick;
1867 1868
1868 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1869 or return; 1870 or return;
1870 1871
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1877 $self->clear_unique_items; 1878 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1879 } 1880 }
1880 } 1881 }
1881 1882
1882 Coro::cede; 1883 cf::cede_to_tick;
1883 # now do the right thing for maps 1884 # now do the right thing for maps
1884 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1887 unless $self->difficulty;
1887 Coro::cede; 1888 cf::cede_to_tick;
1888 1889
1889 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1891 $self->decay_objects;
1891 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1892 $self->update_buttons; 1893 $self->update_buttons;
1893 Coro::cede; 1894 cf::cede_to_tick;
1894 $self->set_darkness_map; 1895 $self->set_darkness_map;
1895 Coro::cede; 1896 cf::cede_to_tick;
1896 $self->activate; 1897 $self->activate;
1897 } 1898 }
1898 1899
1899 $self->{last_save} = $cf::RUNTIME; 1900 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1901 $self->last_access ($cf::RUNTIME);
… …
1916 1917
1917 $self 1918 $self
1918} 1919}
1919 1920
1920# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1921sub load_diag { 1922sub load_neighbours {
1922 my ($map) = @_; 1923 my ($map) = @_;
1923 1924
1924 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1925 1926
1926 for (0 .. 3) { 1927 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1928 or next; 1929 or next;
1929 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1930 or next; 1931 or next;
1931 $neigh->load; 1932 $neigh->load;
1932 1933
1934 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 1937 }
1936 1938
1937 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1939 or next; 1942 or next;
1940 $neigh->load; 1943 $neigh->load;
1941 } 1944 }
1942} 1945}
1943 1946
… …
1948} 1951}
1949 1952
1950sub do_load_sync { 1953sub do_load_sync {
1951 my ($map) = @_; 1954 my ($map) = @_;
1952 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1953 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1954} 1960}
1955 1961
1956our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1958 1964
1959sub find_async { 1965sub find_async {
1960 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1961 1967
1962 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1963 1969
1964 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 1972 }
1967 1973
1968 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1969 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1970 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 1979 if (my $map = find $k) {
1973 $map->load; 1980 $map->load if $v;
1974 } 1981 }
1975 1982
1976 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1977 } 1984 }
1978 } 1985 }
1979 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1980 }; 1987 };
1981 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1984} 1991}
1985 1992
1986sub save { 1993sub save {
1987 my ($self) = @_; 1994 my ($self) = @_;
1988 1995
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 1997
1991 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1992 1999
1993 return unless $self->dirty; 2000 return unless $self->dirty;
1994 2001
… …
2017 my ($self) = @_; 2024 my ($self) = @_;
2018 2025
2019 # save first because save cedes 2026 # save first because save cedes
2020 $self->save; 2027 $self->save;
2021 2028
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2030
2024 return if $self->players; 2031 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2033 return if $self->{deny_save};
2027 2034
… …
2079my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2080 2087
2081sub nuke { 2088sub nuke {
2082 my ($self) = @_; 2089 my ($self) = @_;
2083 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2084 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2085 2095
2086 $self->unlink_save; 2096 $self->unlink_save;
2087 2097
2088 bless $self, "cf::map"; 2098 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2099 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2100 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2101 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2102 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2103
2094 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2095 2106
2096 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2097} 2108}
2098 2109
2099=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2315 2326
2316 $map->load; 2327 $map->load;
2317 $map->load_diag; 2328 $map->load_neighbours;
2318 2329
2319 return unless $self->contr->active; 2330 return unless $self->contr->active;
2320 $self->activate_recursive; 2331 $self->activate_recursive;
2321 2332
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2504the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2495 2506
2496=cut 2507=cut
2497 2508
2509our %CHANNEL = (
2510 "c/identify" => {
2511 id => "identify",
2512 title => "Identify",
2513 reply => undef,
2514 tooltip => "Items recently identified",
2515 },
2516);
2517
2498sub cf::client::send_msg { 2518sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2519 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2520
2501 $msg = $self->pl->expand_cfpod ($msg); 2521 $msg = $self->pl->expand_cfpod ($msg);
2502 2522
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2523 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524
2525 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2504 2527
2505 if (ref $channel) { 2528 if (ref $channel) {
2506 # send meta info to client, if not yet sent 2529 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2530 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2531 $self->{channel}{$channel->{id}} = $channel;
… …
2555=cut 2578=cut
2556 2579
2557sub cf::client::ext_msg($$@) { 2580sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2581 my ($self, $type, @msg) = @_;
2559 2582
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2583 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2584 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2585 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2586 push @msg, msgtype => "event_$type";
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 }
2589}
2590
2591=item $client->ext_reply ($msgid, @msg)
2592
2593Sends an ext reply to the client.
2594
2595=cut
2596
2597sub cf::client::ext_reply($$@) {
2598 my ($self, $id, @msg) = @_;
2599
2600 if ($self->extcmd == 2) {
2601 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2602 } elsif ($self->extcmd == 1) {
2603 #TODO: version 1, remove
2604 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2605 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2606 }
2568} 2607}
2569 2608
2570=item $success = $client->query ($flags, "text", \&cb) 2609=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2671 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2672 "ARRAY" eq ref $msg
2634 ? @$msg 2673 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2674 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2675
2676 my @reply;
2677
2637 if (my $cb = $EXTICMD{$type}) { 2678 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2679 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2680 }
2681
2682 $ns->ext_reply ($reply, @reply)
2683 if $reply;
2684
2643 } else { 2685 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2686 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2687 }
2646 2688
2647 cf::override; 2689 cf::override;
… …
2708 2750
2709The following functions and methods are available within a safe environment: 2751The following functions and methods are available within a safe environment:
2710 2752
2711 cf::object 2753 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2754 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race 2755 insert remove name archname title slaying race decrease_ob_nr
2714 2756
2715 cf::object::player 2757 cf::object::player
2716 player 2758 player
2717 2759
2718 cf::player 2760 cf::player
… …
2723 2765
2724=cut 2766=cut
2725 2767
2726for ( 2768for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2769 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2770 insert remove inv name archname title slaying race
2771 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2772 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2773 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2774 ["cf::map" => qw(trigger)],
2732) { 2775) {
2733 no strict 'refs'; 2776 no strict 'refs';
… …
2809# the server's init and main functions 2852# the server's init and main functions
2810 2853
2811sub load_facedata($) { 2854sub load_facedata($) {
2812 my ($path) = @_; 2855 my ($path) = @_;
2813 2856
2857 # HACK to clear player env face cache, we need some signal framework
2858 # for this (global event?)
2859 %ext::player_env::MUSIC_FACE_CACHE = ();
2860
2861 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2862
2814 warn "loading facedata from $path\n"; 2863 warn "loading facedata from $path\n";
2815 2864
2816 my $facedata; 2865 my $facedata;
2817 0 < aio_load $path, $facedata 2866 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2867 or die "$path: $!";
2819 2868
2820 $facedata = Coro::Storable::thaw $facedata; 2869 $facedata = Coro::Storable::thaw $facedata;
2821 2870
2822 $facedata->{version} == 2 2871 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2872 or cf::cleanup "$path: version mismatch, cannot proceed.";
2873
2874 # patch in the exptable
2875 $facedata->{resource}{"res/exp_table"} = {
2876 type => FT_RSRC,
2877 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2878 };
2879 cf::cede_to_tick;
2824 2880
2825 { 2881 {
2826 my $faces = $facedata->{faceinfo}; 2882 my $faces = $facedata->{faceinfo};
2827 2883
2828 while (my ($face, $info) = each %$faces) { 2884 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2885 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2886 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2887 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2888 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2889 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2890
2835 cf::cede_to_tick; 2891 cf::cede_to_tick;
2836 } 2892 }
2837 2893
2838 while (my ($face, $info) = each %$faces) { 2894 while (my ($face, $info) = each %$faces) {
… …
2863 2919
2864 { 2920 {
2865 # TODO: for gcfclient pleasure, we should give resources 2921 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2922 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2923 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 2924
2870 my $soundconf = delete $res->{"res/sound.conf"}; 2925 my $soundconf = delete $res->{"res/sound.conf"};
2871 2926
2872 while (my ($name, $info) = each %$res) { 2927 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2928 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2929 my $data;
2879 2930
2880 if ($info->{type} & 1) { 2931 if ($info->{type} & 1) {
2881 # prepend meta info 2932 # prepend meta info
2882 2933
2934 my $meta = $enc->encode ({
2935 name => $name,
2936 %{ $info->{meta} || {} },
2937 });
2938
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 2939 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else { 2940 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2941 $data = $info->{data};
2889 } 2942 }
2890 2943
2944 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 2945 cf::face::set_type $idx, $info->{type};
2892 2946
2893 cf::cede_to_tick; 2947 cf::cede_to_tick;
2894 } 2948 }
2895 2949
… …
2922 $ns->fx_want ($k, $v); 2976 $ns->fx_want ($k, $v);
2923 } 2977 }
2924}; 2978};
2925 2979
2926sub reload_regions { 2980sub reload_regions {
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2927 load_resource_file "$MAPDIR/regions" 2985 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 2986 or die "unable to load regions file\n";
2929 2987
2930 for (cf::region::list) { 2988 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 2989 $_->{match} = qr/$_->{match}/
… …
2967 3025
2968sub init { 3026sub init {
2969 reload_resources; 3027 reload_resources;
2970} 3028}
2971 3029
2972sub cfg_load { 3030sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3031 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3032 or return;
2975 3033
2976 local $/; 3034 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3035 *CFG = YAML::Syck::Load <$fh>;
… …
2997 (async { 3055 (async {
2998 Event::one_event; 3056 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3057 })->prio (Coro::PRIO_MAX);
3000 }; 3058 };
3001 3059
3002 cfg_load; 3060 reload_config;
3003 db_init; 3061 db_init;
3004 load_extensions; 3062 load_extensions;
3005 3063
3006 $TICK_WATCHER->start; 3064 $TICK_WATCHER->start;
3007 Event::loop; 3065 Event::loop;
… …
3200 warn "reloading cf.pm"; 3258 warn "reloading cf.pm";
3201 require cf; 3259 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3260 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3261
3204 warn "loading config and database again"; 3262 warn "loading config and database again";
3205 cf::cfg_load; 3263 cf::reload_config;
3206 3264
3207 warn "loading extensions"; 3265 warn "loading extensions";
3208 cf::load_extensions; 3266 cf::load_extensions;
3209 3267
3210 warn "reattaching attachments to objects/players"; 3268 warn "reattaching attachments to objects/players";

Diff Legend

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