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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.324 by root, Sat Jul 28 14:23:17 2007 UTC

… …
29use Fcntl; 29use Fcntl;
30use YAML::Syck (); 30use YAML::Syck ();
31use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
32use Time::HiRes; 32use Time::HiRes;
33use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
34 35
35# configure various modules to our taste 36# configure various modules to our taste
36# 37#
37$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
166 167
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 169returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
170 177
171=back 178=back
172 179
173=cut 180=cut
174 181
… …
315 }; 322 };
316 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
317 $guard 324 $guard
318} 325}
319 326
327=item cf::get_slot $time[, $priority[, $name]]
328
329Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This 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.
332
333The optional C<$name> can be used to identify the job to run. It might be
334used for statistical purposes and should identify the same time-class.
335
336Useful for short background jobs.
337
338=cut
339
340our @SLOT_QUEUE;
341our $SLOT_QUEUE;
342
343$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async {
345 my $signal = new Coro::Signal;
346
347 while () {
348 next_job:
349 my $avail = cf::till_tick;
350 if ($avail > 0.01) {
351 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) {
353 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send;
355 Coro::cede;
356 goto next_job;
357 }
358 }
359 }
360
361 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait;
365 } else {
366 Coro::schedule;
367 }
368 }
369};
370
371sub get_slot($;$$) {
372 my ($time, $pri, $name) = @_;
373
374 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal;
376
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready;
380 $sig->wait;
381}
382
320=item cf::async { BLOCK } 383=item cf::async { BLOCK }
321 384
322Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
323C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 386C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324thing you are allowed to do is call C<prio> on it. 387thing you are allowed to do is call C<prio> on it.
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 472Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 473never block itself or use any form of Event handling.
411 474
412=cut 475=cut
413 476
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
414sub fork_call(&@) { 486sub fork_call(&@) {
415 my ($cb, @args) = @_; 487 my ($cb, @args) = @_;
416 488
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
418# or die "socketpair: $!"; 490# or die "socketpair: $!";
… …
433 return wantarray ? @$res : $res->[-1]; 505 return wantarray ? @$res : $res->[-1];
434 } else { 506 } else {
435 reset_signals; 507 reset_signals;
436 local $SIG{__WARN__}; 508 local $SIG{__WARN__};
437 local $SIG{__DIE__}; 509 local $SIG{__DIE__};
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.
438 local $Coro::idle; 513 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX); 514 $Coro::current->prio (Coro::PRIO_MAX);
515
440 eval { 516 eval {
441 close $fh1; 517 close $fh1;
442 518
443 my @res = eval { $cb->(@args) }; 519 my @res = eval { $cb->(@args) };
444 520
445 open my $fh, ">", \my $buf 521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2; 522 close $fh2;
455 }; 523 };
456 524
457 warn $@ if $@; 525 warn $@ if $@;
458 _exit 0; 526 _exit 0;
… …
860 "; 928 ";
861 die if $@; 929 die if $@;
862} 930}
863 931
864our $override; 932our $override;
865our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 933our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
866 934
867sub override { 935sub override {
868 $override = 1; 936 $override = 1;
869 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
870} 938}
871 939
872sub do_invoke { 940sub do_invoke {
873 my $event = shift; 941 my $event = shift;
874 my $callbacks = shift; 942 my $callbacks = shift;
875 943
876 @invoke_results = (); 944 @INVOKE_RESULTS = ();
877 945
878 local $override; 946 local $override;
879 947
880 for (@$callbacks) { 948 for (@$callbacks) {
881 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
898 966
899Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
900 968
901This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 969This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
902removed in future versions), and there is no public API to access override 970removed in future versions), and there is no public API to access override
903results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 972
905=back 973=back
906 974
907=cut 975=cut
908 976
909############################################################################# 977#############################################################################
910# object support 978# object support
979#
980
981sub _can_merge {
982 my ($ob1, $ob2) = @_;
983
984 local $Storable::canonical = 1;
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987
988 $fob1 eq $fob2
989}
911 990
912sub reattach { 991sub reattach {
913 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 993 my ($obj) = @_;
915 994
… …
1102 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1103 1182
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1184
1106 if (ref $msg) { 1185 if (ref $msg) {
1186 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg
1188 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
1109 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
1110 } 1195 if $reply;
1111 } 1196 }
1112 } else { 1197 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1199 }
1115 1200
… …
1438sub hintmode { 1523sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1525 $_[0]{hintmode}
1441} 1526}
1442 1527
1443=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1444 1529
1445Sends an ext reply to the player. 1530Sends an ext reply to the player.
1446 1531
1447=cut 1532=cut
1448 1533
1449sub ext_reply($$%) { 1534sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1451 1536
1452 $msg{msgid} = $id; 1537 if ($self->ns->extcmd == 2) {
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;
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1454} 1544}
1455 1545
1456=item $player->ext_event ($type, %msg) 1546=item $player->ext_msg ($type, @msg)
1457 1547
1458Sends an ext event to the client. 1548Sends an ext event to the client.
1459 1549
1460=cut 1550=cut
1461 1551
1462sub ext_event($$%) { 1552sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1553 my ($self, $type, @msg) = @_;
1464 1554
1465 $self->ns->ext_event ($type, %msg); 1555 $self->ns->ext_msg ($type, @msg);
1466} 1556}
1467 1557
1468=head3 cf::region 1558=head3 cf::region
1469 1559
1470=over 4 1560=over 4
… …
1483 my ($path) = @_; 1573 my ($path) = @_;
1484 1574
1485 my ($match, $specificity); 1575 my ($match, $specificity);
1486 1576
1487 for my $region (list) { 1577 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1578 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1579 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1580 if $region->specificity > $specificity;
1491 } 1581 }
1492 } 1582 }
1493 1583
… …
1613 $self->init; # pass $1 etc. 1703 $self->init; # pass $1 etc.
1614 return $self; 1704 return $self;
1615 } 1705 }
1616 } 1706 }
1617 1707
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1708 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1709 ()
1620} 1710}
1621 1711
1622sub init { 1712sub init {
1623 my ($self) = @_; 1713 my ($self) = @_;
… …
1831 $self->set_darkness_map; 1921 $self->set_darkness_map;
1832 Coro::cede; 1922 Coro::cede;
1833 $self->activate; 1923 $self->activate;
1834 } 1924 }
1835 1925
1926 $map->{last_save} = $cf::RUNTIME;
1927 $map->last_access ($cf::RUNTIME);
1928
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1929 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1930 }
1838 1931
1839 $self->post_load; 1932 $self->post_load;
1840} 1933}
… …
1901 1994
1902 undef $MAP_PREFETCH{$path}; 1995 undef $MAP_PREFETCH{$path};
1903 $MAP_PREFETCHER ||= cf::async { 1996 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 1997 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 1998 for my $path (keys %MAP_PREFETCH) {
1906 my $map = find $path 1999 if (my $map = find $path) {
1907 or next;
1908 $map->load; 2000 $map->load;
2001 }
1909 2002
1910 delete $MAP_PREFETCH{$path}; 2003 delete $MAP_PREFETCH{$path};
1911 } 2004 }
1912 } 2005 }
1913 undef $MAP_PREFETCHER; 2006 undef $MAP_PREFETCHER;
… …
2140 2233
2141 } else { 2234 } else {
2142 my $pl = $self->contr; 2235 my $pl = $self->contr;
2143 2236
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2237 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2238 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2239 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2240
2153 } else { 2241 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2242 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2243 $self->message ($msg, $flags);
2156 } 2244 }
… …
2250 2338
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2340 $self->enter_map ($map, $x, $y);
2253} 2341}
2254 2342
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2344
2257Moves the player to the given map-path and coordinates by first freezing 2345Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2346her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2347that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2348the new (success) or old (failed) map position. In either case, $done will
2349be called at the end of this process.
2261 2350
2262=cut 2351=cut
2263 2352
2264our $GOTOGEN; 2353our $GOTOGEN;
2265 2354
2266sub cf::object::player::goto { 2355sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2356 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2357
2269 # do generation counting so two concurrent goto's will be executed in-order 2358 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2360
2272 $self->enter_link; 2361 $self->enter_link;
… …
2292 2381
2293 if ($gen == $self->{_goto_generation}) { 2382 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2383 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2384 $self->leave_link ($map, $x, $y);
2296 } 2385 }
2386
2387 $done->() if $done;
2297 })->prio (1); 2388 })->prio (1);
2298} 2389}
2299 2390
2300=item $player_object->enter_exit ($exit_object) 2391=item $player_object->enter_exit ($exit_object)
2301 2392
… …
2410 2501
2411 utf8::encode $text; 2502 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2504}
2414 2505
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2506=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2507
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2508Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of 2509client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress 2510the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2421 2512
2422=cut 2513=cut
2423 2514
2424sub cf::client::send_msg { 2515sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2516 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2517
2427 $msg = $self->pl->expand_cfpod ($msg); 2518 $msg = $self->pl->expand_cfpod ($msg);
2428 2519
2520 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521
2522 if (ref $channel) {
2523 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel);
2527 }
2528
2529 $channel = $channel->{id};
2530 }
2531
2429 return unless @extra || length $msg; 2532 return unless @extra || length $msg;
2430 2533
2431 if ($self->can_msg) { 2534 if ($self->can_msg) {
2535 # default colour, mask it out
2536 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2537 if $color & cf::NDI_DEF;
2538
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2539 $self->send_packet ("msg " . $self->{json_coder}->encode (
2540 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2541 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 2542 if ($color >= 0) {
2543 # replace some tags by gcfclient-compatible ones
2544 for ($msg) {
2545 1 while
2546 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2547 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2548 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2549 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 }
2552
2553 $color &= cf::NDI_COLOR_MASK;
2554
2445 if (0 && $msg =~ /\[/) { 2555 if (0 && $msg =~ /\[/) {
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2556 $self->send_packet ("drawextinfo $color 4 0 $msg")
2447 } else { 2557 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2559 $self->send_packet ("drawinfo $color $msg")
2450 } 2560 }
2451 } 2561 }
2452 } 2562 }
2453} 2563}
2454 2564
2455=item $client->ext_event ($type, %msg) 2565=item $client->ext_msg ($type, @msg)
2456 2566
2457Sends an ext event to the client. 2567Sends an ext event to the client.
2458 2568
2459=cut 2569=cut
2460 2570
2461sub cf::client::ext_event($$%) { 2571sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2572 my ($self, $type, @msg) = @_;
2463 2573
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2579 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 }
2466} 2582}
2467 2583
2468=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2469 2585
2470Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2641 my ($ns, $buf) = @_;
2526 2642
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2643 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2644
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2651 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2652 my @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid}; 2653
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2654 $ns->ext_reply ($reply, @reply)
2534 } 2655 if $reply;
2535 } 2656 }
2536 } else { 2657 } else {
2537 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";
2538 } 2659 }
2539 2660
… …
2714 { 2835 {
2715 my $faces = $facedata->{faceinfo}; 2836 my $faces = $facedata->{faceinfo};
2716 2837
2717 while (my ($face, $info) = each %$faces) { 2838 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2839 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2840 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2722 Coro::cede; 2844
2845 cf::cede_to_tick;
2723 } 2846 }
2724 2847
2725 while (my ($face, $info) = each %$faces) { 2848 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2849 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2850 my $idx = cf::face::find $face
2728 or next; 2851 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2852 if (my $smooth = cf::face::find $info->{smooth}) {
2853 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2854 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2855 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2856 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2857 }
2734 Coro::cede; 2858
2859 cf::cede_to_tick;
2735 } 2860 }
2736 } 2861 }
2737 2862
2738 { 2863 {
2739 my $anims = $facedata->{animinfo}; 2864 my $anims = $facedata->{animinfo};
2740 2865
2741 while (my ($anim, $info) = each %$anims) { 2866 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2867 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2868 cf::cede_to_tick;
2744 } 2869 }
2745 2870
2746 cf::anim::invalidate_all; # d'oh 2871 cf::anim::invalidate_all; # d'oh
2747 } 2872 }
2748 2873
2874 {
2875 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881
2882 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2889
2890 if ($info->{type} & 1) {
2891 # prepend meta info
2892
2893 my $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2895
2896 cf::face::set_data $idx, 0, $data, $chk;
2897 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2899 }
2900
2901 cf::face::set_type $idx, $info->{type};
2902
2903 cf::cede_to_tick;
2904 }
2905
2906 if ($soundconf) {
2907 $soundconf = $enc->decode (delete $soundconf->{data});
2908
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_]
2911 or next;
2912
2913 my $face = cf::face::find "sound/$sound->[1]";
2914
2915 cf::sound::set $sound->[0] => $face;
2916 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2917 }
2918
2919 #TODO
2920 }
2921 }
2922
2749 1 2923 1
2750} 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};
2751 2933
2752sub reload_regions { 2934sub reload_regions {
2753 load_resource_file "$MAPDIR/regions" 2935 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 2936 or die "unable to load regions file\n";
2937
2938 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/
2940 if exists $_->{match};
2941 }
2755} 2942}
2756 2943
2757sub reload_facedata { 2944sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 2945 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 2946 or die "unable to load facedata\n";

Diff Legend

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