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.317 by root, Mon Jul 23 23:38:17 2007 UTC vs.
Revision 1.344 by root, Mon Aug 27 02:43:38 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.
… …
1921 $self->set_darkness_map; 1891 $self->set_darkness_map;
1922 Coro::cede; 1892 Coro::cede;
1923 $self->activate; 1893 $self->activate;
1924 } 1894 }
1925 1895
1896 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME);
1898
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1899 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1900 }
1928 1901
1929 $self->post_load; 1902 $self->post_load;
1930} 1903}
… …
1940 1913
1941 $self 1914 $self
1942} 1915}
1943 1916
1944# find and load all maps in the 3x3 area around a map 1917# find and load all maps in the 3x3 area around a map
1945sub load_diag { 1918sub load_neighbours {
1946 my ($map) = @_; 1919 my ($map) = @_;
1947 1920
1948 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1949 1922
1950 for (0 .. 3) { 1923 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1952 or next; 1925 or next;
1953 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1954 or next; 1927 or next;
1955 $neigh->load; 1928 $neigh->load;
1956 1929
1930 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1933 }
1960 1934
1961 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1963 or next; 1938 or next;
1964 $neigh->load; 1939 $neigh->load;
1965 } 1940 }
1966} 1941}
1967 1942
… …
1972} 1947}
1973 1948
1974sub do_load_sync { 1949sub do_load_sync {
1975 my ($map) = @_; 1950 my ($map) = @_;
1976 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main;
1954
1977 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1978} 1956}
1979 1957
1980our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 1959our $MAP_PREFETCHER = undef;
1982 1960
1983sub find_async { 1961sub find_async {
1984 my ($path, $origin) = @_; 1962 my ($path, $origin, $load) = @_;
1985 1963
1986 $path = normalise $path, $origin && $origin->{path}; 1964 $path = normalise $path, $origin && $origin->{path};
1987 1965
1988 if (my $map = $cf::MAP{$path}) { 1966 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 1968 }
1991 1969
1992 undef $MAP_PREFETCH{$path}; 1970 $MAP_PREFETCH{$path} |= $load;
1971
1993 $MAP_PREFETCHER ||= cf::async { 1972 $MAP_PREFETCHER ||= cf::async {
1994 while (%MAP_PREFETCH) { 1973 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 1974 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 1975 if (my $map = find $k) {
1997 $map->load; 1976 $map->load if $v;
1998 } 1977 }
1999 1978
2000 delete $MAP_PREFETCH{$path}; 1979 delete $MAP_PREFETCH{$k};
2001 } 1980 }
2002 } 1981 }
2003 undef $MAP_PREFETCHER; 1982 undef $MAP_PREFETCHER;
2004 }; 1983 };
2005 $MAP_PREFETCHER->prio (6); 1984 $MAP_PREFETCHER->prio (6);
… …
2240 $self->message ($msg, $flags); 2219 $self->message ($msg, $flags);
2241 } 2220 }
2242 } 2221 }
2243} 2222}
2244 2223
2224=item $object->send_msg ($channel, $msg, $color, [extra...])
2225
2226=cut
2227
2228sub cf::object::send_msg {
2229 my $pl = shift->contr
2230 or return;
2231 $pl->send_msg (@_);
2232}
2233
2245=item $player_object->may ("access") 2234=item $player_object->may ("access")
2246 2235
2247Returns wether the given player is authorized to access resource "access" 2236Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2237(e.g. "command_wizcast").
2249 2238
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2315 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2316 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2317 if $x <=0 && $y <= 0;
2329 2318
2330 $map->load; 2319 $map->load;
2331 $map->load_diag; 2320 $map->load_neighbours;
2332 2321
2333 return unless $self->contr->active; 2322 return unless $self->contr->active;
2334 $self->activate_recursive; 2323 $self->activate_recursive;
2335 2324
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2512sub cf::client::send_msg { 2501sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2502 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2503
2515 $msg = $self->pl->expand_cfpod ($msg); 2504 $msg = $self->pl->expand_cfpod ($msg);
2516 2505
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2506 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2507
2519 if (ref $channel) { 2508 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2509 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2510 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2511 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel); 2512 $self->ext_msg (channel_info => $channel);
2524 } 2513 }
2525 2514
2526 $channel = $channel->{id}; 2515 $channel = $channel->{id};
2527 } 2516 }
2528 2517
2529 return unless @extra || length $msg; 2518 return unless @extra || length $msg;
2530 2519
2531 if ($self->can_msg) { 2520 if ($self->can_msg) {
2521 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF;
2524
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2525 $self->send_packet ("msg " . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2527 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2528 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones
2530 for ($msg) {
2531 1 while
2532 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2533 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2534 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2535 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2536 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2537 }
2538
2539 $color &= cf::NDI_COLOR_MASK;
2540
2541 utf8::encode $msg;
2542
2545 if (0 && $msg =~ /\[/) { 2543 if (0 && $msg =~ /\[/) {
2544 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2546 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2548 $self->send_packet ("drawinfo $color $msg")
2550 } 2549 }
2551 } 2550 }
… …
2559=cut 2558=cut
2560 2559
2561sub cf::client::ext_msg($$@) { 2560sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2561 my ($self, $type, @msg) = @_;
2563 2562
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2563 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2565 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2566 push @msg, msgtype => "event_$type";
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2568 }
2569}
2570
2571=item $client->ext_reply ($msgid, @msg)
2572
2573Sends an ext reply to the client.
2574
2575=cut
2576
2577sub cf::client::ext_reply($$@) {
2578 my ($self, $id, @msg) = @_;
2579
2580 if ($self->extcmd == 2) {
2581 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2582 } elsif ($self->extcmd == 1) {
2583 #TODO: version 1, remove
2584 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2585 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2586 }
2572} 2587}
2573 2588
2574=item $success = $client->query ($flags, "text", \&cb) 2589=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 2651 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2652 "ARRAY" eq ref $msg
2638 ? @$msg 2653 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2654 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2655
2656 my @reply;
2657
2641 if (my $cb = $EXTICMD{$type}) { 2658 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2659 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2660 }
2661
2662 $ns->ext_reply ($reply, @reply)
2663 if $reply;
2664
2647 } else { 2665 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2666 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2667 }
2650 2668
2651 cf::override; 2669 cf::override;
… …
2698our $safe = new Safe "safe"; 2716our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2717our $safe_hole = new Safe::Hole;
2700 2718
2701$SIG{FPE} = 'IGNORE'; 2719$SIG{FPE} = 'IGNORE';
2702 2720
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2721$safe->permit_only (Opcode::opset qw(
2722 :base_core :base_mem :base_orig :base_math
2723 grepstart grepwhile mapstart mapwhile
2724 sort time
2725));
2704 2726
2705# here we export the classes and methods available to script code 2727# here we export the classes and methods available to script code
2706 2728
2707=pod 2729=pod
2708 2730
2709The following functions and methods are available within a safe environment: 2731The following functions and methods are available within a safe environment:
2710 2732
2711 cf::object 2733 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2734 contr pay_amount pay_player map x y force_find force_add
2713 insert remove 2735 insert remove name archname title slaying race decrease_ob_nr
2714 2736
2715 cf::object::player 2737 cf::object::player
2716 player 2738 player
2717 2739
2718 cf::player 2740 cf::player
… …
2723 2745
2724=cut 2746=cut
2725 2747
2726for ( 2748for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2749 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2750 insert remove inv name archname title slaying race
2728 insert remove)], 2751 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2752 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2753 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2754 ["cf::map" => qw(trigger)],
2732) { 2755) {
2733 no strict 'refs'; 2756 no strict 'refs';
… …
2809# the server's init and main functions 2832# the server's init and main functions
2810 2833
2811sub load_facedata($) { 2834sub load_facedata($) {
2812 my ($path) = @_; 2835 my ($path) = @_;
2813 2836
2837 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2838
2814 warn "loading facedata from $path\n"; 2839 warn "loading facedata from $path\n";
2815 2840
2816 my $facedata; 2841 my $facedata;
2817 0 < aio_load $path, $facedata 2842 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2843 or die "$path: $!";
2819 2844
2820 $facedata = Coro::Storable::thaw $facedata; 2845 $facedata = Coro::Storable::thaw $facedata;
2821 2846
2822 $facedata->{version} == 2 2847 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2848 or cf::cleanup "$path: version mismatch, cannot proceed.";
2849
2850 # patch in the exptable
2851 $facedata->{resource}{"res/exp_table"} = {
2852 type => FT_RSRC,
2853 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2854 };
2855 cf::cede_to_tick;
2824 2856
2825 { 2857 {
2826 my $faces = $facedata->{faceinfo}; 2858 my $faces = $facedata->{faceinfo};
2827 2859
2828 while (my ($face, $info) = each %$faces) { 2860 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2861 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2862 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2863 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2864 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2865 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2866
2835 cf::cede_to_tick; 2867 cf::cede_to_tick;
2836 } 2868 }
2837 2869
2838 while (my ($face, $info) = each %$faces) { 2870 while (my ($face, $info) = each %$faces) {
… …
2863 2895
2864 { 2896 {
2865 # TODO: for gcfclient pleasure, we should give resources 2897 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2898 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2899 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical; 2900
2901 my $soundconf = delete $res->{"res/sound.conf"};
2869 2902
2870 while (my ($name, $info) = each %$res) { 2903 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({
2872 name => $name,
2873 type => $info->{type},
2874 copyright => $info->{copyright}, #TODO#
2875 });
2876
2877 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2904 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2905 my $data;
2878 2906
2879 if ($name =~ /\.(?:jpg|png)$/) { 2907 if ($info->{type} & 1) {
2880 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2908 # prepend meta info
2881 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2909
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 $data = pack "(w/a*)*", $meta, $info->{data};
2882 } else { 2916 } else {
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 2917 $data = $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_type $idx, 1;
2887 cf::face::set_data $idx, 0, $data, $chk;
2888 } 2918 }
2889 2919
2920 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2921 cf::face::set_type $idx, $info->{type};
2922
2890 cf::cede_to_tick; 2923 cf::cede_to_tick;
2891 } 2924 }
2925
2926 if ($soundconf) {
2927 $soundconf = $enc->decode (delete $soundconf->{data});
2928
2929 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2930 my $sound = $soundconf->{compat}[$_]
2931 or next;
2932
2933 my $face = cf::face::find "sound/$sound->[1]";
2934 cf::sound::set $sound->[0] => $face;
2935 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2936 }
2937
2938 while (my ($k, $v) = each %{$soundconf->{event}}) {
2939 my $face = cf::face::find "sound/$v";
2940 cf::sound::set $k => $face;
2941 }
2942 }
2892 } 2943 }
2893 2944
2894 1 2945 1
2895} 2946}
2947
2948register_exticmd fx_want => sub {
2949 my ($ns, $want) = @_;
2950
2951 while (my ($k, $v) = each %$want) {
2952 $ns->fx_want ($k, $v);
2953 }
2954};
2896 2955
2897sub reload_regions { 2956sub reload_regions {
2898 load_resource_file "$MAPDIR/regions" 2957 load_resource_file "$MAPDIR/regions"
2899 or die "unable to load regions file\n"; 2958 or die "unable to load regions file\n";
2900 2959

Diff Legend

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