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.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.305 by root, Thu Jul 12 08:40:14 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);
… …
1347 } 1394 }
1348 1395
1349 \@paths 1396 \@paths
1350} 1397}
1351 1398
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1400
1401Expand crossfire pod fragments into protocol xml.
1402
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
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;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
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
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1352=item $player->ext_reply ($msgid, %msg) 1449=item $player->ext_reply ($msgid, %msg)
1353 1450
1354Sends an ext reply to the player. 1451Sends an ext reply to the player.
1355 1452
1356=cut 1453=cut
1357 1454
1358sub ext_reply($$%) { 1455sub ext_reply($$%) {
1359 my ($self, $id, %msg) = @_; 1456 my ($self, $id, %msg) = @_;
1360 1457
1361 $msg{msgid} = $id; 1458 $msg{msgid} = $id;
1362 1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1460}
1365 1461
1366=item $player->ext_event ($type, %msg) 1462=item $player->ext_event ($type, %msg)
1367 1463
1368Sends an ext event to the client. 1464Sends an ext event to the client.
… …
1393 my ($path) = @_; 1489 my ($path) = @_;
1394 1490
1395 my ($match, $specificity); 1491 my ($match, $specificity);
1396 1492
1397 for my $region (list) { 1493 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1494 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1495 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1496 if $region->specificity > $specificity;
1401 } 1497 }
1402 } 1498 }
1403 1499
… …
2045 2141
2046 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2142 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047 2143
2048 if ($self->{record_replies}) { 2144 if ($self->{record_replies}) {
2049 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2145 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2146
2050 } else { 2147 } else {
2148 my $pl = $self->contr;
2149
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply (
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158
2159 } else {
2051 $msg = $npc->name . " says: $msg" if $npc; 2160 $msg = $npc->name . " says: $msg" if $npc;
2052 $self->message ($msg, $flags); 2161 $self->message ($msg, $flags);
2162 }
2053 } 2163 }
2054} 2164}
2055 2165
2056=item $player_object->may ("access") 2166=item $player_object->may ("access")
2057 2167
… …
2266 my $hp = $exit->stats->hp; 2376 my $hp = $exit->stats->hp;
2267 my $sp = $exit->stats->sp; 2377 my $sp = $exit->stats->sp;
2268 2378
2269 $self->enter_link; 2379 $self->enter_link;
2270 2380
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2271 (async { 2385 (async {
2272 $self->deactivate_recursive; # just to be sure 2386 $self->deactivate_recursive; # just to be sure
2273 unless (eval { 2387 unless (eval {
2274 $self->goto ($slaying, $hp, $sp); 2388 $self->goto ($slaying, $hp, $sp);
2275 2389
… …
2302 2416
2303 utf8::encode $text; 2417 utf8::encode $text;
2304 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305} 2419}
2306 2420
2421=item $client->send_msg ($color, $type, $msg, [extra...])
2422
2423Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet.
2427
2428=cut
2429
2430sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_;
2432
2433 $msg = $self->pl->expand_cfpod ($msg);
2434
2435 return unless @extra || length $msg;
2436
2437 if ($self->can_msg) {
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2439 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) {
2451 if (0 && $msg =~ /\[/) {
2452 $self->send_packet ("drawextinfo $color 4 0 $msg")
2453 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg")
2456 }
2457 }
2458 }
2459}
2460
2307=item $client->ext_event ($type, %msg) 2461=item $client->ext_event ($type, %msg)
2308 2462
2309Sends an exti event to the client. 2463Sends an ext event to the client.
2310 2464
2311=cut 2465=cut
2312 2466
2313sub cf::client::ext_event($$%) { 2467sub cf::client::ext_event($$%) {
2314 my ($self, $type, %msg) = @_; 2468 my ($self, $type, %msg) = @_;
2315 2469
2470 return unless $self->extcmd;
2471
2316 $msg{msgtype} = "event_$type"; 2472 $msg{msgtype} = "event_$type";
2317 $self->send_packet ("ext " . cf::to_json \%msg); 2473 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2318} 2474}
2319 2475
2320=item $success = $client->query ($flags, "text", \&cb) 2476=item $success = $client->query ($flags, "text", \&cb)
2321 2477
2322Queues a query to the client, calling the given callback with 2478Queues a query to the client, calling the given callback with
2323the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2479the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2324C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2480C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325 2481
2326Queries can fail, so check the return code. Or don't, as queries will become 2482Queries can fail, so check the return code. Or don't, as queries will
2327reliable at some point in the future. 2483become reliable at some point in the future.
2328 2484
2329=cut 2485=cut
2330 2486
2331sub cf::client::query { 2487sub cf::client::query {
2332 my ($self, $flags, $text, $cb) = @_; 2488 my ($self, $flags, $text, $cb) = @_;
… …
2340 utf8::encode $text; 2496 utf8::encode $text;
2341 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2497 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342 2498
2343 $self->send_packet ($self->{query_queue}[0][0]) 2499 $self->send_packet ($self->{query_queue}[0][0])
2344 if @{ $self->{query_queue} } == 1; 2500 if @{ $self->{query_queue} } == 1;
2501
2502 1
2345} 2503}
2346 2504
2347cf::client->attach ( 2505cf::client->attach (
2506 on_connect => sub {
2507 my ($ns) = @_;
2508
2509 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2510 },
2348 on_reply => sub { 2511 on_reply => sub {
2349 my ($ns, $msg) = @_; 2512 my ($ns, $msg) = @_;
2350 2513
2351 # this weird shuffling is so that direct followup queries 2514 # this weird shuffling is so that direct followup queries
2352 # get handled first 2515 # get handled first
… …
2364 } else { 2527 } else {
2365 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2528 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366 } 2529 }
2367 } 2530 }
2368 }, 2531 },
2532 on_exticmd => sub {
2533 my ($ns, $buf) = @_;
2534
2535 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2536
2537 if (ref $msg) {
2538 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2539 if (my %reply = $cb->($ns, $msg)) {
2540 $reply{msgid} = $msg->{msgid};
2541 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2542 }
2543 }
2544 } else {
2545 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2546 }
2547
2548 cf::override;
2549 },
2369); 2550);
2370 2551
2371=item $client->async (\&cb) 2552=item $client->async (\&cb)
2372 2553
2373Create a new coroutine, running the specified callback. The coroutine will 2554Create a new coroutine, running the specified callback. The coroutine will
… …
2422 2603
2423=pod 2604=pod
2424 2605
2425The following functions and methods are available within a safe environment: 2606The following functions and methods are available within a safe environment:
2426 2607
2427 cf::object contr pay_amount pay_player map 2608 cf::object
2609 contr pay_amount pay_player map x y force_find force_add
2610 insert remove
2611
2428 cf::object::player player 2612 cf::object::player
2429 cf::player peaceful 2613 player
2430 cf::map trigger 2614
2615 cf::player
2616 peaceful
2617
2618 cf::map
2619 trigger
2431 2620
2432=cut 2621=cut
2433 2622
2434for ( 2623for (
2435 ["cf::object" => qw(contr pay_amount pay_player map)], 2624 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2625 insert remove)],
2436 ["cf::object::player" => qw(player)], 2626 ["cf::object::player" => qw(player)],
2437 ["cf::player" => qw(peaceful)], 2627 ["cf::player" => qw(peaceful)],
2438 ["cf::map" => qw(trigger)], 2628 ["cf::map" => qw(trigger)],
2439) { 2629) {
2440 no strict 'refs'; 2630 no strict 'refs';
… …
2532 { 2722 {
2533 my $faces = $facedata->{faceinfo}; 2723 my $faces = $facedata->{faceinfo};
2534 2724
2535 while (my ($face, $info) = each %$faces) { 2725 while (my ($face, $info) = each %$faces) {
2536 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2726 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2537 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2727 cf::face::set_visibility $idx, $info->{visibility};
2728 cf::face::set_magicmap $idx, $info->{magicmap};
2538 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2729 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2539 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2730 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2540 Coro::cede; 2731
2732 cf::cede_to_tick;
2541 } 2733 }
2542 2734
2543 while (my ($face, $info) = each %$faces) { 2735 while (my ($face, $info) = each %$faces) {
2544 next unless $info->{smooth}; 2736 next unless $info->{smooth};
2545 my $idx = cf::face::find $face 2737 my $idx = cf::face::find $face
2546 or next; 2738 or next;
2547 if (my $smooth = cf::face::find $info->{smooth}) { 2739 if (my $smooth = cf::face::find $info->{smooth}) {
2740 cf::face::set_smooth $idx, $smooth;
2548 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2741 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2549 } else { 2742 } else {
2550 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2743 warn "smooth face '$info->{smooth}' not found for face '$face'";
2551 } 2744 }
2552 Coro::cede; 2745
2746 cf::cede_to_tick;
2553 } 2747 }
2554 } 2748 }
2555 2749
2556 { 2750 {
2557 my $anims = $facedata->{animinfo}; 2751 my $anims = $facedata->{animinfo};
2558 2752
2559 while (my ($anim, $info) = each %$anims) { 2753 while (my ($anim, $info) = each %$anims) {
2560 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2754 cf::anim::set $anim, $info->{frames}, $info->{facings};
2561 Coro::cede; 2755 cf::cede_to_tick;
2562 } 2756 }
2563 2757
2564 cf::anim::invalidate_all; # d'oh 2758 cf::anim::invalidate_all; # d'oh
2759 }
2760
2761 {
2762 # TODO: for gcfclient pleasure, we should give resources
2763 # that gcfclient doesn't grok a >10000 face index.
2764 my $res = $facedata->{resource};
2765 my $enc = JSON::XS->new->utf8->canonical;
2766
2767 while (my ($name, $info) = each %$res) {
2768 my $meta = $enc->encode ({
2769 name => $name,
2770 type => $info->{type},
2771 copyright => $info->{copyright}, #TODO#
2772 });
2773 my $data = pack "(w/a*)*", $meta, $info->{data};
2774 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2775
2776 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2777 cf::face::set_type $idx, 1;
2778 cf::face::set_data $idx, 0, $data, $chk;
2779
2780 cf::cede_to_tick;
2781 }
2565 } 2782 }
2566 2783
2567 1 2784 1
2568} 2785}
2569 2786
2570sub reload_regions { 2787sub reload_regions {
2571 load_resource_file "$MAPDIR/regions" 2788 load_resource_file "$MAPDIR/regions"
2572 or die "unable to load regions file\n"; 2789 or die "unable to load regions file\n";
2790
2791 for (cf::region::list) {
2792 $_->{match} = qr/$_->{match}/
2793 if exists $_->{match};
2794 }
2573} 2795}
2574 2796
2575sub reload_facedata { 2797sub reload_facedata {
2576 load_facedata "$DATADIR/facedata" 2798 load_facedata "$DATADIR/facedata"
2577 or die "unable to load facedata\n"; 2799 or die "unable to load facedata\n";
2578} 2800}
2579 2801
2580sub reload_archetypes { 2802sub reload_archetypes {
2803 load_resource_file "$DATADIR/archetypes"
2804 or die "unable to load archetypes\n";
2805 #d# NEED to laod twice to resolve forward references
2806 # this really needs to be done in an extra post-pass
2807 # (which needs to be synchronous, so solve it differently)
2581 load_resource_file "$DATADIR/archetypes" 2808 load_resource_file "$DATADIR/archetypes"
2582 or die "unable to load archetypes\n"; 2809 or die "unable to load archetypes\n";
2583} 2810}
2584 2811
2585sub reload_treasures { 2812sub reload_treasures {
… …
2779 %EXT_CORO = (); 3006 %EXT_CORO = ();
2780 3007
2781 warn "removing commands"; 3008 warn "removing commands";
2782 %COMMAND = (); 3009 %COMMAND = ();
2783 3010
2784 warn "removing ext commands"; 3011 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3012 %EXTCMD = ();
3013 %EXTICMD = ();
2786 3014
2787 warn "unloading/nuking all extensions"; 3015 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3016 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3017 warn "... unloading $pkg";
2790 3018

Diff Legend

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