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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.315 by root, Mon Jul 23 17:53:55 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
… …
164=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
165 167
166These 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
167returns 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
168per 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.
169 177
170=back 178=back
171 179
172=cut 180=cut
173 181
… …
237 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238 $d 246 $d
239 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
240} 248}
241 249
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
245 251
246Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
247 253
248=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
249 255
250Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
251 257
252=cut 258=cut
253 259
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 261
256sub to_json ($) { $json_coder->encode ($_[0]) } 262sub to_json ($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 263sub from_json ($) { $json_coder->decode ($_[0]) }
258 264
259=item cf::lock_wait $string 265=item cf::lock_wait $string
… …
314 my $guard = Coro::guard { 320 my $guard = Coro::guard {
315 $TICK_WATCHER->start; 321 $TICK_WATCHER->start;
316 }; 322 };
317 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
318 $guard 324 $guard
325}
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;
319} 381}
320 382
321=item cf::async { BLOCK } 383=item cf::async { BLOCK }
322 384
323Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
… …
410Coro::Storable. May, of course, block. Note that the executed sub may 472Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 473never block itself or use any form of Event handling.
412 474
413=cut 475=cut
414 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
415sub fork_call(&@) { 486sub fork_call(&@) {
416 my ($cb, @args) = @_; 487 my ($cb, @args) = @_;
417 488
418# 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
419# or die "socketpair: $!"; 490# or die "socketpair: $!";
… …
422 493
423 if (my $pid = fork) { 494 if (my $pid = fork) {
424 close $fh2; 495 close $fh2;
425 496
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res; 499 $res = Coro::Storable::thaw $res;
428 500
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430 502
431 die $$res unless "ARRAY" eq ref $res; 503 Carp::confess $$res unless "ARRAY" eq ref $res;
432 504
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.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515
438 eval { 516 eval {
439 close $fh1; 517 close $fh1;
440 518
441 my @res = eval { $cb->(@args) }; 519 my @res = eval { $cb->(@args) };
520
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
443 }; 523 };
444 524
445 warn $@ if $@; 525 warn $@ if $@;
446 _exit 0; 526 _exit 0;
447 } 527 }
… …
848 "; 928 ";
849 die if $@; 929 die if $@;
850} 930}
851 931
852our $override; 932our $override;
853our @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?
854 934
855sub override { 935sub override {
856 $override = 1; 936 $override = 1;
857 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
858} 938}
859 939
860sub do_invoke { 940sub do_invoke {
861 my $event = shift; 941 my $event = shift;
862 my $callbacks = shift; 942 my $callbacks = shift;
863 943
864 @invoke_results = (); 944 @INVOKE_RESULTS = ();
865 945
866 local $override; 946 local $override;
867 947
868 for (@$callbacks) { 948 for (@$callbacks) {
869 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
886 966
887Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
888 968
889This 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
890removed 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
891results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 972
893=back 973=back
894 974
895=cut 975=cut
896 976
897############################################################################# 977#############################################################################
898# 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}
899 990
900sub reattach { 991sub reattach {
901 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 993 my ($obj) = @_;
903 994
… …
1087 cf::override; 1178 cf::override;
1088 }, 1179 },
1089 on_extcmd => sub { 1180 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1091 1182
1092 my $msg = eval { from_json $buf }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1184
1094 if (ref $msg) { 1185 if (ref $msg) {
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1187 if (my %reply = $cb->($pl, $msg)) {
1097 $pl->ext_reply ($msg->{msgid}, %reply); 1188 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1401 # replace G<male|female> tags 1492 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1493 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1 1494 $self->gender ? $2 : $1
1404 }ge 1495 }ge
1405 # replace H<hint text> 1496 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1497 || s{H<([^\>]*)>}
1498 {
1499 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "")
1502 [$self->{hintmode}]
1503 }ge;
1407 1504
1408 # create single paragraphs (very hackish) 1505 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1506 s/(?<=\S)\n(?=\w)/ /g;
1410 1507
1508 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines
1513
1411 $_ 1514 $_
1515}
1516
1517sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode}
1412} 1520}
1413 1521
1414=item $player->ext_reply ($msgid, %msg) 1522=item $player->ext_reply ($msgid, %msg)
1415 1523
1416Sends an ext reply to the player. 1524Sends an ext reply to the player.
… …
1419 1527
1420sub ext_reply($$%) { 1528sub ext_reply($$%) {
1421 my ($self, $id, %msg) = @_; 1529 my ($self, $id, %msg) = @_;
1422 1530
1423 $msg{msgid} = $id; 1531 $msg{msgid} = $id;
1424 $self->send ("ext " . cf::to_json \%msg); 1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1425} 1533}
1426 1534
1427=item $player->ext_event ($type, %msg) 1535=item $player->ext_event ($type, %msg)
1428 1536
1429Sends an ext event to the client. 1537Sends an ext event to the client.
… …
1454 my ($path) = @_; 1562 my ($path) = @_;
1455 1563
1456 my ($match, $specificity); 1564 my ($match, $specificity);
1457 1565
1458 for my $region (list) { 1566 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1567 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1568 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1569 if $region->specificity > $specificity;
1462 } 1570 }
1463 } 1571 }
1464 1572
… …
1584 $self->init; # pass $1 etc. 1692 $self->init; # pass $1 etc.
1585 return $self; 1693 return $self;
1586 } 1694 }
1587 } 1695 }
1588 1696
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1697 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1698 ()
1591} 1699}
1592 1700
1593sub init { 1701sub init {
1594 my ($self) = @_; 1702 my ($self) = @_;
… …
1872 1980
1873 undef $MAP_PREFETCH{$path}; 1981 undef $MAP_PREFETCH{$path};
1874 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 1984 for my $path (keys %MAP_PREFETCH) {
1877 my $map = find $path 1985 if (my $map = find $path) {
1878 or next;
1879 $map->load; 1986 $map->load;
1987 }
1880 1988
1881 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$path};
1882 } 1990 }
1883 } 1991 }
1884 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
… …
2221 2329
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2331 $self->enter_map ($map, $x, $y);
2224} 2332}
2225 2333
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2334=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2335
2228Moves the player to the given map-path and coordinates by first freezing 2336Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2337her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2338that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2339the new (success) or old (failed) map position. In either case, $done will
2340be called at the end of this process.
2232 2341
2233=cut 2342=cut
2234 2343
2235our $GOTOGEN; 2344our $GOTOGEN;
2236 2345
2237sub cf::object::player::goto { 2346sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2347 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2348
2240 # do generation counting so two concurrent goto's will be executed in-order 2349 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2351
2243 $self->enter_link; 2352 $self->enter_link;
… …
2263 2372
2264 if ($gen == $self->{_goto_generation}) { 2373 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2374 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2375 $self->leave_link ($map, $x, $y);
2267 } 2376 }
2377
2378 $done->() if $done;
2268 })->prio (1); 2379 })->prio (1);
2269} 2380}
2270 2381
2271=item $player_object->enter_exit ($exit_object) 2382=item $player_object->enter_exit ($exit_object)
2272 2383
… …
2341 my $hp = $exit->stats->hp; 2452 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2453 my $sp = $exit->stats->sp;
2343 2454
2344 $self->enter_link; 2455 $self->enter_link;
2345 2456
2457 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED);
2460
2346 (async { 2461 (async {
2347 $self->deactivate_recursive; # just to be sure 2462 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2463 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2464 $self->goto ($slaying, $hp, $sp);
2350 2465
… …
2377 2492
2378 utf8::encode $text; 2493 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2494 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2495}
2381 2496
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2497=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2498
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2499Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 2500client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress 2501the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2502the message unless the client supports the msg packet.
2388 2503
2389=cut 2504=cut
2390 2505
2391sub cf::client::send_msg { 2506sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2507 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2508
2394 $msg = $self->pl->expand_cfpod ($msg); 2509 $msg = $self->pl->expand_cfpod ($msg);
2395 2510
2511 $color &= ~cf::NDI_UNIQUE; # just in case...
2512
2513 if (ref $channel) {
2514 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel);
2518 }
2519
2520 $channel = $channel->{id};
2521 }
2522
2523 return unless @extra || length $msg;
2524
2396 if ($self->can_msg) { 2525 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2398 } else { 2527 } else {
2399 # replace some tags by gcfclient-compatible ones 2528 # replace some tags by gcfclient-compatible ones
2400 for ($msg) { 2529 for ($msg) {
2401 1 while 2530 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2424=cut 2553=cut
2425 2554
2426sub cf::client::ext_event($$%) { 2555sub cf::client::ext_event($$%) {
2427 my ($self, $type, %msg) = @_; 2556 my ($self, $type, %msg) = @_;
2428 2557
2558 return unless $self->extcmd;
2559
2429 $msg{msgtype} = "event_$type"; 2560 $msg{msgtype} = "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2431} 2562}
2432 2563
2433=item $success = $client->query ($flags, "text", \&cb) 2564=item $success = $client->query ($flags, "text", \&cb)
2434 2565
2435Queues a query to the client, calling the given callback with 2566Queues a query to the client, calling the given callback with
… …
2458 2589
2459 1 2590 1
2460} 2591}
2461 2592
2462cf::client->attach ( 2593cf::client->attach (
2594 on_connect => sub {
2595 my ($ns) = @_;
2596
2597 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2598 },
2463 on_reply => sub { 2599 on_reply => sub {
2464 my ($ns, $msg) = @_; 2600 my ($ns, $msg) = @_;
2465 2601
2466 # this weird shuffling is so that direct followup queries 2602 # this weird shuffling is so that direct followup queries
2467 # get handled first 2603 # get handled first
… …
2482 } 2618 }
2483 }, 2619 },
2484 on_exticmd => sub { 2620 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2621 my ($ns, $buf) = @_;
2486 2622
2487 my $msg = eval { from_json $buf }; 2623 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2624
2489 if (ref $msg) { 2625 if (ref $msg) {
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2627 if (my %reply = $cb->($ns, $msg)) {
2492 $reply{msgid} = $msg->{msgid}; 2628 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply); 2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2494 } 2630 }
2495 } 2631 }
2496 } else { 2632 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2634 }
… …
2555 2691
2556=pod 2692=pod
2557 2693
2558The following functions and methods are available within a safe environment: 2694The following functions and methods are available within a safe environment:
2559 2695
2560 cf::object contr pay_amount pay_player map 2696 cf::object
2697 contr pay_amount pay_player map x y force_find force_add
2698 insert remove
2699
2561 cf::object::player player 2700 cf::object::player
2562 cf::player peaceful 2701 player
2563 cf::map trigger 2702
2703 cf::player
2704 peaceful
2705
2706 cf::map
2707 trigger
2564 2708
2565=cut 2709=cut
2566 2710
2567for ( 2711for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2713 insert remove)],
2569 ["cf::object::player" => qw(player)], 2714 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2715 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2716 ["cf::map" => qw(trigger)],
2572) { 2717) {
2573 no strict 'refs'; 2718 no strict 'refs';
… …
2665 { 2810 {
2666 my $faces = $facedata->{faceinfo}; 2811 my $faces = $facedata->{faceinfo};
2667 2812
2668 while (my ($face, $info) = each %$faces) { 2813 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2814 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2815 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2673 Coro::cede; 2819
2820 cf::cede_to_tick;
2674 } 2821 }
2675 2822
2676 while (my ($face, $info) = each %$faces) { 2823 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2824 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2825 my $idx = cf::face::find $face
2679 or next; 2826 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2827 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2830 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2831 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2832 }
2685 Coro::cede; 2833
2834 cf::cede_to_tick;
2686 } 2835 }
2687 } 2836 }
2688 2837
2689 { 2838 {
2690 my $anims = $facedata->{animinfo}; 2839 my $anims = $facedata->{animinfo};
2691 2840
2692 while (my ($anim, $info) = each %$anims) { 2841 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2842 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2843 cf::cede_to_tick;
2695 } 2844 }
2696 2845
2697 cf::anim::invalidate_all; # d'oh 2846 cf::anim::invalidate_all; # d'oh
2847 }
2848
2849 {
2850 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854
2855 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2863
2864 if ($name =~ /\.jpg$/) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2867 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 }
2874
2875 cf::cede_to_tick;
2876 }
2698 } 2877 }
2699 2878
2700 1 2879 1
2701} 2880}
2702 2881
2703sub reload_regions { 2882sub reload_regions {
2704 load_resource_file "$MAPDIR/regions" 2883 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 2884 or die "unable to load regions file\n";
2885
2886 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/
2888 if exists $_->{match};
2889 }
2706} 2890}
2707 2891
2708sub reload_facedata { 2892sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 2893 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 2894 or die "unable to load facedata\n";
2711} 2895}
2712 2896
2713sub reload_archetypes { 2897sub reload_archetypes {
2898 load_resource_file "$DATADIR/archetypes"
2899 or die "unable to load archetypes\n";
2900 #d# NEED to laod twice to resolve forward references
2901 # this really needs to be done in an extra post-pass
2902 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 2903 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 2904 or die "unable to load archetypes\n";
2716} 2905}
2717 2906
2718sub reload_treasures { 2907sub reload_treasures {

Diff Legend

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