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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.338 by root, Tue Aug 21 01:07:47 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;
… …
322 }; 323 };
323 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
324 $guard 325 $guard
325} 326}
326 327
327=item cf::get_slot $time[, $priority] 328=item cf::get_slot $time[, $priority[, $name]]
328 329
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 330Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 331This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
332 336
333Useful for short background jobs. 337Useful for short background jobs.
334 338
335=cut 339=cut
336 340
… …
363 Coro::schedule; 367 Coro::schedule;
364 } 368 }
365 } 369 }
366}; 370};
367 371
368sub get_slot($;$) { 372sub get_slot($;$$) {
369 my ($time, $pri) = @_; 373 my ($time, $pri, $name) = @_;
370 374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 380 $SLOT_QUEUE->ready;
374 $sig->wait; 381 $sig->wait;
375} 382}
376 383
… …
466Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
468 475
469=cut 476=cut
470 477
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 478sub fork_call(&@) {
481 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
482 480
483# 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,
484# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
486 or die "pipe: $!";
487 484
488 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 486 reset_signals;
502 local $SIG{__WARN__}; 487 &$cb
503 local $SIG{__DIE__}; 488 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 489
510 eval { 490 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 491}
523 492
524=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
525 494
526Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
1175 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1176 1145
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1147
1179 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
1154 my @reply;
1155
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1185 } else { 1163 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1165 }
1188 1166
1189 cf::override; 1167 cf::override;
… …
1358 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1359 1337
1360 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1361 1339
1362 $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 (@_);
1363} 1351}
1364 1352
1365=item $pl->quit_character 1353=item $pl->quit_character
1366 1354
1367Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1511sub hintmode { 1499sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1501 $_[0]{hintmode}
1514} 1502}
1515 1503
1516=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1517 1505
1518Sends an ext reply to the player. 1506Sends an ext reply to the player.
1519 1507
1520=cut 1508=cut
1521 1509
1522sub ext_reply($$%) { 1510sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1524 1512
1525 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1514}
1528 1515
1529=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1530 1517
1531Sends an ext event to the client. 1518Sends an ext event to the client.
1532 1519
1533=cut 1520=cut
1534 1521
1535sub ext_event($$%) { 1522sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1537 1524
1538 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1539} 1526}
1540 1527
1541=head3 cf::region 1528=head3 cf::region
1542 1529
1543=over 4 1530=over 4
… …
1904 $self->set_darkness_map; 1891 $self->set_darkness_map;
1905 Coro::cede; 1892 Coro::cede;
1906 $self->activate; 1893 $self->activate;
1907 } 1894 }
1908 1895
1896 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME);
1898
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1899 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1900 }
1911 1901
1912 $self->post_load; 1902 $self->post_load;
1913} 1903}
… …
1923 1913
1924 $self 1914 $self
1925} 1915}
1926 1916
1927# 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
1928sub load_diag { 1918sub load_neighbours {
1929 my ($map) = @_; 1919 my ($map) = @_;
1930 1920
1931 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1932 1922
1933 for (0 .. 3) { 1923 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1935 or next; 1925 or next;
1936 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1937 or next; 1927 or next;
1938 $neigh->load; 1928 $neigh->load;
1939 1929
1930 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 1933 }
1943 1934
1944 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1946 or next; 1938 or next;
1947 $neigh->load; 1939 $neigh->load;
1948 } 1940 }
1949} 1941}
1950 1942
… …
2213 2205
2214 } else { 2206 } else {
2215 my $pl = $self->contr; 2207 my $pl = $self->contr;
2216 2208
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2209 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2210 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2211 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2212
2226 } else { 2213 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2214 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2215 $self->message ($msg, $flags);
2229 } 2216 }
2230 } 2217 }
2218}
2219
2220=item $object->send_msg ($channel, $msg, $color, [extra...])
2221
2222=cut
2223
2224sub cf::object::send_msg {
2225 my $pl = shift->contr
2226 or return;
2227 $pl->send_msg (@_);
2231} 2228}
2232 2229
2233=item $player_object->may ("access") 2230=item $player_object->may ("access")
2234 2231
2235Returns wether the given player is authorized to access resource "access" 2232Returns wether the given player is authorized to access resource "access"
… …
2314 # use -1 or undef as default coordinates, not 0, 0 2311 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2312 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2313 if $x <=0 && $y <= 0;
2317 2314
2318 $map->load; 2315 $map->load;
2319 $map->load_diag; 2316 $map->load_neighbours;
2320 2317
2321 return unless $self->contr->active; 2318 return unless $self->contr->active;
2322 $self->activate_recursive; 2319 $self->activate_recursive;
2323 2320
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2321 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2500sub cf::client::send_msg { 2497sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2498 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2499
2503 $msg = $self->pl->expand_cfpod ($msg); 2500 $msg = $self->pl->expand_cfpod ($msg);
2504 2501
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2502 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2503
2507 if (ref $channel) { 2504 if (ref $channel) {
2508 # send meta info to client, if not yet sent 2505 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2506 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2507 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2508 $self->ext_msg (channel_info => $channel);
2512 } 2509 }
2513 2510
2514 $channel = $channel->{id}; 2511 $channel = $channel->{id};
2515 } 2512 }
2516 2513
2517 return unless @extra || length $msg; 2514 return unless @extra || length $msg;
2518 2515
2519 if ($self->can_msg) { 2516 if ($self->can_msg) {
2517 # default colour, mask it out
2518 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2519 if $color & cf::NDI_DEF;
2520
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2521 $self->send_packet ("msg " . $self->{json_coder}->encode (
2522 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2523 } else {
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 if ($color >= 0) { 2524 if ($color >= 0) {
2525 # replace some tags by gcfclient-compatible ones
2526 for ($msg) {
2527 1 while
2528 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2529 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2530 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2531 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2532 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2533 }
2534
2535 $color &= cf::NDI_COLOR_MASK;
2536
2537 utf8::encode $msg;
2538
2533 if (0 && $msg =~ /\[/) { 2539 if (0 && $msg =~ /\[/) {
2540 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2541 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2542 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2543 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2544 $self->send_packet ("drawinfo $color $msg")
2538 } 2545 }
2539 } 2546 }
2540 } 2547 }
2541} 2548}
2542 2549
2543=item $client->ext_event ($type, %msg) 2550=item $client->ext_msg ($type, @msg)
2544 2551
2545Sends an ext event to the client. 2552Sends an ext event to the client.
2546 2553
2547=cut 2554=cut
2548 2555
2549sub cf::client::ext_event($$%) { 2556sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2557 my ($self, $type, @msg) = @_;
2551 2558
2552 return unless $self->extcmd; 2559 my $extcmd = $self->extcmd;
2553 2560
2561 if ($extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2564 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 }
2567}
2568
2569=item $client->ext_reply ($msgid, @msg)
2570
2571Sends an ext reply to the client.
2572
2573=cut
2574
2575sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_;
2577
2578 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) {
2581 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 }
2556} 2585}
2557 2586
2558=item $success = $client->query ($flags, "text", \&cb) 2587=item $success = $client->query ($flags, "text", \&cb)
2559 2588
2560Queues a query to the client, calling the given callback with 2589Queues a query to the client, calling the given callback with
… …
2615 my ($ns, $buf) = @_; 2644 my ($ns, $buf) = @_;
2616 2645
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2646 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2647
2619 if (ref $msg) { 2648 if (ref $msg) {
2649 my ($type, $reply, @payload) =
2650 "ARRAY" eq ref $msg
2651 ? @$msg
2652 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2653
2654 my @reply;
2655
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2656 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2657 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2658 }
2659
2660 $ns->ext_reply ($reply, @reply)
2661 if $reply;
2662
2626 } else { 2663 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2664 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2665 }
2629 2666
2630 cf::override; 2667 cf::override;
… …
2677our $safe = new Safe "safe"; 2714our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2715our $safe_hole = new Safe::Hole;
2679 2716
2680$SIG{FPE} = 'IGNORE'; 2717$SIG{FPE} = 'IGNORE';
2681 2718
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2719$safe->permit_only (Opcode::opset qw(
2720 :base_core :base_mem :base_orig :base_math
2721 grepstart grepwhile mapstart mapwhile
2722 sort time
2723));
2683 2724
2684# here we export the classes and methods available to script code 2725# here we export the classes and methods available to script code
2685 2726
2686=pod 2727=pod
2687 2728
2688The following functions and methods are available within a safe environment: 2729The following functions and methods are available within a safe environment:
2689 2730
2690 cf::object 2731 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 2732 contr pay_amount pay_player map x y force_find force_add
2692 insert remove 2733 insert remove name archname title slaying race
2693 2734
2694 cf::object::player 2735 cf::object::player
2695 player 2736 player
2696 2737
2697 cf::player 2738 cf::player
… …
2702 2743
2703=cut 2744=cut
2704 2745
2705for ( 2746for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2747 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2707 insert remove)], 2748 insert remove inv name archname title slaying race)],
2708 ["cf::object::player" => qw(player)], 2749 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2750 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2751 ["cf::map" => qw(trigger)],
2711) { 2752) {
2712 no strict 'refs'; 2753 no strict 'refs';
… …
2788# the server's init and main functions 2829# the server's init and main functions
2789 2830
2790sub load_facedata($) { 2831sub load_facedata($) {
2791 my ($path) = @_; 2832 my ($path) = @_;
2792 2833
2834 my $enc = JSON::XS->new->utf8->canonical;
2835
2793 warn "loading facedata from $path\n"; 2836 warn "loading facedata from $path\n";
2794 2837
2795 my $facedata; 2838 my $facedata;
2796 0 < aio_load $path, $facedata 2839 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 2840 or die "$path: $!";
2798 2841
2799 $facedata = Coro::Storable::thaw $facedata; 2842 $facedata = Coro::Storable::thaw $facedata;
2800 2843
2801 $facedata->{version} == 2 2844 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 2845 or cf::cleanup "$path: version mismatch, cannot proceed.";
2846
2847 # patch in the exptable
2848 $facedata->{resource}{"res/exp_table"} = {
2849 type => FT_RSRC,
2850 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2851 };
2852 cf::cede_to_tick;
2803 2853
2804 { 2854 {
2805 my $faces = $facedata->{faceinfo}; 2855 my $faces = $facedata->{faceinfo};
2806 2856
2807 while (my ($face, $info) = each %$faces) { 2857 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2858 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 2859 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 2860 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2861 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2862 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 2863
2814 cf::cede_to_tick; 2864 cf::cede_to_tick;
2815 } 2865 }
2816 2866
2817 while (my ($face, $info) = each %$faces) { 2867 while (my ($face, $info) = each %$faces) {
… …
2842 2892
2843 { 2893 {
2844 # TODO: for gcfclient pleasure, we should give resources 2894 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 2895 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 2896 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 2897
2898 my $soundconf = delete $res->{"res/sound.conf"};
2848 2899
2849 while (my ($name, $info) = each %$res) { 2900 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2901 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2902 my $data;
2857 2903
2858 if ($name =~ /\.jpg$/) { 2904 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2905 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2906
2907 my $meta = $enc->encode ({
2908 name => $name,
2909 %{ $info->{meta} || {} },
2910 });
2911
2912 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 2913 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 2914 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 2915 }
2868 2916
2917 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2918 cf::face::set_type $idx, $info->{type};
2919
2869 cf::cede_to_tick; 2920 cf::cede_to_tick;
2870 } 2921 }
2922
2923 if ($soundconf) {
2924 $soundconf = $enc->decode (delete $soundconf->{data});
2925
2926 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2927 my $sound = $soundconf->{compat}[$_]
2928 or next;
2929
2930 my $face = cf::face::find "sound/$sound->[1]";
2931 cf::sound::set $sound->[0] => $face;
2932 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2933 }
2934
2935 while (my ($k, $v) = each %{$soundconf->{event}}) {
2936 my $face = cf::face::find "sound/$v";
2937 cf::sound::set $k => $face;
2938 }
2939 }
2871 } 2940 }
2872 2941
2873 1 2942 1
2874} 2943}
2944
2945register_exticmd fx_want => sub {
2946 my ($ns, $want) = @_;
2947
2948 while (my ($k, $v) = each %$want) {
2949 $ns->fx_want ($k, $v);
2950 }
2951};
2875 2952
2876sub reload_regions { 2953sub reload_regions {
2877 load_resource_file "$MAPDIR/regions" 2954 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 2955 or die "unable to load regions file\n";
2879 2956

Diff Legend

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