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.295 by root, Wed Jul 4 05:08:15 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.
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 472Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 473never block itself or use any form of Event handling.
411 474
412=cut 475=cut
413 476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
414sub fork_call(&@) { 486sub fork_call(&@) {
415 my ($cb, @args) = @_; 487 my ($cb, @args) = @_;
416 488
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
418# or die "socketpair: $!"; 490# or die "socketpair: $!";
… …
421 493
422 if (my $pid = fork) { 494 if (my $pid = fork) {
423 close $fh2; 495 close $fh2;
424 496
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
426 $res = Coro::Storable::thaw $res; 499 $res = Coro::Storable::thaw $res;
427 500
428 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
429 502
430 die $$res unless "ARRAY" eq ref $res; 503 Carp::confess $$res unless "ARRAY" eq ref $res;
431 504
432 return wantarray ? @$res : $res->[-1]; 505 return wantarray ? @$res : $res->[-1];
433 } else { 506 } else {
434 reset_signals; 507 reset_signals;
435 local $SIG{__WARN__}; 508 local $SIG{__WARN__};
436 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
437 eval { 516 eval {
438 close $fh1; 517 close $fh1;
439 518
440 my @res = eval { $cb->(@args) }; 519 my @res = eval { $cb->(@args) };
520
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
442 }; 523 };
443 524
444 warn $@ if $@; 525 warn $@ if $@;
445 _exit 0; 526 _exit 0;
446 } 527 }
… …
847 "; 928 ";
848 die if $@; 929 die if $@;
849} 930}
850 931
851our $override; 932our $override;
852our @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?
853 934
854sub override { 935sub override {
855 $override = 1; 936 $override = 1;
856 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
857} 938}
858 939
859sub do_invoke { 940sub do_invoke {
860 my $event = shift; 941 my $event = shift;
861 my $callbacks = shift; 942 my $callbacks = shift;
862 943
863 @invoke_results = (); 944 @INVOKE_RESULTS = ();
864 945
865 local $override; 946 local $override;
866 947
867 for (@$callbacks) { 948 for (@$callbacks) {
868 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
885 966
886Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
887 968
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 972
892=back 973=back
893 974
894=cut 975=cut
895 976
896############################################################################# 977#############################################################################
897# 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}
898 990
899sub reattach { 991sub reattach {
900 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 993 my ($obj) = @_;
902 994
… …
1089 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1090 1182
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1184
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
1096 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
1097 } 1195 if $reply;
1098 } 1196 }
1099 } else { 1197 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1199 }
1102 1200
… …
1272 $self->{deny_save} = 1; 1370 $self->{deny_save} = 1;
1273 1371
1274 $cf::PLAYER{$login} = $self; 1372 $cf::PLAYER{$login} = $self;
1275 1373
1276 $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 (@_);
1277} 1385}
1278 1386
1279=item $pl->quit_character 1387=item $pl->quit_character
1280 1388
1281Nukes the player without looking back. If logged in, the connection will 1389Nukes the player without looking back. If logged in, the connection will
… …
1425sub hintmode { 1533sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1; 1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode} 1535 $_[0]{hintmode}
1428} 1536}
1429 1537
1430=item $player->ext_reply ($msgid, %msg) 1538=item $player->ext_reply ($msgid, @msg)
1431 1539
1432Sends an ext reply to the player. 1540Sends an ext reply to the player.
1433 1541
1434=cut 1542=cut
1435 1543
1436sub ext_reply($$%) { 1544sub ext_reply($$@) {
1437 my ($self, $id, %msg) = @_; 1545 my ($self, $id, @msg) = @_;
1438 1546
1439 $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;
1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1441} 1554}
1442 1555
1443=item $player->ext_event ($type, %msg) 1556=item $player->ext_msg ($type, @msg)
1444 1557
1445Sends an ext event to the client. 1558Sends an ext event to the client.
1446 1559
1447=cut 1560=cut
1448 1561
1449sub ext_event($$%) { 1562sub ext_msg($$@) {
1450 my ($self, $type, %msg) = @_; 1563 my ($self, $type, @msg) = @_;
1451 1564
1452 $self->ns->ext_event ($type, %msg); 1565 $self->ns->ext_msg ($type, @msg);
1453} 1566}
1454 1567
1455=head3 cf::region 1568=head3 cf::region
1456 1569
1457=over 4 1570=over 4
… …
1470 my ($path) = @_; 1583 my ($path) = @_;
1471 1584
1472 my ($match, $specificity); 1585 my ($match, $specificity);
1473 1586
1474 for my $region (list) { 1587 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1588 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1589 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1590 if $region->specificity > $specificity;
1478 } 1591 }
1479 } 1592 }
1480 1593
… …
1600 $self->init; # pass $1 etc. 1713 $self->init; # pass $1 etc.
1601 return $self; 1714 return $self;
1602 } 1715 }
1603 } 1716 }
1604 1717
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1718 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1719 ()
1607} 1720}
1608 1721
1609sub init { 1722sub init {
1610 my ($self) = @_; 1723 my ($self) = @_;
… …
1818 $self->set_darkness_map; 1931 $self->set_darkness_map;
1819 Coro::cede; 1932 Coro::cede;
1820 $self->activate; 1933 $self->activate;
1821 } 1934 }
1822 1935
1936 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME);
1938
1823 $self->in_memory (cf::MAP_IN_MEMORY); 1939 $self->in_memory (cf::MAP_IN_MEMORY);
1824 } 1940 }
1825 1941
1826 $self->post_load; 1942 $self->post_load;
1827} 1943}
… …
1888 2004
1889 undef $MAP_PREFETCH{$path}; 2005 undef $MAP_PREFETCH{$path};
1890 $MAP_PREFETCHER ||= cf::async { 2006 $MAP_PREFETCHER ||= cf::async {
1891 while (%MAP_PREFETCH) { 2007 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 2008 for my $path (keys %MAP_PREFETCH) {
1893 my $map = find $path 2009 if (my $map = find $path) {
1894 or next;
1895 $map->load; 2010 $map->load;
2011 }
1896 2012
1897 delete $MAP_PREFETCH{$path}; 2013 delete $MAP_PREFETCH{$path};
1898 } 2014 }
1899 } 2015 }
1900 undef $MAP_PREFETCHER; 2016 undef $MAP_PREFETCHER;
… …
2127 2243
2128 } else { 2244 } else {
2129 my $pl = $self->contr; 2245 my $pl = $self->contr;
2130 2246
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2247 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2248 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2249 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139 2250
2140 } else { 2251 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2252 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2253 $self->message ($msg, $flags);
2143 } 2254 }
2144 } 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 (@_);
2145} 2266}
2146 2267
2147=item $player_object->may ("access") 2268=item $player_object->may ("access")
2148 2269
2149Returns wether the given player is authorized to access resource "access" 2270Returns wether the given player is authorized to access resource "access"
… …
2237 2358
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2360 $self->enter_map ($map, $x, $y);
2240} 2361}
2241 2362
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2363=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2364
2244Moves 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
2245her, loading and preparing them map, calling the provided $check callback 2366her, loading and preparing them map, calling the provided $check callback
2246that 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
2247the 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.
2248 2370
2249=cut 2371=cut
2250 2372
2251our $GOTOGEN; 2373our $GOTOGEN;
2252 2374
2253sub cf::object::player::goto { 2375sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2376 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2377
2256 # 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
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2380
2259 $self->enter_link; 2381 $self->enter_link;
… …
2279 2401
2280 if ($gen == $self->{_goto_generation}) { 2402 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2403 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2404 $self->leave_link ($map, $x, $y);
2283 } 2405 }
2406
2407 $done->() if $done;
2284 })->prio (1); 2408 })->prio (1);
2285} 2409}
2286 2410
2287=item $player_object->enter_exit ($exit_object) 2411=item $player_object->enter_exit ($exit_object)
2288 2412
… …
2357 my $hp = $exit->stats->hp; 2481 my $hp = $exit->stats->hp;
2358 my $sp = $exit->stats->sp; 2482 my $sp = $exit->stats->sp;
2359 2483
2360 $self->enter_link; 2484 $self->enter_link;
2361 2485
2486 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED);
2489
2362 (async { 2490 (async {
2363 $self->deactivate_recursive; # just to be sure 2491 $self->deactivate_recursive; # just to be sure
2364 unless (eval { 2492 unless (eval {
2365 $self->goto ($slaying, $hp, $sp); 2493 $self->goto ($slaying, $hp, $sp);
2366 2494
… …
2393 2521
2394 utf8::encode $text; 2522 utf8::encode $text;
2395 $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);
2396} 2524}
2397 2525
2398=item $client->send_msg ($color, $type, $msg, [extra...]) 2526=item $client->send_msg ($channel, $msg, $color, [extra...])
2399 2527
2400Send 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
2401client 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
2402the 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
2403the message unless the client supports the msg packet. 2531the message unless the client supports the msg packet.
2404 2532
2405=cut 2533=cut
2406 2534
2407sub cf::client::send_msg { 2535sub cf::client::send_msg {
2408 my ($self, $color, $type, $msg, @extra) = @_; 2536 my ($self, $channel, $msg, $color, @extra) = @_;
2409 2537
2410 $msg = $self->pl->expand_cfpod ($msg); 2538 $msg = $self->pl->expand_cfpod ($msg);
2411 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
2412 return unless @extra || length $msg; 2552 return unless @extra || length $msg;
2413 2553
2414 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
2415 $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]));
2416 } else { 2561 } else {
2417 # replace some tags by gcfclient-compatible ones
2418 for ($msg) {
2419 1 while
2420 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2421 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2422 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2423 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2424 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2425 }
2426
2427 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
2428 if (0 && $msg =~ /\[/) { 2577 if (0 && $msg =~ /\[/) {
2429 $self->send_packet ("drawextinfo $color 4 0 $msg") 2578 $self->send_packet ("drawextinfo $color 4 0 $msg")
2430 } else { 2579 } else {
2431 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2432 $self->send_packet ("drawinfo $color $msg") 2581 $self->send_packet ("drawinfo $color $msg")
2433 } 2582 }
2434 } 2583 }
2435 } 2584 }
2436} 2585}
2437 2586
2438=item $client->ext_event ($type, %msg) 2587=item $client->ext_msg ($type, @msg)
2439 2588
2440Sends an ext event to the client. 2589Sends an ext event to the client.
2441 2590
2442=cut 2591=cut
2443 2592
2444sub cf::client::ext_event($$%) { 2593sub cf::client::ext_msg($$@) {
2445 my ($self, $type, %msg) = @_; 2594 my ($self, $type, @msg) = @_;
2446 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
2447 $msg{msgtype} = "event_$type"; 2601 push @msg, msgtype => "event_$type";
2448 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 }
2449} 2604}
2450 2605
2451=item $success = $client->query ($flags, "text", \&cb) 2606=item $success = $client->query ($flags, "text", \&cb)
2452 2607
2453Queues a query to the client, calling the given callback with 2608Queues a query to the client, calling the given callback with
… …
2508 my ($ns, $buf) = @_; 2663 my ($ns, $buf) = @_;
2509 2664
2510 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2665 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2511 2666
2512 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
2513 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2673 if (my $cb = $EXTICMD{$type}) {
2514 if (my %reply = $cb->($ns, $msg)) { 2674 my @reply = $cb->($ns, @payload);
2515 $reply{msgid} = $msg->{msgid}; 2675
2516 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2676 $ns->ext_reply ($reply, @reply)
2517 } 2677 if $reply;
2518 } 2678 }
2519 } else { 2679 } else {
2520 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";
2521 } 2681 }
2522 2682
… …
2570our $safe = new Safe "safe"; 2730our $safe = new Safe "safe";
2571our $safe_hole = new Safe::Hole; 2731our $safe_hole = new Safe::Hole;
2572 2732
2573$SIG{FPE} = 'IGNORE'; 2733$SIG{FPE} = 'IGNORE';
2574 2734
2575$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));
2576 2740
2577# here we export the classes and methods available to script code 2741# here we export the classes and methods available to script code
2578 2742
2579=pod 2743=pod
2580 2744
2581The following functions and methods are available within a safe environment: 2745The following functions and methods are available within a safe environment:
2582 2746
2583 cf::object contr pay_amount pay_player map 2747 cf::object
2748 contr pay_amount pay_player map x y force_find force_add
2749 insert remove
2750
2584 cf::object::player player 2751 cf::object::player
2585 cf::player peaceful 2752 player
2586 cf::map trigger 2753
2754 cf::player
2755 peaceful
2756
2757 cf::map
2758 trigger
2587 2759
2588=cut 2760=cut
2589 2761
2590for ( 2762for (
2591 ["cf::object" => qw(contr pay_amount pay_player map)], 2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764 insert remove inv)],
2592 ["cf::object::player" => qw(player)], 2765 ["cf::object::player" => qw(player)],
2593 ["cf::player" => qw(peaceful)], 2766 ["cf::player" => qw(peaceful)],
2594 ["cf::map" => qw(trigger)], 2767 ["cf::map" => qw(trigger)],
2595) { 2768) {
2596 no strict 'refs'; 2769 no strict 'refs';
… …
2688 { 2861 {
2689 my $faces = $facedata->{faceinfo}; 2862 my $faces = $facedata->{faceinfo};
2690 2863
2691 while (my ($face, $info) = each %$faces) { 2864 while (my ($face, $info) = each %$faces) {
2692 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2865 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2693 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2866 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap};
2694 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2695 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2696 Coro::cede; 2870
2871 cf::cede_to_tick;
2697 } 2872 }
2698 2873
2699 while (my ($face, $info) = each %$faces) { 2874 while (my ($face, $info) = each %$faces) {
2700 next unless $info->{smooth}; 2875 next unless $info->{smooth};
2701 my $idx = cf::face::find $face 2876 my $idx = cf::face::find $face
2702 or next; 2877 or next;
2703 if (my $smooth = cf::face::find $info->{smooth}) { 2878 if (my $smooth = cf::face::find $info->{smooth}) {
2879 cf::face::set_smooth $idx, $smooth;
2704 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2705 } else { 2881 } else {
2706 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2882 warn "smooth face '$info->{smooth}' not found for face '$face'";
2707 } 2883 }
2708 Coro::cede; 2884
2885 cf::cede_to_tick;
2709 } 2886 }
2710 } 2887 }
2711 2888
2712 { 2889 {
2713 my $anims = $facedata->{animinfo}; 2890 my $anims = $facedata->{animinfo};
2714 2891
2715 while (my ($anim, $info) = each %$anims) { 2892 while (my ($anim, $info) = each %$anims) {
2716 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2893 cf::anim::set $anim, $info->{frames}, $info->{facings};
2717 Coro::cede; 2894 cf::cede_to_tick;
2718 } 2895 }
2719 2896
2720 cf::anim::invalidate_all; # d'oh 2897 cf::anim::invalidate_all; # d'oh
2721 } 2898 }
2722 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
2723 1 2951 1
2724} 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};
2725 2961
2726sub reload_regions { 2962sub reload_regions {
2727 load_resource_file "$MAPDIR/regions" 2963 load_resource_file "$MAPDIR/regions"
2728 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 }
2729} 2970}
2730 2971
2731sub reload_facedata { 2972sub reload_facedata {
2732 load_facedata "$DATADIR/facedata" 2973 load_facedata "$DATADIR/facedata"
2733 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