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.332 by root, Sat Aug 18 17:33:53 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS 1.4 ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
166 168
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These 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 170returns 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. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
170 178
171=back 179=back
172 180
173=cut 181=cut
174 182
… …
315 }; 323 };
316 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
317 $guard 325 $guard
318} 326}
319 327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
382}
383
320=item cf::async { BLOCK } 384=item cf::async { BLOCK }
321 385
322Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
323C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 387C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
… …
412=cut 476=cut
413 477
414sub fork_call(&@) { 478sub fork_call(&@) {
415 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
416 480
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
420 or die "pipe: $!";
421 484
422 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 486 reset_signals;
435 local $SIG{__WARN__}; 487 &$cb
436 local $SIG{__DIE__}; 488 }, @args;
437 eval {
438 close $fh1;
439 489
440 my @res = eval { $cb->(@args) }; 490 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 491}
448 492
449=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
450 494
451Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
847 "; 891 ";
848 die if $@; 892 die if $@;
849} 893}
850 894
851our $override; 895our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 897
854sub override { 898sub override {
855 $override = 1; 899 $override = 1;
856 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
857} 901}
858 902
859sub do_invoke { 903sub do_invoke {
860 my $event = shift; 904 my $event = shift;
861 my $callbacks = shift; 905 my $callbacks = shift;
862 906
863 @invoke_results = (); 907 @INVOKE_RESULTS = ();
864 908
865 local $override; 909 local $override;
866 910
867 for (@$callbacks) { 911 for (@$callbacks) {
868 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
885 929
886Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
887 931
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This 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 933removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 935
892=back 936=back
893 937
894=cut 938=cut
895 939
896############################################################################# 940#############################################################################
897# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
898 953
899sub reattach { 954sub reattach {
900 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 956 my ($obj) = @_;
902 957
… …
1089 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1090 1145
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1147
1093 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1096 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1097 } 1158 if $reply;
1098 } 1159 }
1099 } else { 1160 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1162 }
1102 1163
… …
1272 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1273 1334
1274 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1275 1336
1276 $self 1337 $self
1338}
1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1277} 1348}
1278 1349
1279=item $pl->quit_character 1350=item $pl->quit_character
1280 1351
1281Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1412 1483
1413 # create single paragraphs (very hackish) 1484 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1485 s/(?<=\S)\n(?=\w)/ /g;
1415 1486
1416 # compress some whitespace 1487 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1418 1492
1419 $_ 1493 $_
1420} 1494}
1421 1495
1422sub hintmode { 1496sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1; 1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode} 1498 $_[0]{hintmode}
1425} 1499}
1426 1500
1427=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1428 1502
1429Sends an ext reply to the player. 1503Sends an ext reply to the player.
1430 1504
1431=cut 1505=cut
1432 1506
1433sub ext_reply($$%) { 1507sub ext_reply($$@) {
1434 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1435 1509
1436 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1438} 1517}
1439 1518
1440=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1441 1520
1442Sends an ext event to the client. 1521Sends an ext event to the client.
1443 1522
1444=cut 1523=cut
1445 1524
1446sub ext_event($$%) { 1525sub ext_msg($$@) {
1447 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1448 1527
1449 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1450} 1529}
1451 1530
1452=head3 cf::region 1531=head3 cf::region
1453 1532
1454=over 4 1533=over 4
… …
1467 my ($path) = @_; 1546 my ($path) = @_;
1468 1547
1469 my ($match, $specificity); 1548 my ($match, $specificity);
1470 1549
1471 for my $region (list) { 1550 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1475 } 1554 }
1476 } 1555 }
1477 1556
… …
1597 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1598 return $self; 1677 return $self;
1599 } 1678 }
1600 } 1679 }
1601 1680
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1682 ()
1604} 1683}
1605 1684
1606sub init { 1685sub init {
1607 my ($self) = @_; 1686 my ($self) = @_;
… …
1815 $self->set_darkness_map; 1894 $self->set_darkness_map;
1816 Coro::cede; 1895 Coro::cede;
1817 $self->activate; 1896 $self->activate;
1818 } 1897 }
1819 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1820 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1821 } 1903 }
1822 1904
1823 $self->post_load; 1905 $self->post_load;
1824} 1906}
… …
1885 1967
1886 undef $MAP_PREFETCH{$path}; 1968 undef $MAP_PREFETCH{$path};
1887 $MAP_PREFETCHER ||= cf::async { 1969 $MAP_PREFETCHER ||= cf::async {
1888 while (%MAP_PREFETCH) { 1970 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 1971 for my $path (keys %MAP_PREFETCH) {
1890 my $map = find $path 1972 if (my $map = find $path) {
1891 or next;
1892 $map->load; 1973 $map->load;
1974 }
1893 1975
1894 delete $MAP_PREFETCH{$path}; 1976 delete $MAP_PREFETCH{$path};
1895 } 1977 }
1896 } 1978 }
1897 undef $MAP_PREFETCHER; 1979 undef $MAP_PREFETCHER;
… …
2124 2206
2125 } else { 2207 } else {
2126 my $pl = $self->contr; 2208 my $pl = $self->contr;
2127 2209
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2210 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog}; 2211 my $dialog = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply ( 2212 $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 2213
2137 } else { 2214 } else {
2138 $msg = $npc->name . " says: $msg" if $npc; 2215 $msg = $npc->name . " says: $msg" if $npc;
2139 $self->message ($msg, $flags); 2216 $self->message ($msg, $flags);
2140 } 2217 }
2141 } 2218 }
2219}
2220
2221=item $object->send_msg ($channel, $msg, $color, [extra...])
2222
2223=cut
2224
2225sub cf::object::send_msg {
2226 my $pl = shift->contr
2227 or return;
2228 $pl->send_msg (@_);
2142} 2229}
2143 2230
2144=item $player_object->may ("access") 2231=item $player_object->may ("access")
2145 2232
2146Returns wether the given player is authorized to access resource "access" 2233Returns wether the given player is authorized to access resource "access"
… …
2234 2321
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2323 $self->enter_map ($map, $x, $y);
2237} 2324}
2238 2325
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2326=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2327
2241Moves the player to the given map-path and coordinates by first freezing 2328Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback 2329her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on 2330that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position. 2331the new (success) or old (failed) map position. In either case, $done will
2332be called at the end of this process.
2245 2333
2246=cut 2334=cut
2247 2335
2248our $GOTOGEN; 2336our $GOTOGEN;
2249 2337
2250sub cf::object::player::goto { 2338sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2339 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2340
2253 # do generation counting so two concurrent goto's will be executed in-order 2341 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2343
2256 $self->enter_link; 2344 $self->enter_link;
… …
2276 2364
2277 if ($gen == $self->{_goto_generation}) { 2365 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2366 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2367 $self->leave_link ($map, $x, $y);
2280 } 2368 }
2369
2370 $done->() if $done;
2281 })->prio (1); 2371 })->prio (1);
2282} 2372}
2283 2373
2284=item $player_object->enter_exit ($exit_object) 2374=item $player_object->enter_exit ($exit_object)
2285 2375
… …
2354 my $hp = $exit->stats->hp; 2444 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp; 2445 my $sp = $exit->stats->sp;
2356 2446
2357 $self->enter_link; 2447 $self->enter_link;
2358 2448
2449 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED);
2452
2359 (async { 2453 (async {
2360 $self->deactivate_recursive; # just to be sure 2454 $self->deactivate_recursive; # just to be sure
2361 unless (eval { 2455 unless (eval {
2362 $self->goto ($slaying, $hp, $sp); 2456 $self->goto ($slaying, $hp, $sp);
2363 2457
… …
2390 2484
2391 utf8::encode $text; 2485 utf8::encode $text;
2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2486 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393} 2487}
2394 2488
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2489=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2490
2397Send a drawinfo or msg packet to the client, formatting the msg for the 2491Send 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 2492client 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 2493the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet. 2494the message unless the client supports the msg packet.
2401 2495
2402=cut 2496=cut
2403 2497
2404sub cf::client::send_msg { 2498sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2499 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2500
2407 $msg = $self->pl->expand_cfpod ($msg); 2501 $msg = $self->pl->expand_cfpod ($msg);
2408 2502
2503 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504
2505 if (ref $channel) {
2506 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel);
2510 }
2511
2512 $channel = $channel->{id};
2513 }
2514
2515 return unless @extra || length $msg;
2516
2409 if ($self->can_msg) { 2517 if ($self->can_msg) {
2518 # default colour, mask it out
2519 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2520 if $color & cf::NDI_DEF;
2521
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2522 $self->send_packet ("msg " . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2411 } else { 2524 } 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) { 2525 if ($color >= 0) {
2526 # replace some tags by gcfclient-compatible ones
2527 for ($msg) {
2528 1 while
2529 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2530 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2531 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2532 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2533 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2534 }
2535
2536 $color &= cf::NDI_COLOR_MASK;
2537
2538 utf8::encode $msg;
2539
2423 if (0 && $msg =~ /\[/) { 2540 if (0 && $msg =~ /\[/) {
2541 # COMMAND/INFO
2424 $self->send_packet ("drawextinfo $color 4 0 $msg") 2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2425 } else { 2543 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg") 2545 $self->send_packet ("drawinfo $color $msg")
2428 } 2546 }
2429 } 2547 }
2430 } 2548 }
2431} 2549}
2432 2550
2433=item $client->ext_event ($type, %msg) 2551=item $client->ext_msg ($type, @msg)
2434 2552
2435Sends an ext event to the client. 2553Sends an ext event to the client.
2436 2554
2437=cut 2555=cut
2438 2556
2439sub cf::client::ext_event($$%) { 2557sub cf::client::ext_msg($$@) {
2440 my ($self, $type, %msg) = @_; 2558 my ($self, $type, @msg) = @_;
2441 2559
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove
2442 $msg{msgtype} = "event_$type"; 2565 push @msg, msgtype => "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 }
2444} 2568}
2445 2569
2446=item $success = $client->query ($flags, "text", \&cb) 2570=item $success = $client->query ($flags, "text", \&cb)
2447 2571
2448Queues a query to the client, calling the given callback with 2572Queues a query to the client, calling the given callback with
… …
2503 my ($ns, $buf) = @_; 2627 my ($ns, $buf) = @_;
2504 2628
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2629 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506 2630
2507 if (ref $msg) { 2631 if (ref $msg) {
2632 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg
2634 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2637 if (my $cb = $EXTICMD{$type}) {
2509 if (my %reply = $cb->($ns, $msg)) { 2638 my @reply = $cb->($ns, @payload);
2510 $reply{msgid} = $msg->{msgid}; 2639
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2640 $ns->ext_reply ($reply, @reply)
2512 } 2641 if $reply;
2513 } 2642 }
2514 } else { 2643 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 } 2645 }
2517 2646
… …
2565our $safe = new Safe "safe"; 2694our $safe = new Safe "safe";
2566our $safe_hole = new Safe::Hole; 2695our $safe_hole = new Safe::Hole;
2567 2696
2568$SIG{FPE} = 'IGNORE'; 2697$SIG{FPE} = 'IGNORE';
2569 2698
2570$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2699$safe->permit_only (Opcode::opset qw(
2700 :base_core :base_mem :base_orig :base_math
2701 grepstart grepwhile mapstart mapwhile
2702 sort time
2703));
2571 2704
2572# here we export the classes and methods available to script code 2705# here we export the classes and methods available to script code
2573 2706
2574=pod 2707=pod
2575 2708
2576The following functions and methods are available within a safe environment: 2709The following functions and methods are available within a safe environment:
2577 2710
2578 cf::object contr pay_amount pay_player map 2711 cf::object
2712 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race
2714
2579 cf::object::player player 2715 cf::object::player
2580 cf::player peaceful 2716 player
2581 cf::map trigger 2717
2718 cf::player
2719 peaceful
2720
2721 cf::map
2722 trigger
2582 2723
2583=cut 2724=cut
2584 2725
2585for ( 2726for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)],
2587 ["cf::object::player" => qw(player)], 2729 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 2730 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 2731 ["cf::map" => qw(trigger)],
2590) { 2732) {
2591 no strict 'refs'; 2733 no strict 'refs';
… …
2683 { 2825 {
2684 my $faces = $facedata->{faceinfo}; 2826 my $faces = $facedata->{faceinfo};
2685 2827
2686 while (my ($face, $info) = each %$faces) { 2828 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2829 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2830 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2691 Coro::cede; 2834
2835 cf::cede_to_tick;
2692 } 2836 }
2693 2837
2694 while (my ($face, $info) = each %$faces) { 2838 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 2839 next unless $info->{smooth};
2696 my $idx = cf::face::find $face 2840 my $idx = cf::face::find $face
2697 or next; 2841 or next;
2698 if (my $smooth = cf::face::find $info->{smooth}) { 2842 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 2845 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2846 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 2847 }
2703 Coro::cede; 2848
2849 cf::cede_to_tick;
2704 } 2850 }
2705 } 2851 }
2706 2852
2707 { 2853 {
2708 my $anims = $facedata->{animinfo}; 2854 my $anims = $facedata->{animinfo};
2709 2855
2710 while (my ($anim, $info) = each %$anims) { 2856 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2857 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 2858 cf::cede_to_tick;
2713 } 2859 }
2714 2860
2715 cf::anim::invalidate_all; # d'oh 2861 cf::anim::invalidate_all; # d'oh
2716 } 2862 }
2717 2863
2864 {
2865 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871
2872 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2879
2880 if ($info->{type} & 1) {
2881 # prepend meta info
2882
2883 my $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2889 }
2890
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick;
2894 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 }
2914
2718 1 2915 1
2719} 2916}
2917
2918register_exticmd fx_want => sub {
2919 my ($ns, $want) = @_;
2920
2921 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v);
2923 }
2924};
2720 2925
2721sub reload_regions { 2926sub reload_regions {
2722 load_resource_file "$MAPDIR/regions" 2927 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 2928 or die "unable to load regions file\n";
2929
2930 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/
2932 if exists $_->{match};
2933 }
2724} 2934}
2725 2935
2726sub reload_facedata { 2936sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 2937 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 2938 or die "unable to load facedata\n";

Diff Legend

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