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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.352 by root, Sun Sep 2 04:57:14 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);
… …
1916 1918
1917 $self 1919 $self
1918} 1920}
1919 1921
1920# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1921sub load_diag { 1923sub load_neighbours {
1922 my ($map) = @_; 1924 my ($map) = @_;
1923 1925
1924 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1925 1927
1926 for (0 .. 3) { 1928 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1928 or next; 1930 or next;
1929 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1930 or next; 1932 or next;
1931 $neigh->load; 1933 $neigh->load;
1932 1934
1935 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 1938 }
1936 1939
1937 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1939 or next; 1943 or next;
1940 $neigh->load; 1944 $neigh->load;
1941 } 1945 }
1942} 1946}
1943 1947
… …
1948} 1952}
1949 1953
1950sub do_load_sync { 1954sub do_load_sync {
1951 my ($map) = @_; 1955 my ($map) = @_;
1952 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1953 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1954} 1961}
1955 1962
1956our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1958 1965
1959sub find_async { 1966sub find_async {
1960 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1961 1968
1962 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1963 1970
1964 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 1973 }
1967 1974
1968 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1969 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1970 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 1980 if (my $map = find $k) {
1973 $map->load; 1981 $map->load if $v;
1974 } 1982 }
1975 1983
1976 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1977 } 1985 }
1978 } 1986 }
1979 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1980 }; 1988 };
1981 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1984} 1992}
1985 1993
1986sub save { 1994sub save {
1987 my ($self) = @_; 1995 my ($self) = @_;
1988 1996
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 1998
1991 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1992 2000
1993 return unless $self->dirty; 2001 return unless $self->dirty;
1994 2002
… …
2017 my ($self) = @_; 2025 my ($self) = @_;
2018 2026
2019 # save first because save cedes 2027 # save first because save cedes
2020 $self->save; 2028 $self->save;
2021 2029
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2031
2024 return if $self->players; 2032 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2034 return if $self->{deny_save};
2027 2035
… …
2079my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2080 2088
2081sub nuke { 2089sub nuke {
2082 my ($self) = @_; 2090 my ($self) = @_;
2083 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2084 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2085 2096
2086 $self->unlink_save; 2097 $self->unlink_save;
2087 2098
2088 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2104
2094 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2095 2107
2096 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2097} 2109}
2098 2110
2099=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2315 2327
2316 $map->load; 2328 $map->load;
2317 $map->load_diag; 2329 $map->load_neighbours;
2318 2330
2319 return unless $self->contr->active; 2331 return unless $self->contr->active;
2320 $self->activate_recursive; 2332 $self->activate_recursive;
2321 2333
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 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 2505the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2495 2507
2496=cut 2508=cut
2497 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
2498sub cf::client::send_msg { 2525sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2527
2501 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2502 2529
2503 $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};
2504 2534
2505 if (ref $channel) { 2535 if (ref $channel) {
2506 # send meta info to client, if not yet sent 2536 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2537 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2538 $self->{channel}{$channel->{id}} = $channel;
… …
2555=cut 2585=cut
2556 2586
2557sub cf::client::ext_msg($$@) { 2587sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2588 my ($self, $type, @msg) = @_;
2559 2589
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2590 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2592 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2593 push @msg, msgtype => "event_$type";
2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 }
2596}
2597
2598=item $client->ext_reply ($msgid, @msg)
2599
2600Sends an ext reply to the client.
2601
2602=cut
2603
2604sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_;
2606
2607 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2613 }
2568} 2614}
2569 2615
2570=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2678 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2679 "ARRAY" eq ref $msg
2634 ? @$msg 2680 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2682
2683 my @reply;
2684
2637 if (my $cb = $EXTICMD{$type}) { 2685 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2686 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2643 } else { 2692 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2693 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2694 }
2646 2695
2647 cf::override; 2696 cf::override;
… …
2708 2757
2709The following functions and methods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2710 2759
2711 cf::object 2760 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2761 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race 2762 insert remove name archname title slaying race decrease_ob_nr
2714 2763
2715 cf::object::player 2764 cf::object::player
2716 player 2765 player
2717 2766
2718 cf::player 2767 cf::player
… …
2723 2772
2724=cut 2773=cut
2725 2774
2726for ( 2775for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2777 insert remove inv name archname title slaying race
2778 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2732) { 2782) {
2733 no strict 'refs'; 2783 no strict 'refs';
… …
2809# the server's init and main functions 2859# the server's init and main functions
2810 2860
2811sub load_facedata($) { 2861sub load_facedata($) {
2812 my ($path) = @_; 2862 my ($path) = @_;
2813 2863
2864 # HACK to clear player env face cache, we need some signal framework
2865 # for this (global event?)
2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2867
2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2869
2814 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2815 2871
2816 my $facedata; 2872 my $facedata;
2817 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2874 or die "$path: $!";
2819 2875
2820 $facedata = Coro::Storable::thaw $facedata; 2876 $facedata = Coro::Storable::thaw $facedata;
2821 2877
2822 $facedata->{version} == 2 2878 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2879 or cf::cleanup "$path: version mismatch, cannot proceed.";
2880
2881 # patch in the exptable
2882 $facedata->{resource}{"res/exp_table"} = {
2883 type => FT_RSRC,
2884 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2885 };
2886 cf::cede_to_tick;
2824 2887
2825 { 2888 {
2826 my $faces = $facedata->{faceinfo}; 2889 my $faces = $facedata->{faceinfo};
2827 2890
2828 while (my ($face, $info) = each %$faces) { 2891 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2893 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2894 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2897
2835 cf::cede_to_tick; 2898 cf::cede_to_tick;
2836 } 2899 }
2837 2900
2838 while (my ($face, $info) = each %$faces) { 2901 while (my ($face, $info) = each %$faces) {
… …
2863 2926
2864 { 2927 {
2865 # TODO: for gcfclient pleasure, we should give resources 2928 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2929 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2930 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 2931
2870 my $soundconf = delete $res->{"res/sound.conf"}; 2932 my $soundconf = delete $res->{"res/sound.conf"};
2871 2933
2872 while (my ($name, $info) = each %$res) { 2934 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; 2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2879 2937
2880 if ($info->{type} & 1) { 2938 if ($info->{type} & 1) {
2881 # prepend meta info 2939 # prepend meta info
2882 2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 2946 $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 { 2947 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2948 $data = $info->{data};
2889 } 2949 }
2890 2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 2952 cf::face::set_type $idx, $info->{type};
2892 2953
2893 cf::cede_to_tick; 2954 cf::cede_to_tick;
2894 } 2955 }
2895 2956
… …
2922 $ns->fx_want ($k, $v); 2983 $ns->fx_want ($k, $v);
2923 } 2984 }
2924}; 2985};
2925 2986
2926sub reload_regions { 2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2927 load_resource_file "$MAPDIR/regions" 2992 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 2993 or die "unable to load regions file\n";
2929 2994
2930 for (cf::region::list) { 2995 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 2996 $_->{match} = qr/$_->{match}/
… …
2967 3032
2968sub init { 3033sub init {
2969 reload_resources; 3034 reload_resources;
2970} 3035}
2971 3036
2972sub cfg_load { 3037sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3039 or return;
2975 3040
2976 local $/; 3041 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
… …
2997 (async { 3062 (async {
2998 Event::one_event; 3063 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
3000 }; 3065 };
3001 3066
3002 cfg_load; 3067 reload_config;
3003 db_init; 3068 db_init;
3004 load_extensions; 3069 load_extensions;
3005 3070
3006 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
3007 Event::loop; 3072 Event::loop;
… …
3200 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
3201 require cf; 3266 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3268
3204 warn "loading config and database again"; 3269 warn "loading config and database again";
3205 cf::cfg_load; 3270 cf::reload_config;
3206 3271
3207 warn "loading extensions"; 3272 warn "loading extensions";
3208 cf::load_extensions; 3273 cf::load_extensions;
3209 3274
3210 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";

Diff Legend

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