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.284 by root, Sun Jun 24 04:15:42 2007 UTC vs.
Revision 1.307 by root, Sun Jul 15 22:39:48 2007 UTC

… …
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24 24
25use JSON::XS 1.4 ();
25use BDB (); 26use BDB ();
26use Data::Dumper; 27use Data::Dumper;
27use Digest::MD5; 28use Digest::MD5;
28use Fcntl; 29use Fcntl;
29use YAML::Syck (); 30use YAML::Syck ();
30use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
31use Time::HiRes; 32use Time::HiRes;
32use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
33 35
34# configure various modules to our taste 36# configure various modules to our taste
35# 37#
36$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
… …
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
… …
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 240 $d
238 } || "[unable to dump $_[0]: '$@']"; 241 } || "[unable to dump $_[0]: '$@']";
239} 242}
240 243
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 244=item $ref = cf::from_json $json
244 245
245Converts a JSON string into the corresponding perl data structure. 246Converts a JSON string into the corresponding perl data structure.
246 247
247=item $json = cf::to_json $ref 248=item $json = cf::to_json $ref
248 249
249Converts a perl data structure into its JSON representation. 250Converts a perl data structure into its JSON representation.
251
252=cut
253
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255
256sub to_json ($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) }
250 258
251=item cf::lock_wait $string 259=item cf::lock_wait $string
252 260
253Wait until the given lock is available. See cf::lock_acquire. 261Wait until the given lock is available. See cf::lock_acquire.
254 262
… …
402Coro::Storable. May, of course, block. Note that the executed sub may 410Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 411never block itself or use any form of Event handling.
404 412
405=cut 413=cut
406 414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423
407sub fork_call(&@) { 424sub fork_call(&@) {
408 my ($cb, @args) = @_; 425 my ($cb, @args) = @_;
409 426
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
411# or die "socketpair: $!"; 428# or die "socketpair: $!";
… …
414 431
415 if (my $pid = fork) { 432 if (my $pid = fork) {
416 close $fh2; 433 close $fh2;
417 434
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
419 $res = Coro::Storable::thaw $res; 437 $res = Coro::Storable::thaw $res;
420 438
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422 440
423 die $$res unless "ARRAY" eq ref $res; 441 Carp::confess $$res unless "ARRAY" eq ref $res;
424 442
425 return wantarray ? @$res : $res->[-1]; 443 return wantarray ? @$res : $res->[-1];
426 } else { 444 } else {
427 reset_signals; 445 reset_signals;
428 local $SIG{__WARN__}; 446 local $SIG{__WARN__};
429 local $SIG{__DIE__}; 447 local $SIG{__DIE__};
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453
430 eval { 454 eval {
431 close $fh1; 455 close $fh1;
432 456
433 my @res = eval { $cb->(@args) }; 457 my @res = eval { $cb->(@args) };
458
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
435 }; 461 };
436 462
437 warn $@ if $@; 463 warn $@ if $@;
438 _exit 0; 464 _exit 0;
439 } 465 }
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1055 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1056}
1031 1057
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1058=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1059
1034Register a callback fro execution when the client sends an extcmd packet. 1060Register a callback for execution when the client sends an (synchronous)
1061extcmd packet. Ext commands will be processed in the order they are
1062received by the server, like other user commands. The first argument is
1063the logged-in player. Ext commands can only be processed after a player
1064has logged in successfully.
1035 1065
1036If the callback returns something, it is sent back as if reply was being 1066If the callback returns something, it is sent back as if reply was being
1037called. 1067called.
1038 1068
1069=item cf::register_exticmd $name => \&callback($ns,$packet);
1070
1071Register a callback for execution when the client sends an (asynchronous)
1072exticmd packet. Exti commands are processed by the server as soon as they
1073are received, i.e. out of order w.r.t. other commands. The first argument
1074is a client socket. Exti commands can be received anytime, even before
1075log-in.
1076
1077If the callback returns something, it is sent back as if reply was being
1078called.
1079
1039=cut 1080=cut
1040 1081
1041sub register_extcmd { 1082sub register_extcmd {
1042 my ($name, $cb) = @_; 1083 my ($name, $cb) = @_;
1043 1084
1044 $EXTCMD{$name} = $cb; 1085 $EXTCMD{$name} = $cb;
1086}
1087
1088sub register_exticmd {
1089 my ($name, $cb) = @_;
1090
1091 $EXTICMD{$name} = $cb;
1045} 1092}
1046 1093
1047cf::player->attach ( 1094cf::player->attach (
1048 on_command => sub { 1095 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1096 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1105 cf::override;
1059 }, 1106 },
1060 on_extcmd => sub { 1107 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1108 my ($pl, $buf) = @_;
1062 1109
1063 my $msg = eval { from_json $buf }; 1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1111
1065 if (ref $msg) { 1112 if (ref $msg) {
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1114 if (my %reply = $cb->($pl, $msg)) {
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1115 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1372 # replace G<male|female> tags 1419 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1420 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1 1421 $self->gender ? $2 : $1
1375 }ge 1422 }ge
1376 # replace H<hint text> 1423 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1378 1431
1379 # create single paragraphs (very hackish) 1432 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1433 s/(?<=\S)\n(?=\w)/ /g;
1381 1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1382 $_ 1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1383} 1447}
1384 1448
1385=item $player->ext_reply ($msgid, %msg) 1449=item $player->ext_reply ($msgid, %msg)
1386 1450
1387Sends an ext reply to the player. 1451Sends an ext reply to the player.
… …
1390 1454
1391sub ext_reply($$%) { 1455sub ext_reply($$%) {
1392 my ($self, $id, %msg) = @_; 1456 my ($self, $id, %msg) = @_;
1393 1457
1394 $msg{msgid} = $id; 1458 $msg{msgid} = $id;
1395 1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1460}
1398 1461
1399=item $player->ext_event ($type, %msg) 1462=item $player->ext_event ($type, %msg)
1400 1463
1401Sends an ext event to the client. 1464Sends an ext event to the client.
… …
1426 my ($path) = @_; 1489 my ($path) = @_;
1427 1490
1428 my ($match, $specificity); 1491 my ($match, $specificity);
1429 1492
1430 for my $region (list) { 1493 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1494 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1495 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1496 if $region->specificity > $specificity;
1434 } 1497 }
1435 } 1498 }
1436 1499
… …
2193 2256
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2258 $self->enter_map ($map, $x, $y);
2196} 2259}
2197 2260
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2261=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2262
2200Moves the player to the given map-path and coordinates by first freezing 2263Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2264her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2265that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2266the new (success) or old (failed) map position. In either case, $done will
2267be called at the end of this process.
2204 2268
2205=cut 2269=cut
2206 2270
2207our $GOTOGEN; 2271our $GOTOGEN;
2208 2272
2209sub cf::object::player::goto { 2273sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2274 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2275
2212 # do generation counting so two concurrent goto's will be executed in-order 2276 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2278
2215 $self->enter_link; 2279 $self->enter_link;
… …
2235 2299
2236 if ($gen == $self->{_goto_generation}) { 2300 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2301 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2302 $self->leave_link ($map, $x, $y);
2239 } 2303 }
2304
2305 $done->() if $done;
2240 })->prio (1); 2306 })->prio (1);
2241} 2307}
2242 2308
2243=item $player_object->enter_exit ($exit_object) 2309=item $player_object->enter_exit ($exit_object)
2244 2310
… …
2313 my $hp = $exit->stats->hp; 2379 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2380 my $sp = $exit->stats->sp;
2315 2381
2316 $self->enter_link; 2382 $self->enter_link;
2317 2383
2384 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED);
2387
2318 (async { 2388 (async {
2319 $self->deactivate_recursive; # just to be sure 2389 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2390 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2391 $self->goto ($slaying, $hp, $sp);
2322 2392
… …
2363sub cf::client::send_msg { 2433sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2434 my ($self, $color, $type, $msg, @extra) = @_;
2365 2435
2366 $msg = $self->pl->expand_cfpod ($msg); 2436 $msg = $self->pl->expand_cfpod ($msg);
2367 2437
2438 return unless @extra || length $msg;
2439
2368 if ($self->can_msg) { 2440 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2370 } else { 2442 } else {
2371 # replace some tags by gcfclient-compatible ones 2443 # replace some tags by gcfclient-compatible ones
2372 for ($msg) { 2444 for ($msg) {
2373 1 while 2445 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ 2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ 2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ 2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/; 2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 } 2451 }
2380 2452
2381 if ($color >= 0) { 2453 if ($color >= 0) {
2382 if (0 && $msg =~ /\[/) { 2454 if (0 && $msg =~ /\[/) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2455 $self->send_packet ("drawextinfo $color 4 0 $msg")
2384 } else { 2456 } else {
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2458 $self->send_packet ("drawinfo $color $msg")
2387 } 2459 }
2388 } 2460 }
2389 } 2461 }
2390} 2462}
2391 2463
2392=item $client->ext_event ($type, %msg) 2464=item $client->ext_event ($type, %msg)
2393 2465
2394Sends an exti event to the client. 2466Sends an ext event to the client.
2395 2467
2396=cut 2468=cut
2397 2469
2398sub cf::client::ext_event($$%) { 2470sub cf::client::ext_event($$%) {
2399 my ($self, $type, %msg) = @_; 2471 my ($self, $type, %msg) = @_;
2400 2472
2473 return unless $self->extcmd;
2474
2401 $msg{msgtype} = "event_$type"; 2475 $msg{msgtype} = "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2403} 2477}
2404 2478
2405=item $success = $client->query ($flags, "text", \&cb) 2479=item $success = $client->query ($flags, "text", \&cb)
2406 2480
2407Queues a query to the client, calling the given callback with 2481Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2482the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2483C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2484
2411Queries can fail, so check the return code. Or don't, as queries will become 2485Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2486become reliable at some point in the future.
2413 2487
2414=cut 2488=cut
2415 2489
2416sub cf::client::query { 2490sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2491 my ($self, $flags, $text, $cb) = @_;
… …
2425 utf8::encode $text; 2499 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2500 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2501
2428 $self->send_packet ($self->{query_queue}[0][0]) 2502 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2503 if @{ $self->{query_queue} } == 1;
2504
2505 1
2430} 2506}
2431 2507
2432cf::client->attach ( 2508cf::client->attach (
2509 on_connect => sub {
2510 my ($ns) = @_;
2511
2512 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2513 },
2433 on_reply => sub { 2514 on_reply => sub {
2434 my ($ns, $msg) = @_; 2515 my ($ns, $msg) = @_;
2435 2516
2436 # this weird shuffling is so that direct followup queries 2517 # this weird shuffling is so that direct followup queries
2437 # get handled first 2518 # get handled first
… …
2449 } else { 2530 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2531 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2532 }
2452 } 2533 }
2453 }, 2534 },
2535 on_exticmd => sub {
2536 my ($ns, $buf) = @_;
2537
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539
2540 if (ref $msg) {
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2542 if (my %reply = $cb->($ns, $msg)) {
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 }
2547 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 }
2550
2551 cf::override;
2552 },
2454); 2553);
2455 2554
2456=item $client->async (\&cb) 2555=item $client->async (\&cb)
2457 2556
2458Create a new coroutine, running the specified callback. The coroutine will 2557Create a new coroutine, running the specified callback. The coroutine will
… …
2507 2606
2508=pod 2607=pod
2509 2608
2510The following functions and methods are available within a safe environment: 2609The following functions and methods are available within a safe environment:
2511 2610
2512 cf::object contr pay_amount pay_player map 2611 cf::object
2612 contr pay_amount pay_player map x y force_find force_add
2613 insert remove
2614
2513 cf::object::player player 2615 cf::object::player
2514 cf::player peaceful 2616 player
2515 cf::map trigger 2617
2618 cf::player
2619 peaceful
2620
2621 cf::map
2622 trigger
2516 2623
2517=cut 2624=cut
2518 2625
2519for ( 2626for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2628 insert remove)],
2521 ["cf::object::player" => qw(player)], 2629 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 2630 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 2631 ["cf::map" => qw(trigger)],
2524) { 2632) {
2525 no strict 'refs'; 2633 no strict 'refs';
… …
2617 { 2725 {
2618 my $faces = $facedata->{faceinfo}; 2726 my $faces = $facedata->{faceinfo};
2619 2727
2620 while (my ($face, $info) = each %$faces) { 2728 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2729 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2730 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2625 Coro::cede; 2734
2735 cf::cede_to_tick;
2626 } 2736 }
2627 2737
2628 while (my ($face, $info) = each %$faces) { 2738 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 2739 next unless $info->{smooth};
2630 my $idx = cf::face::find $face 2740 my $idx = cf::face::find $face
2631 or next; 2741 or next;
2632 if (my $smooth = cf::face::find $info->{smooth}) { 2742 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 2745 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2746 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 2747 }
2637 Coro::cede; 2748
2749 cf::cede_to_tick;
2638 } 2750 }
2639 } 2751 }
2640 2752
2641 { 2753 {
2642 my $anims = $facedata->{animinfo}; 2754 my $anims = $facedata->{animinfo};
2643 2755
2644 while (my ($anim, $info) = each %$anims) { 2756 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2757 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 2758 cf::cede_to_tick;
2647 } 2759 }
2648 2760
2649 cf::anim::invalidate_all; # d'oh 2761 cf::anim::invalidate_all; # d'oh
2762 }
2763
2764 {
2765 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769
2770 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2778
2779 if ($name =~ /\.jpg$/) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2782 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data};
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 }
2789
2790 cf::cede_to_tick;
2791 }
2650 } 2792 }
2651 2793
2652 1 2794 1
2653} 2795}
2654 2796
2655sub reload_regions { 2797sub reload_regions {
2656 load_resource_file "$MAPDIR/regions" 2798 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 2799 or die "unable to load regions file\n";
2800
2801 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/
2803 if exists $_->{match};
2804 }
2658} 2805}
2659 2806
2660sub reload_facedata { 2807sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 2808 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 2809 or die "unable to load facedata\n";
2663} 2810}
2664 2811
2665sub reload_archetypes { 2812sub reload_archetypes {
2813 load_resource_file "$DATADIR/archetypes"
2814 or die "unable to load archetypes\n";
2815 #d# NEED to laod twice to resolve forward references
2816 # this really needs to be done in an extra post-pass
2817 # (which needs to be synchronous, so solve it differently)
2666 load_resource_file "$DATADIR/archetypes" 2818 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n"; 2819 or die "unable to load archetypes\n";
2668} 2820}
2669 2821
2670sub reload_treasures { 2822sub reload_treasures {
… …
2864 %EXT_CORO = (); 3016 %EXT_CORO = ();
2865 3017
2866 warn "removing commands"; 3018 warn "removing commands";
2867 %COMMAND = (); 3019 %COMMAND = ();
2868 3020
2869 warn "removing ext commands"; 3021 warn "removing ext/exti commands";
2870 %EXTCMD = (); 3022 %EXTCMD = ();
3023 %EXTICMD = ();
2871 3024
2872 warn "unloading/nuking all extensions"; 3025 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3026 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3027 warn "... unloading $pkg";
2875 3028

Diff Legend

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