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.297 by root, Thu Jul 5 08:10:30 2007 UTC vs.
Revision 1.333 by root, Sun Aug 19 09:14:50 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
… …
1425sub hintmode { 1496sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1; 1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode} 1498 $_[0]{hintmode}
1428} 1499}
1429 1500
1430=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1431 1502
1432Sends an ext reply to the player. 1503Sends an ext reply to the player.
1433 1504
1434=cut 1505=cut
1435 1506
1436sub ext_reply($$%) { 1507sub ext_reply($$@) {
1437 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1438 1509
1439 $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;
1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1441} 1517}
1442 1518
1443=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1444 1520
1445Sends an ext event to the client. 1521Sends an ext event to the client.
1446 1522
1447=cut 1523=cut
1448 1524
1449sub ext_event($$%) { 1525sub ext_msg($$@) {
1450 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1451 1527
1452 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1453} 1529}
1454 1530
1455=head3 cf::region 1531=head3 cf::region
1456 1532
1457=over 4 1533=over 4
… …
1470 my ($path) = @_; 1546 my ($path) = @_;
1471 1547
1472 my ($match, $specificity); 1548 my ($match, $specificity);
1473 1549
1474 for my $region (list) { 1550 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1478 } 1554 }
1479 } 1555 }
1480 1556
… …
1600 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1601 return $self; 1677 return $self;
1602 } 1678 }
1603 } 1679 }
1604 1680
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1682 ()
1607} 1683}
1608 1684
1609sub init { 1685sub init {
1610 my ($self) = @_; 1686 my ($self) = @_;
… …
1818 $self->set_darkness_map; 1894 $self->set_darkness_map;
1819 Coro::cede; 1895 Coro::cede;
1820 $self->activate; 1896 $self->activate;
1821 } 1897 }
1822 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1823 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1824 } 1903 }
1825 1904
1826 $self->post_load; 1905 $self->post_load;
1827} 1906}
… …
1837 1916
1838 $self 1917 $self
1839} 1918}
1840 1919
1841# find and load all maps in the 3x3 area around a map 1920# find and load all maps in the 3x3 area around a map
1842sub load_diag { 1921sub load_neighbours {
1843 my ($map) = @_; 1922 my ($map) = @_;
1844 1923
1845 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1846 1925
1847 for (0 .. 3) { 1926 for (0 .. 3) {
1848 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1849 or next; 1928 or next;
1850 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1851 or next; 1930 or next;
1852 $neigh->load; 1931 $neigh->load;
1853 1932
1933 push @neigh,
1854 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1855 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1856 } 1936 }
1857 1937
1858 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1859 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1860 or next; 1941 or next;
1861 $neigh->load; 1942 $neigh->load;
1862 } 1943 }
1863} 1944}
1864 1945
… …
1888 1969
1889 undef $MAP_PREFETCH{$path}; 1970 undef $MAP_PREFETCH{$path};
1890 $MAP_PREFETCHER ||= cf::async { 1971 $MAP_PREFETCHER ||= cf::async {
1891 while (%MAP_PREFETCH) { 1972 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 1973 for my $path (keys %MAP_PREFETCH) {
1893 my $map = find $path 1974 if (my $map = find $path) {
1894 or next;
1895 $map->load; 1975 $map->load;
1976 }
1896 1977
1897 delete $MAP_PREFETCH{$path}; 1978 delete $MAP_PREFETCH{$path};
1898 } 1979 }
1899 } 1980 }
1900 undef $MAP_PREFETCHER; 1981 undef $MAP_PREFETCHER;
… …
2127 2208
2128 } else { 2209 } else {
2129 my $pl = $self->contr; 2210 my $pl = $self->contr;
2130 2211
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2212 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2213 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2214 $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 2215
2140 } else { 2216 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2217 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2218 $self->message ($msg, $flags);
2143 } 2219 }
2144 } 2220 }
2221}
2222
2223=item $object->send_msg ($channel, $msg, $color, [extra...])
2224
2225=cut
2226
2227sub cf::object::send_msg {
2228 my $pl = shift->contr
2229 or return;
2230 $pl->send_msg (@_);
2145} 2231}
2146 2232
2147=item $player_object->may ("access") 2233=item $player_object->may ("access")
2148 2234
2149Returns wether the given player is authorized to access resource "access" 2235Returns wether the given player is authorized to access resource "access"
… …
2228 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
2229 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
2230 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
2231 2317
2232 $map->load; 2318 $map->load;
2233 $map->load_diag; 2319 $map->load_neighbours;
2234 2320
2235 return unless $self->contr->active; 2321 return unless $self->contr->active;
2236 $self->activate_recursive; 2322 $self->activate_recursive;
2237 2323
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2325 $self->enter_map ($map, $x, $y);
2240} 2326}
2241 2327
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2329
2244Moves the player to the given map-path and coordinates by first freezing 2330Moves the player to the given map-path and coordinates by first freezing
2245her, loading and preparing them map, calling the provided $check callback 2331her, loading and preparing them map, calling the provided $check callback
2246that has to return the map if sucecssful, and then unfreezes the player on 2332that has to return the map if sucecssful, and then unfreezes the player on
2247the new (success) or old (failed) map position. 2333the new (success) or old (failed) map position. In either case, $done will
2334be called at the end of this process.
2248 2335
2249=cut 2336=cut
2250 2337
2251our $GOTOGEN; 2338our $GOTOGEN;
2252 2339
2253sub cf::object::player::goto { 2340sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2341 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2342
2256 # do generation counting so two concurrent goto's will be executed in-order 2343 # do generation counting so two concurrent goto's will be executed in-order
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2345
2259 $self->enter_link; 2346 $self->enter_link;
… …
2279 2366
2280 if ($gen == $self->{_goto_generation}) { 2367 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2368 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2369 $self->leave_link ($map, $x, $y);
2283 } 2370 }
2371
2372 $done->() if $done;
2284 })->prio (1); 2373 })->prio (1);
2285} 2374}
2286 2375
2287=item $player_object->enter_exit ($exit_object) 2376=item $player_object->enter_exit ($exit_object)
2288 2377
… …
2397 2486
2398 utf8::encode $text; 2487 utf8::encode $text;
2399 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2488 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2400} 2489}
2401 2490
2402=item $client->send_msg ($color, $type, $msg, [extra...]) 2491=item $client->send_msg ($channel, $msg, $color, [extra...])
2403 2492
2404Send a drawinfo or msg packet to the client, formatting the msg for the 2493Send a drawinfo or msg packet to the client, formatting the msg for the
2405client if neccessary. C<$type> should be a string identifying the type of 2494client if neccessary. C<$type> should be a string identifying the type of
2406the message, with C<log> being the default. If C<$color> is negative, suppress 2495the message, with C<log> being the default. If C<$color> is negative, suppress
2407the message unless the client supports the msg packet. 2496the message unless the client supports the msg packet.
2408 2497
2409=cut 2498=cut
2410 2499
2411sub cf::client::send_msg { 2500sub cf::client::send_msg {
2412 my ($self, $color, $type, $msg, @extra) = @_; 2501 my ($self, $channel, $msg, $color, @extra) = @_;
2413 2502
2414 $msg = $self->pl->expand_cfpod ($msg); 2503 $msg = $self->pl->expand_cfpod ($msg);
2415 2504
2505 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506
2507 if (ref $channel) {
2508 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_msg (channel_info => $channel);
2512 }
2513
2514 $channel = $channel->{id};
2515 }
2516
2416 return unless @extra || length $msg; 2517 return unless @extra || length $msg;
2417 2518
2418 if ($self->can_msg) { 2519 if ($self->can_msg) {
2520 # default colour, mask it out
2521 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2522 if $color & cf::NDI_DEF;
2523
2419 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2524 $self->send_packet ("msg " . $self->{json_coder}->encode (
2525 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2420 } else { 2526 } else {
2421 # replace some tags by gcfclient-compatible ones
2422 for ($msg) {
2423 1 while
2424 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2425 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2426 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2427 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2428 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2429 }
2430
2431 if ($color >= 0) { 2527 if ($color >= 0) {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 $color &= cf::NDI_COLOR_MASK;
2539
2540 utf8::encode $msg;
2541
2432 if (0 && $msg =~ /\[/) { 2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2433 $self->send_packet ("drawextinfo $color 4 0 $msg") 2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2434 } else { 2545 } else {
2435 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2436 $self->send_packet ("drawinfo $color $msg") 2547 $self->send_packet ("drawinfo $color $msg")
2437 } 2548 }
2438 } 2549 }
2439 } 2550 }
2440} 2551}
2441 2552
2442=item $client->ext_event ($type, %msg) 2553=item $client->ext_msg ($type, @msg)
2443 2554
2444Sends an ext event to the client. 2555Sends an ext event to the client.
2445 2556
2446=cut 2557=cut
2447 2558
2448sub cf::client::ext_event($$%) { 2559sub cf::client::ext_msg($$@) {
2449 my ($self, $type, %msg) = @_; 2560 my ($self, $type, @msg) = @_;
2450 2561
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove
2451 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2452 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2453} 2570}
2454 2571
2455=item $success = $client->query ($flags, "text", \&cb) 2572=item $success = $client->query ($flags, "text", \&cb)
2456 2573
2457Queues a query to the client, calling the given callback with 2574Queues a query to the client, calling the given callback with
… …
2512 my ($ns, $buf) = @_; 2629 my ($ns, $buf) = @_;
2513 2630
2514 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2631 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2515 2632
2516 if (ref $msg) { 2633 if (ref $msg) {
2634 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg
2636 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638
2517 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2639 if (my $cb = $EXTICMD{$type}) {
2518 if (my %reply = $cb->($ns, $msg)) { 2640 my @reply = $cb->($ns, @payload);
2519 $reply{msgid} = $msg->{msgid}; 2641
2520 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2642 $ns->ext_reply ($reply, @reply)
2521 } 2643 if $reply;
2522 } 2644 }
2523 } else { 2645 } else {
2524 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2525 } 2647 }
2526 2648
… …
2574our $safe = new Safe "safe"; 2696our $safe = new Safe "safe";
2575our $safe_hole = new Safe::Hole; 2697our $safe_hole = new Safe::Hole;
2576 2698
2577$SIG{FPE} = 'IGNORE'; 2699$SIG{FPE} = 'IGNORE';
2578 2700
2579$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2701$safe->permit_only (Opcode::opset qw(
2702 :base_core :base_mem :base_orig :base_math
2703 grepstart grepwhile mapstart mapwhile
2704 sort time
2705));
2580 2706
2581# here we export the classes and methods available to script code 2707# here we export the classes and methods available to script code
2582 2708
2583=pod 2709=pod
2584 2710
2585The following functions and methods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2586 2712
2587 cf::object 2713 cf::object
2588 contr pay_amount pay_player map x y force_find force_add 2714 contr pay_amount pay_player map x y force_find force_add
2589 insert remove 2715 insert remove name archname title slaying race
2590 2716
2591 cf::object::player 2717 cf::object::player
2592 player 2718 player
2593 2719
2594 cf::player 2720 cf::player
… …
2599 2725
2600=cut 2726=cut
2601 2727
2602for ( 2728for (
2603 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2604 insert remove)], 2730 insert remove inv name archname title slaying race)],
2605 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2606 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2607 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2608) { 2734) {
2609 no strict 'refs'; 2735 no strict 'refs';
… …
2701 { 2827 {
2702 my $faces = $facedata->{faceinfo}; 2828 my $faces = $facedata->{faceinfo};
2703 2829
2704 while (my ($face, $info) = each %$faces) { 2830 while (my ($face, $info) = each %$faces) {
2705 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2831 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2706 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2832 cf::face::set_visibility $idx, $info->{visibility};
2833 cf::face::set_magicmap $idx, $info->{magicmap};
2707 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2834 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2708 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2835 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2709 Coro::cede; 2836
2837 cf::cede_to_tick;
2710 } 2838 }
2711 2839
2712 while (my ($face, $info) = each %$faces) { 2840 while (my ($face, $info) = each %$faces) {
2713 next unless $info->{smooth}; 2841 next unless $info->{smooth};
2714 my $idx = cf::face::find $face 2842 my $idx = cf::face::find $face
2715 or next; 2843 or next;
2716 if (my $smooth = cf::face::find $info->{smooth}) { 2844 if (my $smooth = cf::face::find $info->{smooth}) {
2845 cf::face::set_smooth $idx, $smooth;
2717 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2846 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2718 } else { 2847 } else {
2719 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2848 warn "smooth face '$info->{smooth}' not found for face '$face'";
2720 } 2849 }
2721 Coro::cede; 2850
2851 cf::cede_to_tick;
2722 } 2852 }
2723 } 2853 }
2724 2854
2725 { 2855 {
2726 my $anims = $facedata->{animinfo}; 2856 my $anims = $facedata->{animinfo};
2727 2857
2728 while (my ($anim, $info) = each %$anims) { 2858 while (my ($anim, $info) = each %$anims) {
2729 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2859 cf::anim::set $anim, $info->{frames}, $info->{facings};
2730 Coro::cede; 2860 cf::cede_to_tick;
2731 } 2861 }
2732 2862
2733 cf::anim::invalidate_all; # d'oh 2863 cf::anim::invalidate_all; # d'oh
2734 } 2864 }
2735 2865
2866 {
2867 # TODO: for gcfclient pleasure, we should give resources
2868 # that gcfclient doesn't grok a >10000 face index.
2869 my $res = $facedata->{resource};
2870 my $enc = JSON::XS->new->utf8->canonical;
2871
2872 my $soundconf = delete $res->{"res/sound.conf"};
2873
2874 while (my ($name, $info) = each %$res) {
2875 my $meta = $enc->encode ({
2876 name => $name,
2877 %{ $info->{meta} || {} },
2878 });
2879
2880 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2881
2882 if ($info->{type} & 1) {
2883 # prepend meta info
2884
2885 my $data = pack "(w/a*)*", $meta, $info->{data};
2886 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2887
2888 cf::face::set_data $idx, 0, $data, $chk;
2889 } else {
2890 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2891 }
2892
2893 cf::face::set_type $idx, $info->{type};
2894
2895 cf::cede_to_tick;
2896 }
2897
2898 if ($soundconf) {
2899 $soundconf = $enc->decode (delete $soundconf->{data});
2900
2901 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2902 my $sound = $soundconf->{compat}[$_]
2903 or next;
2904
2905 my $face = cf::face::find "sound/$sound->[1]";
2906 cf::sound::set $sound->[0] => $face;
2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908 }
2909
2910 while (my ($k, $v) = each %{$soundconf->{event}}) {
2911 my $face = cf::face::find "sound/$v";
2912 cf::sound::set $k => $face;
2913 }
2914 }
2915 }
2916
2736 1 2917 1
2737} 2918}
2919
2920register_exticmd fx_want => sub {
2921 my ($ns, $want) = @_;
2922
2923 while (my ($k, $v) = each %$want) {
2924 $ns->fx_want ($k, $v);
2925 }
2926};
2738 2927
2739sub reload_regions { 2928sub reload_regions {
2740 load_resource_file "$MAPDIR/regions" 2929 load_resource_file "$MAPDIR/regions"
2741 or die "unable to load regions file\n"; 2930 or die "unable to load regions file\n";
2931
2932 for (cf::region::list) {
2933 $_->{match} = qr/$_->{match}/
2934 if exists $_->{match};
2935 }
2742} 2936}
2743 2937
2744sub reload_facedata { 2938sub reload_facedata {
2745 load_facedata "$DATADIR/facedata" 2939 load_facedata "$DATADIR/facedata"
2746 or die "unable to load facedata\n"; 2940 or die "unable to load facedata\n";

Diff Legend

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