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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.334 by root, Mon Aug 20 22:09:04 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
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
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.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
382}
383
327=item cf::async { BLOCK } 384=item cf::async { BLOCK }
328 385
329Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
330C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 387C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
418 475
419=cut 476=cut
420 477
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 478sub fork_call(&@) {
431 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
432 480
433# 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,
434# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
436 or die "pipe: $!";
437 484
438 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 486 reset_signals;
452 local $SIG{__WARN__}; 487 &$cb
453 local $SIG{__DIE__}; 488 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 489
460 eval { 490 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 491}
473 492
474=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
475 494
476Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
1125 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1126 1145
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1147
1129 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
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1132 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1133 } 1158 if $reply;
1134 } 1159 }
1135 } else { 1160 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1162 }
1138 1163
… …
1308 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1309 1334
1310 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1311 1336
1312 $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 (@_);
1313} 1348}
1314 1349
1315=item $pl->quit_character 1350=item $pl->quit_character
1316 1351
1317Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1461sub hintmode { 1496sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1498 $_[0]{hintmode}
1464} 1499}
1465 1500
1466=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1467 1502
1468Sends an ext reply to the player. 1503Sends an ext reply to the player.
1469 1504
1470=cut 1505=cut
1471 1506
1472sub ext_reply($$%) { 1507sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1474 1509
1475 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
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;
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1477} 1517}
1478 1518
1479=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1480 1520
1481Sends an ext event to the client. 1521Sends an ext event to the client.
1482 1522
1483=cut 1523=cut
1484 1524
1485sub ext_event($$%) { 1525sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1487 1527
1488 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1489} 1529}
1490 1530
1491=head3 cf::region 1531=head3 cf::region
1492 1532
1493=over 4 1533=over 4
… …
1854 $self->set_darkness_map; 1894 $self->set_darkness_map;
1855 Coro::cede; 1895 Coro::cede;
1856 $self->activate; 1896 $self->activate;
1857 } 1897 }
1858 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1859 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 1903 }
1861 1904
1862 $self->post_load; 1905 $self->post_load;
1863} 1906}
… …
1873 1916
1874 $self 1917 $self
1875} 1918}
1876 1919
1877# find and load all maps in the 3x3 area around a map 1920# find and load all maps in the 3x3 area around a map
1878sub load_diag { 1921sub load_neighbours {
1879 my ($map) = @_; 1922 my ($map) = @_;
1880 1923
1881 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1882 1925
1883 for (0 .. 3) { 1926 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1885 or next; 1928 or next;
1886 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1887 or next; 1930 or next;
1888 $neigh->load; 1931 $neigh->load;
1889 1932
1933 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 1936 }
1893 1937
1894 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1896 or next; 1941 or next;
1897 $neigh->load; 1942 $neigh->load;
1898 } 1943 }
1899} 1944}
1900 1945
… …
2163 2208
2164 } else { 2209 } else {
2165 my $pl = $self->contr; 2210 my $pl = $self->contr;
2166 2211
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2212 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2213 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2214 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2215
2176 } else { 2216 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2217 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2218 $self->message ($msg, $flags);
2179 } 2219 }
2180 } 2220 }
2221}
2222
2223=item $object->send_msg ($channel, $msg, $color, [extra...])
2224
2225=cut
2226
2227sub cf::object::send_msg {
2228 my $pl = shift->contr
2229 or return;
2230 $pl->send_msg (@_);
2181} 2231}
2182 2232
2183=item $player_object->may ("access") 2233=item $player_object->may ("access")
2184 2234
2185Returns wether the given player is authorized to access resource "access" 2235Returns wether the given player is authorized to access resource "access"
… …
2264 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
2267 2317
2268 $map->load; 2318 $map->load;
2269 $map->load_diag; 2319 $map->load_neighbours;
2270 2320
2271 return unless $self->contr->active; 2321 return unless $self->contr->active;
2272 $self->activate_recursive; 2322 $self->activate_recursive;
2273 2323
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2450sub cf::client::send_msg { 2500sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2501 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2502
2453 $msg = $self->pl->expand_cfpod ($msg); 2503 $msg = $self->pl->expand_cfpod ($msg);
2454 2504
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2505 $color &= cf::NDI_CLIENT_MASK; # just in case...
2456 2506
2457 if (ref $channel) { 2507 if (ref $channel) {
2458 # send meta info to client, if not yet sent 2508 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2509 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2510 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2511 $self->ext_msg (channel_info => $channel);
2462 } 2512 }
2463 2513
2464 $channel = $channel->{id}; 2514 $channel = $channel->{id};
2465 } 2515 }
2466 2516
2467 return unless @extra || length $msg; 2517 return unless @extra || length $msg;
2468 2518
2469 if ($self->can_msg) { 2519 if ($self->can_msg) {
2520 # default colour, mask it out
2521 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2522 if $color & cf::NDI_DEF;
2523
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2524 $self->send_packet ("msg " . $self->{json_coder}->encode (
2525 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2526 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2527 if ($color >= 0) {
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 $color &= cf::NDI_COLOR_MASK;
2539
2540 utf8::encode $msg;
2541
2483 if (0 && $msg =~ /\[/) { 2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2545 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2547 $self->send_packet ("drawinfo $color $msg")
2488 } 2548 }
2489 } 2549 }
2490 } 2550 }
2491} 2551}
2492 2552
2493=item $client->ext_event ($type, %msg) 2553=item $client->ext_msg ($type, @msg)
2494 2554
2495Sends an ext event to the client. 2555Sends an ext event to the client.
2496 2556
2497=cut 2557=cut
2498 2558
2499sub cf::client::ext_event($$%) { 2559sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2560 my ($self, $type, @msg) = @_;
2501 2561
2502 return unless $self->extcmd; 2562 my $extcmd = $self->extcmd;
2503 2563
2564 if ($extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2506} 2570}
2507 2571
2508=item $success = $client->query ($flags, "text", \&cb) 2572=item $success = $client->query ($flags, "text", \&cb)
2509 2573
2510Queues a query to the client, calling the given callback with 2574Queues a query to the client, calling the given callback with
… …
2565 my ($ns, $buf) = @_; 2629 my ($ns, $buf) = @_;
2566 2630
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2631 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2632
2569 if (ref $msg) { 2633 if (ref $msg) {
2634 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg
2636 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2639 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2640 my @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid}; 2641
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2642 $ns->ext_reply ($reply, @reply)
2574 } 2643 if $reply;
2575 } 2644 }
2576 } else { 2645 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2647 }
2579 2648
… …
2627our $safe = new Safe "safe"; 2696our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2697our $safe_hole = new Safe::Hole;
2629 2698
2630$SIG{FPE} = 'IGNORE'; 2699$SIG{FPE} = 'IGNORE';
2631 2700
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2701$safe->permit_only (Opcode::opset qw(
2702 :base_core :base_mem :base_orig :base_math
2703 grepstart grepwhile mapstart mapwhile
2704 sort time
2705));
2633 2706
2634# here we export the classes and methods available to script code 2707# here we export the classes and methods available to script code
2635 2708
2636=pod 2709=pod
2637 2710
2638The following functions and methods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2639 2712
2640 cf::object 2713 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 2714 contr pay_amount pay_player map x y force_find force_add
2642 insert remove 2715 insert remove name archname title slaying race
2643 2716
2644 cf::object::player 2717 cf::object::player
2645 player 2718 player
2646 2719
2647 cf::player 2720 cf::player
… …
2652 2725
2653=cut 2726=cut
2654 2727
2655for ( 2728for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)], 2730 insert remove inv name archname title slaying race)],
2658 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2661) { 2734) {
2662 no strict 'refs'; 2735 no strict 'refs';
… …
2738# the server's init and main functions 2811# the server's init and main functions
2739 2812
2740sub load_facedata($) { 2813sub load_facedata($) {
2741 my ($path) = @_; 2814 my ($path) = @_;
2742 2815
2816 my $enc = JSON::XS->new->utf8->canonical;
2817
2743 warn "loading facedata from $path\n"; 2818 warn "loading facedata from $path\n";
2744 2819
2745 my $facedata; 2820 my $facedata;
2746 0 < aio_load $path, $facedata 2821 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 2822 or die "$path: $!";
2748 2823
2749 $facedata = Coro::Storable::thaw $facedata; 2824 $facedata = Coro::Storable::thaw $facedata;
2750 2825
2751 $facedata->{version} == 2 2826 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 2827 or cf::cleanup "$path: version mismatch, cannot proceed.";
2828
2829 # patch in the exptable
2830 cf::cede_to_tick;
2831 $facedata->{resource}{"res/exp_table"} = {
2832 type => FT_RSRC,
2833 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2834 };
2835 cf::cede_to_tick;
2753 2836
2754 { 2837 {
2755 my $faces = $facedata->{faceinfo}; 2838 my $faces = $facedata->{faceinfo};
2756 2839
2757 while (my ($face, $info) = each %$faces) { 2840 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2841 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 2842 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 2843 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2844 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2845 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 2846
2764 cf::cede_to_tick; 2847 cf::cede_to_tick;
2765 } 2848 }
2766 2849
2767 while (my ($face, $info) = each %$faces) { 2850 while (my ($face, $info) = each %$faces) {
… …
2792 2875
2793 { 2876 {
2794 # TODO: for gcfclient pleasure, we should give resources 2877 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 2878 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 2879 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 2880
2881 my $soundconf = delete $res->{"res/sound.conf"};
2798 2882
2799 while (my ($name, $info) = each %$res) { 2883 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2884 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2885 my $data;
2807 2886
2808 if ($name =~ /\.jpg$/) { 2887 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2888 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2889
2811 } else { 2890 my $meta = $enc->encode ({
2891 name => $name,
2892 %{ $info->{meta} || {} },
2893 });
2894
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 2895 $data = pack "(w/a*)*", $meta, $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 2896 }
2818 2897
2898 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2899 cf::face::set_type $idx, $info->{type};
2900
2819 cf::cede_to_tick; 2901 cf::cede_to_tick;
2820 } 2902 }
2903
2904 if ($soundconf) {
2905 $soundconf = $enc->decode (delete $soundconf->{data});
2906
2907 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2908 my $sound = $soundconf->{compat}[$_]
2909 or next;
2910
2911 my $face = cf::face::find "sound/$sound->[1]";
2912 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 }
2915
2916 while (my ($k, $v) = each %{$soundconf->{event}}) {
2917 my $face = cf::face::find "sound/$v";
2918 cf::sound::set $k => $face;
2919 }
2920 }
2821 } 2921 }
2822 2922
2823 1 2923 1
2824} 2924}
2925
2926register_exticmd fx_want => sub {
2927 my ($ns, $want) = @_;
2928
2929 while (my ($k, $v) = each %$want) {
2930 $ns->fx_want ($k, $v);
2931 }
2932};
2825 2933
2826sub reload_regions { 2934sub reload_regions {
2827 load_resource_file "$MAPDIR/regions" 2935 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 2936 or die "unable to load regions file\n";
2829 2937

Diff Legend

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