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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.329 by root, Fri Aug 10 05:38:16 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.
… …
865 "; 928 ";
866 die if $@; 929 die if $@;
867} 930}
868 931
869our $override; 932our $override;
870our @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?
871 934
872sub override { 935sub override {
873 $override = 1; 936 $override = 1;
874 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
875} 938}
876 939
877sub do_invoke { 940sub do_invoke {
878 my $event = shift; 941 my $event = shift;
879 my $callbacks = shift; 942 my $callbacks = shift;
880 943
881 @invoke_results = (); 944 @INVOKE_RESULTS = ();
882 945
883 local $override; 946 local $override;
884 947
885 for (@$callbacks) { 948 for (@$callbacks) {
886 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
903 966
904Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
905 968
906This 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
907removed 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
908results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 972
910=back 973=back
911 974
912=cut 975=cut
913 976
914############################################################################# 977#############################################################################
915# 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}
916 990
917sub reattach { 991sub reattach {
918 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 993 my ($obj) = @_;
920 994
… …
1107 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1108 1182
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1184
1111 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
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
1114 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
1115 } 1195 if $reply;
1116 } 1196 }
1117 } else { 1197 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1199 }
1120 1200
… …
1290 $self->{deny_save} = 1; 1370 $self->{deny_save} = 1;
1291 1371
1292 $cf::PLAYER{$login} = $self; 1372 $cf::PLAYER{$login} = $self;
1293 1373
1294 $self 1374 $self
1375}
1376
1377=item $player->send_msg ($channel, $msg, $color, [extra...])
1378
1379=cut
1380
1381sub send_msg {
1382 my $ns = shift->ns
1383 or return;
1384 $ns->send_msg (@_);
1295} 1385}
1296 1386
1297=item $pl->quit_character 1387=item $pl->quit_character
1298 1388
1299Nukes the player without looking back. If logged in, the connection will 1389Nukes the player without looking back. If logged in, the connection will
… …
1435 s/\s+\n/\n/g; # ws line-ends 1525 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1526 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1527 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1528 s/\n+$//; # ending lines
1439 1529
1440 warn $_;#d#
1441 $_ 1530 $_
1442} 1531}
1443 1532
1444sub hintmode { 1533sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1535 $_[0]{hintmode}
1447} 1536}
1448 1537
1449=item $player->ext_reply ($msgid, %msg) 1538=item $player->ext_reply ($msgid, @msg)
1450 1539
1451Sends an ext reply to the player. 1540Sends an ext reply to the player.
1452 1541
1453=cut 1542=cut
1454 1543
1455sub ext_reply($$%) { 1544sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1545 my ($self, $id, @msg) = @_;
1457 1546
1458 $msg{msgid} = $id; 1547 if ($self->ns->extcmd == 2) {
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1460} 1554}
1461 1555
1462=item $player->ext_event ($type, %msg) 1556=item $player->ext_msg ($type, @msg)
1463 1557
1464Sends an ext event to the client. 1558Sends an ext event to the client.
1465 1559
1466=cut 1560=cut
1467 1561
1468sub ext_event($$%) { 1562sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1563 my ($self, $type, @msg) = @_;
1470 1564
1471 $self->ns->ext_event ($type, %msg); 1565 $self->ns->ext_msg ($type, @msg);
1472} 1566}
1473 1567
1474=head3 cf::region 1568=head3 cf::region
1475 1569
1476=over 4 1570=over 4
… …
1489 my ($path) = @_; 1583 my ($path) = @_;
1490 1584
1491 my ($match, $specificity); 1585 my ($match, $specificity);
1492 1586
1493 for my $region (list) { 1587 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1588 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1589 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1590 if $region->specificity > $specificity;
1497 } 1591 }
1498 } 1592 }
1499 1593
… …
1619 $self->init; # pass $1 etc. 1713 $self->init; # pass $1 etc.
1620 return $self; 1714 return $self;
1621 } 1715 }
1622 } 1716 }
1623 1717
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1718 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1719 ()
1626} 1720}
1627 1721
1628sub init { 1722sub init {
1629 my ($self) = @_; 1723 my ($self) = @_;
… …
1837 $self->set_darkness_map; 1931 $self->set_darkness_map;
1838 Coro::cede; 1932 Coro::cede;
1839 $self->activate; 1933 $self->activate;
1840 } 1934 }
1841 1935
1936 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME);
1938
1842 $self->in_memory (cf::MAP_IN_MEMORY); 1939 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 1940 }
1844 1941
1845 $self->post_load; 1942 $self->post_load;
1846} 1943}
… …
1907 2004
1908 undef $MAP_PREFETCH{$path}; 2005 undef $MAP_PREFETCH{$path};
1909 $MAP_PREFETCHER ||= cf::async { 2006 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 2007 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2008 for my $path (keys %MAP_PREFETCH) {
1912 my $map = find $path 2009 if (my $map = find $path) {
1913 or next;
1914 $map->load; 2010 $map->load;
2011 }
1915 2012
1916 delete $MAP_PREFETCH{$path}; 2013 delete $MAP_PREFETCH{$path};
1917 } 2014 }
1918 } 2015 }
1919 undef $MAP_PREFETCHER; 2016 undef $MAP_PREFETCHER;
… …
2146 2243
2147 } else { 2244 } else {
2148 my $pl = $self->contr; 2245 my $pl = $self->contr;
2149 2246
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2247 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2248 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2249 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2250
2159 } else { 2251 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2252 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2253 $self->message ($msg, $flags);
2162 } 2254 }
2163 } 2255 }
2256}
2257
2258=item $object->send_msg ($channel, $msg, $color, [extra...])
2259
2260=cut
2261
2262sub cf::object::send_msg {
2263 my $pl = shift->contr
2264 or return;
2265 $pl->send_msg (@_);
2164} 2266}
2165 2267
2166=item $player_object->may ("access") 2268=item $player_object->may ("access")
2167 2269
2168Returns wether the given player is authorized to access resource "access" 2270Returns wether the given player is authorized to access resource "access"
… …
2256 2358
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2360 $self->enter_map ($map, $x, $y);
2259} 2361}
2260 2362
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2363=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2364
2263Moves the player to the given map-path and coordinates by first freezing 2365Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2366her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2367that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2368the new (success) or old (failed) map position. In either case, $done will
2369be called at the end of this process.
2267 2370
2268=cut 2371=cut
2269 2372
2270our $GOTOGEN; 2373our $GOTOGEN;
2271 2374
2272sub cf::object::player::goto { 2375sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2376 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2377
2275 # do generation counting so two concurrent goto's will be executed in-order 2378 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2380
2278 $self->enter_link; 2381 $self->enter_link;
… …
2298 2401
2299 if ($gen == $self->{_goto_generation}) { 2402 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2403 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2404 $self->leave_link ($map, $x, $y);
2302 } 2405 }
2406
2407 $done->() if $done;
2303 })->prio (1); 2408 })->prio (1);
2304} 2409}
2305 2410
2306=item $player_object->enter_exit ($exit_object) 2411=item $player_object->enter_exit ($exit_object)
2307 2412
… …
2416 2521
2417 utf8::encode $text; 2522 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2523 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2524}
2420 2525
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2526=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2527
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2528Send 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 2529client 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 2530the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2531the message unless the client supports the msg packet.
2427 2532
2428=cut 2533=cut
2429 2534
2430sub cf::client::send_msg { 2535sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2536 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2537
2433 $msg = $self->pl->expand_cfpod ($msg); 2538 $msg = $self->pl->expand_cfpod ($msg);
2434 2539
2540 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541
2542 if (ref $channel) {
2543 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel);
2547 }
2548
2549 $channel = $channel->{id};
2550 }
2551
2435 return unless @extra || length $msg; 2552 return unless @extra || length $msg;
2436 2553
2437 if ($self->can_msg) { 2554 if ($self->can_msg) {
2555 # default colour, mask it out
2556 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2557 if $color & cf::NDI_DEF;
2558
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2559 $self->send_packet ("msg " . $self->{json_coder}->encode (
2560 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2561 } 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) { 2562 if ($color >= 0) {
2563 # replace some tags by gcfclient-compatible ones
2564 for ($msg) {
2565 1 while
2566 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2567 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2568 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2569 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2570 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2571 }
2572
2573 $color &= cf::NDI_COLOR_MASK;
2574
2575 utf8::encode $msg;
2576
2451 if (0 && $msg =~ /\[/) { 2577 if (0 && $msg =~ /\[/) {
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2578 $self->send_packet ("drawextinfo $color 4 0 $msg")
2453 } else { 2579 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2581 $self->send_packet ("drawinfo $color $msg")
2456 } 2582 }
2457 } 2583 }
2458 } 2584 }
2459} 2585}
2460 2586
2461=item $client->ext_event ($type, %msg) 2587=item $client->ext_msg ($type, @msg)
2462 2588
2463Sends an ext event to the client. 2589Sends an ext event to the client.
2464 2590
2465=cut 2591=cut
2466 2592
2467sub cf::client::ext_event($$%) { 2593sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2594 my ($self, $type, @msg) = @_;
2469 2595
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2601 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 }
2472} 2604}
2473 2605
2474=item $success = $client->query ($flags, "text", \&cb) 2606=item $success = $client->query ($flags, "text", \&cb)
2475 2607
2476Queues a query to the client, calling the given callback with 2608Queues a query to the client, calling the given callback with
… …
2531 my ($ns, $buf) = @_; 2663 my ($ns, $buf) = @_;
2532 2664
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2665 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2666
2535 if (ref $msg) { 2667 if (ref $msg) {
2668 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg
2670 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2673 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 2674 my @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid}; 2675
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2676 $ns->ext_reply ($reply, @reply)
2540 } 2677 if $reply;
2541 } 2678 }
2542 } else { 2679 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 2681 }
2545 2682
… …
2593our $safe = new Safe "safe"; 2730our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 2731our $safe_hole = new Safe::Hole;
2595 2732
2596$SIG{FPE} = 'IGNORE'; 2733$SIG{FPE} = 'IGNORE';
2597 2734
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2735$safe->permit_only (Opcode::opset qw(
2736 :base_core :base_mem :base_orig :base_math
2737 grepstart grepwhile mapstart mapwhile
2738 sort time
2739));
2599 2740
2600# here we export the classes and methods available to script code 2741# here we export the classes and methods available to script code
2601 2742
2602=pod 2743=pod
2603 2744
… …
2618 2759
2619=cut 2760=cut
2620 2761
2621for ( 2762for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)], 2764 insert remove inv)],
2624 ["cf::object::player" => qw(player)], 2765 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 2766 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 2767 ["cf::map" => qw(trigger)],
2627) { 2768) {
2628 no strict 'refs'; 2769 no strict 'refs';
… …
2720 { 2861 {
2721 my $faces = $facedata->{faceinfo}; 2862 my $faces = $facedata->{faceinfo};
2722 2863
2723 while (my ($face, $info) = each %$faces) { 2864 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2865 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2866 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2728 Coro::cede; 2870
2871 cf::cede_to_tick;
2729 } 2872 }
2730 2873
2731 while (my ($face, $info) = each %$faces) { 2874 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth}; 2875 next unless $info->{smooth};
2733 my $idx = cf::face::find $face 2876 my $idx = cf::face::find $face
2734 or next; 2877 or next;
2735 if (my $smooth = cf::face::find $info->{smooth}) { 2878 if (my $smooth = cf::face::find $info->{smooth}) {
2879 cf::face::set_smooth $idx, $smooth;
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737 } else { 2881 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2882 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 } 2883 }
2740 Coro::cede; 2884
2885 cf::cede_to_tick;
2741 } 2886 }
2742 } 2887 }
2743 2888
2744 { 2889 {
2745 my $anims = $facedata->{animinfo}; 2890 my $anims = $facedata->{animinfo};
2746 2891
2747 while (my ($anim, $info) = each %$anims) { 2892 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2893 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede; 2894 cf::cede_to_tick;
2750 } 2895 }
2751 2896
2752 cf::anim::invalidate_all; # d'oh 2897 cf::anim::invalidate_all; # d'oh
2753 } 2898 }
2754 2899
2900 {
2901 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905
2906 my $soundconf = delete $res->{"res/sound.conf"};
2907
2908 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2915
2916 if ($info->{type} & 1) {
2917 # prepend meta info
2918
2919 my $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2921
2922 cf::face::set_data $idx, 0, $data, $chk;
2923 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2925 }
2926
2927 cf::face::set_type $idx, $info->{type};
2928
2929 cf::cede_to_tick;
2930 }
2931
2932 if ($soundconf) {
2933 $soundconf = $enc->decode (delete $soundconf->{data});
2934
2935 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2936 my $sound = $soundconf->{compat}[$_]
2937 or next;
2938
2939 my $face = cf::face::find "sound/$sound->[1]";
2940 cf::sound::set $sound->[0] => $face;
2941 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2942 }
2943
2944 while (my ($k, $v) = each %{$soundconf->{event}}) {
2945 my $face = cf::face::find "sound/$v";
2946 cf::sound::set $k => $face;
2947 }
2948 }
2949 }
2950
2755 1 2951 1
2756} 2952}
2953
2954register_exticmd fx_want => sub {
2955 my ($ns, $want) = @_;
2956
2957 while (my ($k, $v) = each %$want) {
2958 $ns->fx_want ($k, $v);
2959 }
2960};
2757 2961
2758sub reload_regions { 2962sub reload_regions {
2759 load_resource_file "$MAPDIR/regions" 2963 load_resource_file "$MAPDIR/regions"
2760 or die "unable to load regions file\n"; 2964 or die "unable to load regions file\n";
2965
2966 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/
2968 if exists $_->{match};
2969 }
2761} 2970}
2762 2971
2763sub reload_facedata { 2972sub reload_facedata {
2764 load_facedata "$DATADIR/facedata" 2973 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n"; 2974 or die "unable to load facedata\n";

Diff Legend

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