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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.337 by root, Tue Aug 21 00:54:01 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 1.4 ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
… …
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.
… …
1181 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1182 1145
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1147
1185 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1188 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1189 } 1158 if $reply;
1190 } 1159 }
1191 } else { 1160 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1162 }
1194 1163
… …
1364 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1365 1334
1366 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1367 1336
1368 $self 1337 $self
1338}
1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1369} 1348}
1370 1349
1371=item $pl->quit_character 1350=item $pl->quit_character
1372 1351
1373Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1517sub hintmode { 1496sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1498 $_[0]{hintmode}
1520} 1499}
1521 1500
1522=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1523 1502
1524Sends an ext reply to the player. 1503Sends an ext reply to the player.
1525 1504
1526=cut 1505=cut
1527 1506
1528sub ext_reply($$%) { 1507sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1530 1509
1531 $msg{msgid} = $id; 1510 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1511}
1534 1512
1535=item $player->ext_event ($type, %msg) 1513=item $player->ext_msg ($type, @msg)
1536 1514
1537Sends an ext event to the client. 1515Sends an ext event to the client.
1538 1516
1539=cut 1517=cut
1540 1518
1541sub ext_event($$%) { 1519sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1520 my ($self, $type, @msg) = @_;
1543 1521
1544 $self->ns->ext_event ($type, %msg); 1522 $self->ns->ext_msg ($type, @msg);
1545} 1523}
1546 1524
1547=head3 cf::region 1525=head3 cf::region
1548 1526
1549=over 4 1527=over 4
… …
1910 $self->set_darkness_map; 1888 $self->set_darkness_map;
1911 Coro::cede; 1889 Coro::cede;
1912 $self->activate; 1890 $self->activate;
1913 } 1891 }
1914 1892
1893 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME);
1895
1915 $self->in_memory (cf::MAP_IN_MEMORY); 1896 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 1897 }
1917 1898
1918 $self->post_load; 1899 $self->post_load;
1919} 1900}
… …
1929 1910
1930 $self 1911 $self
1931} 1912}
1932 1913
1933# find and load all maps in the 3x3 area around a map 1914# find and load all maps in the 3x3 area around a map
1934sub load_diag { 1915sub load_neighbours {
1935 my ($map) = @_; 1916 my ($map) = @_;
1936 1917
1937 my @diag; # diagonal neighbours 1918 my @neigh; # diagonal neighbours
1938 1919
1939 for (0 .. 3) { 1920 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 1921 my $neigh = $map->tile_path ($_)
1941 or next; 1922 or next;
1942 $neigh = find $neigh, $map 1923 $neigh = find $neigh, $map
1943 or next; 1924 or next;
1944 $neigh->load; 1925 $neigh->load;
1945 1926
1927 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1928 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1929 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 1930 }
1949 1931
1950 for (@diag) { 1932 for (grep defined $_->[0], @neigh) {
1933 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 1934 my $neigh = find $path, $origin
1952 or next; 1935 or next;
1953 $neigh->load; 1936 $neigh->load;
1954 } 1937 }
1955} 1938}
1956 1939
… …
2219 2202
2220 } else { 2203 } else {
2221 my $pl = $self->contr; 2204 my $pl = $self->contr;
2222 2205
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2206 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2207 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2208 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2209
2232 } else { 2210 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2211 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2212 $self->message ($msg, $flags);
2235 } 2213 }
2236 } 2214 }
2215}
2216
2217=item $object->send_msg ($channel, $msg, $color, [extra...])
2218
2219=cut
2220
2221sub cf::object::send_msg {
2222 my $pl = shift->contr
2223 or return;
2224 $pl->send_msg (@_);
2237} 2225}
2238 2226
2239=item $player_object->may ("access") 2227=item $player_object->may ("access")
2240 2228
2241Returns wether the given player is authorized to access resource "access" 2229Returns wether the given player is authorized to access resource "access"
… …
2320 # use -1 or undef as default coordinates, not 0, 0 2308 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2309 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2310 if $x <=0 && $y <= 0;
2323 2311
2324 $map->load; 2312 $map->load;
2325 $map->load_diag; 2313 $map->load_neighbours;
2326 2314
2327 return unless $self->contr->active; 2315 return unless $self->contr->active;
2328 $self->activate_recursive; 2316 $self->activate_recursive;
2329 2317
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2318 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2506sub cf::client::send_msg { 2494sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2495 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2496
2509 $msg = $self->pl->expand_cfpod ($msg); 2497 $msg = $self->pl->expand_cfpod ($msg);
2510 2498
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2499 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2500
2513 if (ref $channel) { 2501 if (ref $channel) {
2514 # send meta info to client, if not yet sent 2502 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2503 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2504 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2505 $self->ext_msg (channel_info => $channel);
2518 } 2506 }
2519 2507
2520 $channel = $channel->{id}; 2508 $channel = $channel->{id};
2521 } 2509 }
2522 2510
2523 return unless @extra || length $msg; 2511 return unless @extra || length $msg;
2524 2512
2525 if ($self->can_msg) { 2513 if ($self->can_msg) {
2514 # default colour, mask it out
2515 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2516 if $color & cf::NDI_DEF;
2517
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2518 $self->send_packet ("msg " . $self->{json_coder}->encode (
2519 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2520 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 if ($color >= 0) { 2521 if ($color >= 0) {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 $color &= cf::NDI_COLOR_MASK;
2533
2534 utf8::encode $msg;
2535
2539 if (0 && $msg =~ /\[/) { 2536 if (0 && $msg =~ /\[/) {
2537 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2538 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2539 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2540 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2541 $self->send_packet ("drawinfo $color $msg")
2544 } 2542 }
2545 } 2543 }
2546 } 2544 }
2547} 2545}
2548 2546
2549=item $client->ext_event ($type, %msg) 2547=item $client->ext_msg ($type, @msg)
2550 2548
2551Sends an ext event to the client. 2549Sends an ext event to the client.
2552 2550
2553=cut 2551=cut
2554 2552
2555sub cf::client::ext_event($$%) { 2553sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2554 my ($self, $type, @msg) = @_;
2557 2555
2558 return unless $self->extcmd; 2556 my $extcmd = $self->extcmd;
2559 2557
2558 if ($extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2561 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 }
2564}
2565
2566=item $client->ext_reply ($msgid, @msg)
2567
2568Sends an ext reply to the client.
2569
2570=cut
2571
2572sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_;
2574
2575 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) {
2578 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 }
2562} 2582}
2563 2583
2564=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2565 2585
2566Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
… …
2621 my ($ns, $buf) = @_; 2641 my ($ns, $buf) = @_;
2622 2642
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2643 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2644
2625 if (ref $msg) { 2645 if (ref $msg) {
2646 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg
2648 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2651 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2652 my @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid}; 2653
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2654 $ns->ext_reply ($reply, @reply)
2630 } 2655 if $reply;
2631 } 2656 }
2632 } else { 2657 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2659 }
2635 2660
… …
2683our $safe = new Safe "safe"; 2708our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2709our $safe_hole = new Safe::Hole;
2685 2710
2686$SIG{FPE} = 'IGNORE'; 2711$SIG{FPE} = 'IGNORE';
2687 2712
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2713$safe->permit_only (Opcode::opset qw(
2714 :base_core :base_mem :base_orig :base_math
2715 grepstart grepwhile mapstart mapwhile
2716 sort time
2717));
2689 2718
2690# here we export the classes and methods available to script code 2719# here we export the classes and methods available to script code
2691 2720
2692=pod 2721=pod
2693 2722
2694The following functions and methods are available within a safe environment: 2723The following functions and methods are available within a safe environment:
2695 2724
2696 cf::object 2725 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2726 contr pay_amount pay_player map x y force_find force_add
2698 insert remove 2727 insert remove name archname title slaying race
2699 2728
2700 cf::object::player 2729 cf::object::player
2701 player 2730 player
2702 2731
2703 cf::player 2732 cf::player
… …
2708 2737
2709=cut 2738=cut
2710 2739
2711for ( 2740for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2713 insert remove)], 2742 insert remove inv name archname title slaying race)],
2714 ["cf::object::player" => qw(player)], 2743 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2744 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2745 ["cf::map" => qw(trigger)],
2717) { 2746) {
2718 no strict 'refs'; 2747 no strict 'refs';
… …
2794# the server's init and main functions 2823# the server's init and main functions
2795 2824
2796sub load_facedata($) { 2825sub load_facedata($) {
2797 my ($path) = @_; 2826 my ($path) = @_;
2798 2827
2828 my $enc = JSON::XS->new->utf8->canonical;
2829
2799 warn "loading facedata from $path\n"; 2830 warn "loading facedata from $path\n";
2800 2831
2801 my $facedata; 2832 my $facedata;
2802 0 < aio_load $path, $facedata 2833 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 2834 or die "$path: $!";
2804 2835
2805 $facedata = Coro::Storable::thaw $facedata; 2836 $facedata = Coro::Storable::thaw $facedata;
2806 2837
2807 $facedata->{version} == 2 2838 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 2839 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840
2841 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 };
2846 cf::cede_to_tick;
2809 2847
2810 { 2848 {
2811 my $faces = $facedata->{faceinfo}; 2849 my $faces = $facedata->{faceinfo};
2812 2850
2813 while (my ($face, $info) = each %$faces) { 2851 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2852 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 2853 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 2854 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 2857
2820 cf::cede_to_tick; 2858 cf::cede_to_tick;
2821 } 2859 }
2822 2860
2823 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
… …
2848 2886
2849 { 2887 {
2850 # TODO: for gcfclient pleasure, we should give resources 2888 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 2889 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 2890 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 2891
2892 my $soundconf = delete $res->{"res/sound.conf"};
2854 2893
2855 while (my ($name, $info) = each %$res) { 2894 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2895 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data;
2863 2897
2864 if ($name =~ /\.jpg$/) { 2898 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2899 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2900
2901 my $meta = $enc->encode ({
2902 name => $name,
2903 %{ $info->{meta} || {} },
2904 });
2905
2906 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 2907 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 2908 $data = $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 2909 }
2874 2910
2911 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2912 cf::face::set_type $idx, $info->{type};
2913
2875 cf::cede_to_tick; 2914 cf::cede_to_tick;
2876 } 2915 }
2916
2917 if ($soundconf) {
2918 $soundconf = $enc->decode (delete $soundconf->{data});
2919
2920 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2921 my $sound = $soundconf->{compat}[$_]
2922 or next;
2923
2924 my $face = cf::face::find "sound/$sound->[1]";
2925 cf::sound::set $sound->[0] => $face;
2926 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2927 }
2928
2929 while (my ($k, $v) = each %{$soundconf->{event}}) {
2930 my $face = cf::face::find "sound/$v";
2931 cf::sound::set $k => $face;
2932 }
2933 }
2877 } 2934 }
2878 2935
2879 1 2936 1
2880} 2937}
2938
2939register_exticmd fx_want => sub {
2940 my ($ns, $want) = @_;
2941
2942 while (my ($k, $v) = each %$want) {
2943 $ns->fx_want ($k, $v);
2944 }
2945};
2881 2946
2882sub reload_regions { 2947sub reload_regions {
2883 load_resource_file "$MAPDIR/regions" 2948 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 2949 or die "unable to load regions file\n";
2885 2950

Diff Legend

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