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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.335 by root, Mon Aug 20 22:21:48 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;
… …
166=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
167 168
168These 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
169returns 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
170per 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.
171 178
172=back 179=back
173 180
174=cut 181=cut
175 182
… …
316 }; 323 };
317 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
318 $guard 325 $guard
319} 326}
320 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
321=item cf::async { BLOCK } 384=item cf::async { BLOCK }
322 385
323Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
324C<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
325thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
… …
410Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
412 475
413=cut 476=cut
414 477
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423
424sub fork_call(&@) { 478sub fork_call(&@) {
425 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
426 480
427# 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,
428# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
430 or die "pipe: $!";
431 484
432 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 486 reset_signals;
446 local $SIG{__WARN__}; 487 &$cb
447 local $SIG{__DIE__}; 488 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 489
454 eval { 490 wantarray ? @res : $res[-1]
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 }
466} 491}
467 492
468=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
469 494
470Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
866 "; 891 ";
867 die if $@; 892 die if $@;
868} 893}
869 894
870our $override; 895our $override;
871our @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?
872 897
873sub override { 898sub override {
874 $override = 1; 899 $override = 1;
875 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
876} 901}
877 902
878sub do_invoke { 903sub do_invoke {
879 my $event = shift; 904 my $event = shift;
880 my $callbacks = shift; 905 my $callbacks = shift;
881 906
882 @invoke_results = (); 907 @INVOKE_RESULTS = ();
883 908
884 local $override; 909 local $override;
885 910
886 for (@$callbacks) { 911 for (@$callbacks) {
887 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
904 929
905Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
906 931
907This 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
908removed 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
909results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 935
911=back 936=back
912 937
913=cut 938=cut
914 939
915############################################################################# 940#############################################################################
916# 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}
917 953
918sub reattach { 954sub reattach {
919 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 956 my ($obj) = @_;
921 957
… …
1108 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1109 1145
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1147
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1115 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1116 } 1158 if $reply;
1117 } 1159 }
1118 } else { 1160 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1162 }
1121 1163
… …
1291 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1292 1334
1293 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1294 1336
1295 $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 (@_);
1296} 1348}
1297 1349
1298=item $pl->quit_character 1350=item $pl->quit_character
1299 1351
1300Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1444sub hintmode { 1496sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1498 $_[0]{hintmode}
1447} 1499}
1448 1500
1449=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1450 1502
1451Sends an ext reply to the player. 1503Sends an ext reply to the player.
1452 1504
1453=cut 1505=cut
1454 1506
1455sub ext_reply($$%) { 1507sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1457 1509
1458 $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;
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1460} 1517}
1461 1518
1462=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1463 1520
1464Sends an ext event to the client. 1521Sends an ext event to the client.
1465 1522
1466=cut 1523=cut
1467 1524
1468sub ext_event($$%) { 1525sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1470 1527
1471 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1472} 1529}
1473 1530
1474=head3 cf::region 1531=head3 cf::region
1475 1532
1476=over 4 1533=over 4
… …
1837 $self->set_darkness_map; 1894 $self->set_darkness_map;
1838 Coro::cede; 1895 Coro::cede;
1839 $self->activate; 1896 $self->activate;
1840 } 1897 }
1841 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1842 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 1903 }
1844 1904
1845 $self->post_load; 1905 $self->post_load;
1846} 1906}
… …
1856 1916
1857 $self 1917 $self
1858} 1918}
1859 1919
1860# 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
1861sub load_diag { 1921sub load_neighbours {
1862 my ($map) = @_; 1922 my ($map) = @_;
1863 1923
1864 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1865 1925
1866 for (0 .. 3) { 1926 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1868 or next; 1928 or next;
1869 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1870 or next; 1930 or next;
1871 $neigh->load; 1931 $neigh->load;
1872 1932
1933 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 1936 }
1876 1937
1877 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1879 or next; 1941 or next;
1880 $neigh->load; 1942 $neigh->load;
1881 } 1943 }
1882} 1944}
1883 1945
… …
2146 2208
2147 } else { 2209 } else {
2148 my $pl = $self->contr; 2210 my $pl = $self->contr;
2149 2211
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2212 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2213 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2214 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2215
2159 } else { 2216 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2217 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2218 $self->message ($msg, $flags);
2162 } 2219 }
2163 } 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 (@_);
2164} 2231}
2165 2232
2166=item $player_object->may ("access") 2233=item $player_object->may ("access")
2167 2234
2168Returns wether the given player is authorized to access resource "access" 2235Returns wether the given player is authorized to access resource "access"
… …
2247 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
2250 2317
2251 $map->load; 2318 $map->load;
2252 $map->load_diag; 2319 $map->load_neighbours;
2253 2320
2254 return unless $self->contr->active; 2321 return unless $self->contr->active;
2255 $self->activate_recursive; 2322 $self->activate_recursive;
2256 2323
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2419 2486
2420 utf8::encode $text; 2487 utf8::encode $text;
2421 $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);
2422} 2489}
2423 2490
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2491=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2492
2426Send 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
2427client 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
2428the 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
2429the message unless the client supports the msg packet. 2496the message unless the client supports the msg packet.
2430 2497
2431=cut 2498=cut
2432 2499
2433sub cf::client::send_msg { 2500sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2501 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2502
2436 $msg = $self->pl->expand_cfpod ($msg); 2503 $msg = $self->pl->expand_cfpod ($msg);
2437 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
2438 return unless @extra || length $msg; 2517 return unless @extra || length $msg;
2439 2518
2440 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
2441 $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]));
2442 } else { 2526 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 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
2454 if (0 && $msg =~ /\[/) { 2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2545 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2547 $self->send_packet ("drawinfo $color $msg")
2459 } 2548 }
2460 } 2549 }
2461 } 2550 }
2462} 2551}
2463 2552
2464=item $client->ext_event ($type, %msg) 2553=item $client->ext_msg ($type, @msg)
2465 2554
2466Sends an ext event to the client. 2555Sends an ext event to the client.
2467 2556
2468=cut 2557=cut
2469 2558
2470sub cf::client::ext_event($$%) { 2559sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2560 my ($self, $type, @msg) = @_;
2472 2561
2473 return unless $self->extcmd; 2562 my $extcmd = $self->extcmd;
2474 2563
2564 if ($extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2477} 2570}
2478 2571
2479=item $success = $client->query ($flags, "text", \&cb) 2572=item $success = $client->query ($flags, "text", \&cb)
2480 2573
2481Queues a query to the client, calling the given callback with 2574Queues a query to the client, calling the given callback with
… …
2536 my ($ns, $buf) = @_; 2629 my ($ns, $buf) = @_;
2537 2630
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2631 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2632
2540 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
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2639 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 2640 my @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid}; 2641
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2642 $ns->ext_reply ($reply, @reply)
2545 } 2643 if $reply;
2546 } 2644 }
2547 } else { 2645 } else {
2548 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";
2549 } 2647 }
2550 2648
… …
2598our $safe = new Safe "safe"; 2696our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 2697our $safe_hole = new Safe::Hole;
2600 2698
2601$SIG{FPE} = 'IGNORE'; 2699$SIG{FPE} = 'IGNORE';
2602 2700
2603$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));
2604 2706
2605# here we export the classes and methods available to script code 2707# here we export the classes and methods available to script code
2606 2708
2607=pod 2709=pod
2608 2710
2609The following functions and methods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2610 2712
2611 cf::object 2713 cf::object
2612 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
2613 insert remove 2715 insert remove name archname title slaying race
2614 2716
2615 cf::object::player 2717 cf::object::player
2616 player 2718 player
2617 2719
2618 cf::player 2720 cf::player
… …
2623 2725
2624=cut 2726=cut
2625 2727
2626for ( 2728for (
2627 ["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
2628 insert remove)], 2730 insert remove inv name archname title slaying race)],
2629 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2632) { 2734) {
2633 no strict 'refs'; 2735 no strict 'refs';
… …
2709# the server's init and main functions 2811# the server's init and main functions
2710 2812
2711sub load_facedata($) { 2813sub load_facedata($) {
2712 my ($path) = @_; 2814 my ($path) = @_;
2713 2815
2816 my $enc = JSON::XS->new->utf8->canonical;
2817
2714 warn "loading facedata from $path\n"; 2818 warn "loading facedata from $path\n";
2715 2819
2716 my $facedata; 2820 my $facedata;
2717 0 < aio_load $path, $facedata 2821 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 2822 or die "$path: $!";
2719 2823
2720 $facedata = Coro::Storable::thaw $facedata; 2824 $facedata = Coro::Storable::thaw $facedata;
2721 2825
2722 $facedata->{version} == 2 2826 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 2827 or cf::cleanup "$path: version mismatch, cannot proceed.";
2828
2829 # patch in the exptable
2830 $facedata->{resource}{"res/exp_table"} = {
2831 type => FT_RSRC,
2832 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2833 };
2834 cf::cede_to_tick;
2724 2835
2725 { 2836 {
2726 my $faces = $facedata->{faceinfo}; 2837 my $faces = $facedata->{faceinfo};
2727 2838
2728 while (my ($face, $info) = each %$faces) { 2839 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2840 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2730 cf::face::set_visibility $idx, $info->{visibility}; 2841 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 2842 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2843 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2844 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 2845
2735 cf::cede_to_tick; 2846 cf::cede_to_tick;
2736 } 2847 }
2737 2848
2738 while (my ($face, $info) = each %$faces) { 2849 while (my ($face, $info) = each %$faces) {
… …
2763 2874
2764 { 2875 {
2765 # TODO: for gcfclient pleasure, we should give resources 2876 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 2877 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 2878 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical; 2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2769 2881
2770 while (my ($name, $info) = each %$res) { 2882 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2883 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2884 my $data;
2778 2885
2779 if ($name =~ /\.jpg$/) { 2886 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2887 # prepend meta info
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2888
2782 } else { 2889 my $meta = $enc->encode ({
2890 name => $name,
2891 %{ $info->{meta} || {} },
2892 });
2893
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 2894 $data = pack "(w/a*)*", $meta, $info->{data};
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 2895 }
2789 2896
2897 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2898 cf::face::set_type $idx, $info->{type};
2899
2790 cf::cede_to_tick; 2900 cf::cede_to_tick;
2791 } 2901 }
2902
2903 if ($soundconf) {
2904 $soundconf = $enc->decode (delete $soundconf->{data});
2905
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_]
2908 or next;
2909
2910 my $face = cf::face::find "sound/$sound->[1]";
2911 cf::sound::set $sound->[0] => $face;
2912 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2913 }
2914
2915 while (my ($k, $v) = each %{$soundconf->{event}}) {
2916 my $face = cf::face::find "sound/$v";
2917 cf::sound::set $k => $face;
2918 }
2919 }
2792 } 2920 }
2793 2921
2794 1 2922 1
2795} 2923}
2924
2925register_exticmd fx_want => sub {
2926 my ($ns, $want) = @_;
2927
2928 while (my ($k, $v) = each %$want) {
2929 $ns->fx_want ($k, $v);
2930 }
2931};
2796 2932
2797sub reload_regions { 2933sub reload_regions {
2798 load_resource_file "$MAPDIR/regions" 2934 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 2935 or die "unable to load regions file\n";
2800 2936

Diff Legend

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