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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.331 by root, Mon Aug 13 13:10:01 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
… …
1412 1520
1413 # create single paragraphs (very hackish) 1521 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1522 s/(?<=\S)\n(?=\w)/ /g;
1415 1523
1416 # compress some whitespace 1524 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1525 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines
1418 1529
1419 $_ 1530 $_
1420} 1531}
1421 1532
1422sub hintmode { 1533sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1; 1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode} 1535 $_[0]{hintmode}
1425} 1536}
1426 1537
1427=item $player->ext_reply ($msgid, %msg) 1538=item $player->ext_reply ($msgid, @msg)
1428 1539
1429Sends an ext reply to the player. 1540Sends an ext reply to the player.
1430 1541
1431=cut 1542=cut
1432 1543
1433sub ext_reply($$%) { 1544sub ext_reply($$@) {
1434 my ($self, $id, %msg) = @_; 1545 my ($self, $id, @msg) = @_;
1435 1546
1436 $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;
1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1438} 1554}
1439 1555
1440=item $player->ext_event ($type, %msg) 1556=item $player->ext_msg ($type, @msg)
1441 1557
1442Sends an ext event to the client. 1558Sends an ext event to the client.
1443 1559
1444=cut 1560=cut
1445 1561
1446sub ext_event($$%) { 1562sub ext_msg($$@) {
1447 my ($self, $type, %msg) = @_; 1563 my ($self, $type, @msg) = @_;
1448 1564
1449 $self->ns->ext_event ($type, %msg); 1565 $self->ns->ext_msg ($type, @msg);
1450} 1566}
1451 1567
1452=head3 cf::region 1568=head3 cf::region
1453 1569
1454=over 4 1570=over 4
… …
1467 my ($path) = @_; 1583 my ($path) = @_;
1468 1584
1469 my ($match, $specificity); 1585 my ($match, $specificity);
1470 1586
1471 for my $region (list) { 1587 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1588 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1589 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1590 if $region->specificity > $specificity;
1475 } 1591 }
1476 } 1592 }
1477 1593
… …
1597 $self->init; # pass $1 etc. 1713 $self->init; # pass $1 etc.
1598 return $self; 1714 return $self;
1599 } 1715 }
1600 } 1716 }
1601 1717
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1718 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1719 ()
1604} 1720}
1605 1721
1606sub init { 1722sub init {
1607 my ($self) = @_; 1723 my ($self) = @_;
… …
1815 $self->set_darkness_map; 1931 $self->set_darkness_map;
1816 Coro::cede; 1932 Coro::cede;
1817 $self->activate; 1933 $self->activate;
1818 } 1934 }
1819 1935
1936 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME);
1938
1820 $self->in_memory (cf::MAP_IN_MEMORY); 1939 $self->in_memory (cf::MAP_IN_MEMORY);
1821 } 1940 }
1822 1941
1823 $self->post_load; 1942 $self->post_load;
1824} 1943}
… …
1885 2004
1886 undef $MAP_PREFETCH{$path}; 2005 undef $MAP_PREFETCH{$path};
1887 $MAP_PREFETCHER ||= cf::async { 2006 $MAP_PREFETCHER ||= cf::async {
1888 while (%MAP_PREFETCH) { 2007 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 2008 for my $path (keys %MAP_PREFETCH) {
1890 my $map = find $path 2009 if (my $map = find $path) {
1891 or next;
1892 $map->load; 2010 $map->load;
2011 }
1893 2012
1894 delete $MAP_PREFETCH{$path}; 2013 delete $MAP_PREFETCH{$path};
1895 } 2014 }
1896 } 2015 }
1897 undef $MAP_PREFETCHER; 2016 undef $MAP_PREFETCHER;
… …
2124 2243
2125 } else { 2244 } else {
2126 my $pl = $self->contr; 2245 my $pl = $self->contr;
2127 2246
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2247 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog}; 2248 my $dialog = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply ( 2249 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2135 );
2136 2250
2137 } else { 2251 } else {
2138 $msg = $npc->name . " says: $msg" if $npc; 2252 $msg = $npc->name . " says: $msg" if $npc;
2139 $self->message ($msg, $flags); 2253 $self->message ($msg, $flags);
2140 } 2254 }
2141 } 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 (@_);
2142} 2266}
2143 2267
2144=item $player_object->may ("access") 2268=item $player_object->may ("access")
2145 2269
2146Returns wether the given player is authorized to access resource "access" 2270Returns wether the given player is authorized to access resource "access"
… …
2234 2358
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2360 $self->enter_map ($map, $x, $y);
2237} 2361}
2238 2362
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2363=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2364
2241Moves 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
2242her, loading and preparing them map, calling the provided $check callback 2366her, loading and preparing them map, calling the provided $check callback
2243that 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
2244the 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.
2245 2370
2246=cut 2371=cut
2247 2372
2248our $GOTOGEN; 2373our $GOTOGEN;
2249 2374
2250sub cf::object::player::goto { 2375sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2376 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2377
2253 # 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
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2380
2256 $self->enter_link; 2381 $self->enter_link;
… …
2276 2401
2277 if ($gen == $self->{_goto_generation}) { 2402 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2403 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2404 $self->leave_link ($map, $x, $y);
2280 } 2405 }
2406
2407 $done->() if $done;
2281 })->prio (1); 2408 })->prio (1);
2282} 2409}
2283 2410
2284=item $player_object->enter_exit ($exit_object) 2411=item $player_object->enter_exit ($exit_object)
2285 2412
… …
2354 my $hp = $exit->stats->hp; 2481 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp; 2482 my $sp = $exit->stats->sp;
2356 2483
2357 $self->enter_link; 2484 $self->enter_link;
2358 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
2359 (async { 2490 (async {
2360 $self->deactivate_recursive; # just to be sure 2491 $self->deactivate_recursive; # just to be sure
2361 unless (eval { 2492 unless (eval {
2362 $self->goto ($slaying, $hp, $sp); 2493 $self->goto ($slaying, $hp, $sp);
2363 2494
… …
2390 2521
2391 utf8::encode $text; 2522 utf8::encode $text;
2392 $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);
2393} 2524}
2394 2525
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2526=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2527
2397Send 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
2398client 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
2399the 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
2400the message unless the client supports the msg packet. 2531the message unless the client supports the msg packet.
2401 2532
2402=cut 2533=cut
2403 2534
2404sub cf::client::send_msg { 2535sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2536 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2537
2407 $msg = $self->pl->expand_cfpod ($msg); 2538 $msg = $self->pl->expand_cfpod ($msg);
2408 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
2552 return unless @extra || length $msg;
2553
2409 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
2410 $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]));
2411 } else { 2561 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421
2422 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
2423 if (0 && $msg =~ /\[/) { 2577 if (0 && $msg =~ /\[/) {
2578 # COMMAND/INFO
2424 $self->send_packet ("drawextinfo $color 4 0 $msg") 2579 $self->send_packet ("drawextinfo $color 10 8 $msg")
2425 } else { 2580 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2581 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg") 2582 $self->send_packet ("drawinfo $color $msg")
2428 } 2583 }
2429 } 2584 }
2430 } 2585 }
2431} 2586}
2432 2587
2433=item $client->ext_event ($type, %msg) 2588=item $client->ext_msg ($type, @msg)
2434 2589
2435Sends an ext event to the client. 2590Sends an ext event to the client.
2436 2591
2437=cut 2592=cut
2438 2593
2439sub cf::client::ext_event($$%) { 2594sub cf::client::ext_msg($$@) {
2440 my ($self, $type, %msg) = @_; 2595 my ($self, $type, @msg) = @_;
2441 2596
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove
2442 $msg{msgtype} = "event_$type"; 2602 push @msg, msgtype => "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 }
2444} 2605}
2445 2606
2446=item $success = $client->query ($flags, "text", \&cb) 2607=item $success = $client->query ($flags, "text", \&cb)
2447 2608
2448Queues a query to the client, calling the given callback with 2609Queues a query to the client, calling the given callback with
… …
2503 my ($ns, $buf) = @_; 2664 my ($ns, $buf) = @_;
2504 2665
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2666 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506 2667
2507 if (ref $msg) { 2668 if (ref $msg) {
2669 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg
2671 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2674 if (my $cb = $EXTICMD{$type}) {
2509 if (my %reply = $cb->($ns, $msg)) { 2675 my @reply = $cb->($ns, @payload);
2510 $reply{msgid} = $msg->{msgid}; 2676
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2677 $ns->ext_reply ($reply, @reply)
2512 } 2678 if $reply;
2513 } 2679 }
2514 } else { 2680 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 } 2682 }
2517 2683
… …
2565our $safe = new Safe "safe"; 2731our $safe = new Safe "safe";
2566our $safe_hole = new Safe::Hole; 2732our $safe_hole = new Safe::Hole;
2567 2733
2568$SIG{FPE} = 'IGNORE'; 2734$SIG{FPE} = 'IGNORE';
2569 2735
2570$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2736$safe->permit_only (Opcode::opset qw(
2737 :base_core :base_mem :base_orig :base_math
2738 grepstart grepwhile mapstart mapwhile
2739 sort time
2740));
2571 2741
2572# here we export the classes and methods available to script code 2742# here we export the classes and methods available to script code
2573 2743
2574=pod 2744=pod
2575 2745
2576The following functions and methods are available within a safe environment: 2746The following functions and methods are available within a safe environment:
2577 2747
2578 cf::object contr pay_amount pay_player map 2748 cf::object
2749 contr pay_amount pay_player map x y force_find force_add
2750 insert remove name archname title slaying race
2751
2579 cf::object::player player 2752 cf::object::player
2580 cf::player peaceful 2753 player
2581 cf::map trigger 2754
2755 cf::player
2756 peaceful
2757
2758 cf::map
2759 trigger
2582 2760
2583=cut 2761=cut
2584 2762
2585for ( 2763for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)],
2587 ["cf::object::player" => qw(player)], 2766 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 2767 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 2768 ["cf::map" => qw(trigger)],
2590) { 2769) {
2591 no strict 'refs'; 2770 no strict 'refs';
… …
2683 { 2862 {
2684 my $faces = $facedata->{faceinfo}; 2863 my $faces = $facedata->{faceinfo};
2685 2864
2686 while (my ($face, $info) = each %$faces) { 2865 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2866 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2867 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2691 Coro::cede; 2871
2872 cf::cede_to_tick;
2692 } 2873 }
2693 2874
2694 while (my ($face, $info) = each %$faces) { 2875 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 2876 next unless $info->{smooth};
2696 my $idx = cf::face::find $face 2877 my $idx = cf::face::find $face
2697 or next; 2878 or next;
2698 if (my $smooth = cf::face::find $info->{smooth}) { 2879 if (my $smooth = cf::face::find $info->{smooth}) {
2880 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2881 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 2882 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2883 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 2884 }
2703 Coro::cede; 2885
2886 cf::cede_to_tick;
2704 } 2887 }
2705 } 2888 }
2706 2889
2707 { 2890 {
2708 my $anims = $facedata->{animinfo}; 2891 my $anims = $facedata->{animinfo};
2709 2892
2710 while (my ($anim, $info) = each %$anims) { 2893 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2894 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 2895 cf::cede_to_tick;
2713 } 2896 }
2714 2897
2715 cf::anim::invalidate_all; # d'oh 2898 cf::anim::invalidate_all; # d'oh
2716 } 2899 }
2717 2900
2901 {
2902 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906
2907 my $soundconf = delete $res->{"res/sound.conf"};
2908
2909 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2916
2917 if ($info->{type} & 1) {
2918 # prepend meta info
2919
2920 my $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2926 }
2927
2928 cf::face::set_type $idx, $info->{type};
2929
2930 cf::cede_to_tick;
2931 }
2932
2933 if ($soundconf) {
2934 $soundconf = $enc->decode (delete $soundconf->{data});
2935
2936 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2937 my $sound = $soundconf->{compat}[$_]
2938 or next;
2939
2940 my $face = cf::face::find "sound/$sound->[1]";
2941 cf::sound::set $sound->[0] => $face;
2942 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2943 }
2944
2945 while (my ($k, $v) = each %{$soundconf->{event}}) {
2946 my $face = cf::face::find "sound/$v";
2947 cf::sound::set $k => $face;
2948 }
2949 }
2950 }
2951
2718 1 2952 1
2719} 2953}
2954
2955register_exticmd fx_want => sub {
2956 my ($ns, $want) = @_;
2957
2958 while (my ($k, $v) = each %$want) {
2959 $ns->fx_want ($k, $v);
2960 }
2961};
2720 2962
2721sub reload_regions { 2963sub reload_regions {
2722 load_resource_file "$MAPDIR/regions" 2964 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 2965 or die "unable to load regions file\n";
2966
2967 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/
2969 if exists $_->{match};
2970 }
2724} 2971}
2725 2972
2726sub reload_facedata { 2973sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 2974 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 2975 or die "unable to load facedata\n";

Diff Legend

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