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.323 by root, Sat Jul 28 12:02:58 2007 UTC vs.
Revision 1.345 by root, Tue Aug 28 19:30:11 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
474 475
475=cut 476=cut
476 477
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 478sub fork_call(&@) {
487 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
488 480
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
492 or die "pipe: $!";
493 484
494 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 486 reset_signals;
508 local $SIG{__WARN__}; 487 &$cb
509 local $SIG{__DIE__}; 488 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 489
516 eval { 490 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 491}
529 492
530=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
531 494
532Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
1186 my ($type, $reply, @payload) = 1149 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1150 "ARRAY" eq ref $msg
1188 ? @$msg 1151 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1153
1154 my @reply;
1155
1191 if (my $cb = $EXTCMD{$type}) { 1156 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1157 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1197 } else { 1163 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1165 }
1200 1166
1201 cf::override; 1167 cf::override;
… …
1370 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1371 1337
1372 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1373 1339
1374 $self 1340 $self
1341}
1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1375} 1351}
1376 1352
1377=item $pl->quit_character 1353=item $pl->quit_character
1378 1354
1379Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1532=cut 1508=cut
1533 1509
1534sub ext_reply($$@) { 1510sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1511 my ($self, $id, @msg) = @_;
1536 1512
1537 if ($self->ns->extcmd == 2) { 1513 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1514}
1545 1515
1546=item $player->ext_msg ($type, @msg) 1516=item $player->ext_msg ($type, @msg)
1547 1517
1548Sends an ext event to the client. 1518Sends an ext event to the client.
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1880 1850
1881 my $path = $self->{path}; 1851 my $path = $self->{path};
1882 1852
1883 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1884 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1885 1856
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1887 1858
1888 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1889 1860
… …
1921 $self->set_darkness_map; 1892 $self->set_darkness_map;
1922 Coro::cede; 1893 Coro::cede;
1923 $self->activate; 1894 $self->activate;
1924 } 1895 }
1925 1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1899
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1900 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1901 }
1928 1902
1929 $self->post_load; 1903 $self->post_load;
1930} 1904}
… …
1940 1914
1941 $self 1915 $self
1942} 1916}
1943 1917
1944# find and load all maps in the 3x3 area around a map 1918# find and load all maps in the 3x3 area around a map
1945sub load_diag { 1919sub load_neighbours {
1946 my ($map) = @_; 1920 my ($map) = @_;
1947 1921
1948 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1949 1923
1950 for (0 .. 3) { 1924 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1952 or next; 1926 or next;
1953 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1954 or next; 1928 or next;
1955 $neigh->load; 1929 $neigh->load;
1956 1930
1931 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1934 }
1960 1935
1961 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1963 or next; 1939 or next;
1964 $neigh->load; 1940 $neigh->load;
1965 } 1941 }
1966} 1942}
1967 1943
… …
1972} 1948}
1973 1949
1974sub do_load_sync { 1950sub do_load_sync {
1975 my ($map) = @_; 1951 my ($map) = @_;
1976 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1977 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1978} 1957}
1979 1958
1980our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1982 1961
1983sub find_async { 1962sub find_async {
1984 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1985 1964
1986 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1987 1966
1988 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 1969 }
1991 1970
1992 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1993 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1994 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 1976 if (my $map = find $k) {
1997 $map->load; 1977 $map->load if $v;
1998 } 1978 }
1999 1979
2000 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
2001 } 1981 }
2002 } 1982 }
2003 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
2004 }; 1984 };
2005 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
… …
2008} 1988}
2009 1989
2010sub save { 1990sub save {
2011 my ($self) = @_; 1991 my ($self) = @_;
2012 1992
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 1994
2015 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
2016 1996
2017 return unless $self->dirty; 1997 return unless $self->dirty;
2018 1998
… …
2041 my ($self) = @_; 2021 my ($self) = @_;
2042 2022
2043 # save first because save cedes 2023 # save first because save cedes
2044 $self->save; 2024 $self->save;
2045 2025
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2027
2048 return if $self->players; 2028 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2030 return if $self->{deny_save};
2051 2031
… …
2240 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2241 } 2221 }
2242 } 2222 }
2243} 2223}
2244 2224
2225=item $object->send_msg ($channel, $msg, $color, [extra...])
2226
2227=cut
2228
2229sub cf::object::send_msg {
2230 my $pl = shift->contr
2231 or return;
2232 $pl->send_msg (@_);
2233}
2234
2245=item $player_object->may ("access") 2235=item $player_object->may ("access")
2246 2236
2247Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2238(e.g. "command_wizcast").
2249 2239
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
2329 2319
2330 $map->load; 2320 $map->load;
2331 $map->load_diag; 2321 $map->load_neighbours;
2332 2322
2333 return unless $self->contr->active; 2323 return unless $self->contr->active;
2334 $self->activate_recursive; 2324 $self->activate_recursive;
2335 2325
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2547 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2537 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2548 } 2538 }
2549 2539
2550 $color &= cf::NDI_COLOR_MASK; 2540 $color &= cf::NDI_COLOR_MASK;
2551 2541
2542 utf8::encode $msg;
2543
2552 if (0 && $msg =~ /\[/) { 2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2553 $self->send_packet ("drawextinfo $color 4 0 $msg") 2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2554 } else { 2547 } else {
2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2556 $self->send_packet ("drawinfo $color $msg") 2549 $self->send_packet ("drawinfo $color $msg")
2557 } 2550 }
2558 } 2551 }
… …
2566=cut 2559=cut
2567 2560
2568sub cf::client::ext_msg($$@) { 2561sub cf::client::ext_msg($$@) {
2569 my ($self, $type, @msg) = @_; 2562 my ($self, $type, @msg) = @_;
2570 2563
2571 my $extcmd = $self->extcmd;
2572
2573 if ($extcmd == 2) { 2564 if ($self->extcmd == 2) {
2574 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2575 } elsif ($extcmd == 1) { # TODO: remove 2566 } elsif ($self->extcmd == 1) { # TODO: remove
2576 push @msg, msgtype => "event_$type"; 2567 push @msg, msgtype => "event_$type";
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2571
2572=item $client->ext_reply ($msgid, @msg)
2573
2574Sends an ext reply to the client.
2575
2576=cut
2577
2578sub cf::client::ext_reply($$@) {
2579 my ($self, $id, @msg) = @_;
2580
2581 if ($self->extcmd == 2) {
2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2583 } elsif ($self->extcmd == 1) {
2584 #TODO: version 1, remove
2585 unshift @msg, msgtype => "reply", msgid => $id;
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2578 } 2587 }
2579} 2588}
2580 2589
2581=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
… …
2643 my ($type, $reply, @payload) = 2652 my ($type, $reply, @payload) =
2644 "ARRAY" eq ref $msg 2653 "ARRAY" eq ref $msg
2645 ? @$msg 2654 ? @$msg
2646 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2647 2656
2657 my @reply;
2658
2648 if (my $cb = $EXTICMD{$type}) { 2659 if (my $cb = $EXTICMD{$type}) {
2649 my @reply = $cb->($ns, @payload); 2660 @reply = $cb->($ns, @payload);
2650
2651 $ns->ext_reply ($reply, @reply)
2652 if $reply;
2653 } 2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2654 } else { 2666 } else {
2655 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2667 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2656 } 2668 }
2657 2669
2658 cf::override; 2670 cf::override;
… …
2705our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2706our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2707 2719
2708$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2709 2721
2710$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2722$safe->permit_only (Opcode::opset qw(
2723 :base_core :base_mem :base_orig :base_math
2724 grepstart grepwhile mapstart mapwhile
2725 sort time
2726));
2711 2727
2712# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2713 2729
2714=pod 2730=pod
2715 2731
2716The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2717 2733
2718 cf::object 2734 cf::object
2719 contr pay_amount pay_player map x y force_find force_add 2735 contr pay_amount pay_player map x y force_find force_add
2720 insert remove 2736 insert remove name archname title slaying race decrease_ob_nr
2721 2737
2722 cf::object::player 2738 cf::object::player
2723 player 2739 player
2724 2740
2725 cf::player 2741 cf::player
… …
2730 2746
2731=cut 2747=cut
2732 2748
2733for ( 2749for (
2734 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2750 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2751 insert remove inv name archname title slaying race
2735 insert remove)], 2752 decrease_ob_nr)],
2736 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2737 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2738 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2739) { 2756) {
2740 no strict 'refs'; 2757 no strict 'refs';
… …
2816# the server's init and main functions 2833# the server's init and main functions
2817 2834
2818sub load_facedata($) { 2835sub load_facedata($) {
2819 my ($path) = @_; 2836 my ($path) = @_;
2820 2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839
2821 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2822 2841
2823 my $facedata; 2842 my $facedata;
2824 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2825 or die "$path: $!"; 2844 or die "$path: $!";
2826 2845
2827 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2828 2847
2829 $facedata->{version} == 2 2848 $facedata->{version} == 2
2830 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2831 2857
2832 { 2858 {
2833 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2834 2860
2835 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2836 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2837 cf::face::set_visibility $idx, $info->{visibility}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2838 cf::face::set_magicmap $idx, $info->{magicmap}; 2864 cf::face::set_magicmap $idx, $info->{magicmap};
2839 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2840 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2841 2867
2842 cf::cede_to_tick; 2868 cf::cede_to_tick;
2843 } 2869 }
2844 2870
2845 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
… …
2870 2896
2871 { 2897 {
2872 # TODO: for gcfclient pleasure, we should give resources 2898 # TODO: for gcfclient pleasure, we should give resources
2873 # that gcfclient doesn't grok a >10000 face index. 2899 # that gcfclient doesn't grok a >10000 face index.
2874 my $res = $facedata->{resource}; 2900 my $res = $facedata->{resource};
2875 my $enc = JSON::XS->new->utf8->canonical;
2876 2901
2877 my $soundconf = delete $res->{"res/sound.conf"}; 2902 my $soundconf = delete $res->{"res/sound.conf"};
2878 2903
2879 while (my ($name, $info) = each %$res) { 2904 while (my ($name, $info) = each %$res) {
2880 my $meta = $enc->encode ({
2881 name => $name,
2882 %{ $info->{meta} || {} },
2883 });
2884
2885 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2886 2907
2887 if ($info->{type} & 1) { 2908 if ($info->{type} & 1) {
2888 # prepend meta info 2909 # prepend meta info
2889 2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2890 my $data = pack "(w/a*)*", $meta, $info->{data}; 2916 $data = pack "(w/a*)*", $meta, $info->{data};
2891 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2892
2893 cf::face::set_data $idx, 0, $data, $chk;
2894 } else { 2917 } else {
2895 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2918 $data = $info->{data};
2896 } 2919 }
2897 2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2898 cf::face::set_type $idx, $info->{type}; 2922 cf::face::set_type $idx, $info->{type};
2899 2923
2900 cf::cede_to_tick; 2924 cf::cede_to_tick;
2901 } 2925 }
2902 2926
… …
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) { 2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_] 2931 my $sound = $soundconf->{compat}[$_]
2908 or next; 2932 or next;
2909 2933
2910 my $face = cf::face::find "sound/$sound->[1]"; 2934 my $face = cf::face::find "sound/$sound->[1]";
2911
2912 cf::sound::set $sound->[0] => $face; 2935 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat 2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 } 2937 }
2915 2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2916 #TODO 2942 }
2917 } 2943 }
2918 } 2944 }
2919 2945
2920 1 2946 1
2921} 2947}
… …
2972 2998
2973sub init { 2999sub init {
2974 reload_resources; 3000 reload_resources;
2975} 3001}
2976 3002
2977sub cfg_load { 3003sub reload_config {
2978 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2979 or return; 3005 or return;
2980 3006
2981 local $/; 3007 local $/;
2982 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
… …
3002 (async { 3028 (async {
3003 Event::one_event; 3029 Event::one_event;
3004 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
3005 }; 3031 };
3006 3032
3007 cfg_load; 3033 reload_config;
3008 db_init; 3034 db_init;
3009 load_extensions; 3035 load_extensions;
3010 3036
3011 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
3012 Event::loop; 3038 Event::loop;
… …
3205 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
3206 require cf; 3232 require cf;
3207 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3208 3234
3209 warn "loading config and database again"; 3235 warn "loading config and database again";
3210 cf::cfg_load; 3236 cf::reload_config;
3211 3237
3212 warn "loading extensions"; 3238 warn "loading extensions";
3213 cf::load_extensions; 3239 cf::load_extensions;
3214 3240
3215 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

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