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.310 by elmex, Mon Jul 16 15:43:49 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;
… …
322 }; 323 };
323 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
324 $guard 325 $guard
325} 326}
326 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
327=item cf::async { BLOCK } 384=item cf::async { BLOCK }
328 385
329Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
330C<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
331thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
418 475
419=cut 476=cut
420 477
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 478sub fork_call(&@) {
431 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
432 480
433# 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,
434# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
436 or die "pipe: $!";
437 484
438 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 486 reset_signals;
452 local $SIG{__WARN__}; 487 &$cb
453 local $SIG{__DIE__}; 488 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 489
460 eval { 490 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 491}
473 492
474=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
475 494
476Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
918 937
919=cut 938=cut
920 939
921############################################################################# 940#############################################################################
922# 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}
923 953
924sub reattach { 954sub reattach {
925 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 956 my ($obj) = @_;
927 957
… …
1114 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1115 1145
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1147
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1121 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1122 } 1158 if $reply;
1123 } 1159 }
1124 } else { 1160 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1162 }
1127 1163
… …
1297 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1298 1334
1299 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1300 1336
1301 $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 (@_);
1302} 1348}
1303 1349
1304=item $pl->quit_character 1350=item $pl->quit_character
1305 1351
1306Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1450sub hintmode { 1496sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1498 $_[0]{hintmode}
1453} 1499}
1454 1500
1455=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1456 1502
1457Sends an ext reply to the player. 1503Sends an ext reply to the player.
1458 1504
1459=cut 1505=cut
1460 1506
1461sub ext_reply($$%) { 1507sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1463 1509
1464 $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;
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1466} 1517}
1467 1518
1468=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1469 1520
1470Sends an ext event to the client. 1521Sends an ext event to the client.
1471 1522
1472=cut 1523=cut
1473 1524
1474sub ext_event($$%) { 1525sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1476 1527
1477 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1478} 1529}
1479 1530
1480=head3 cf::region 1531=head3 cf::region
1481 1532
1482=over 4 1533=over 4
… …
1843 $self->set_darkness_map; 1894 $self->set_darkness_map;
1844 Coro::cede; 1895 Coro::cede;
1845 $self->activate; 1896 $self->activate;
1846 } 1897 }
1847 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1848 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 1903 }
1850 1904
1851 $self->post_load; 1905 $self->post_load;
1852} 1906}
… …
2152 2206
2153 } else { 2207 } else {
2154 my $pl = $self->contr; 2208 my $pl = $self->contr;
2155 2209
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2210 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2211 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2212 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2213
2165 } else { 2214 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2215 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2216 $self->message ($msg, $flags);
2168 } 2217 }
2169 } 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 (@_);
2170} 2229}
2171 2230
2172=item $player_object->may ("access") 2231=item $player_object->may ("access")
2173 2232
2174Returns wether the given player is authorized to access resource "access" 2233Returns wether the given player is authorized to access resource "access"
… …
2425 2484
2426 utf8::encode $text; 2485 utf8::encode $text;
2427 $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);
2428} 2487}
2429 2488
2430=item $client->send_msg ($color, $type, $msg, [extra...]) 2489=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2490
2432Send 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
2433client 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
2434the 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
2435the message unless the client supports the msg packet. 2494the message unless the client supports the msg packet.
2436 2495
2437=cut 2496=cut
2438 2497
2439sub cf::client::send_msg { 2498sub cf::client::send_msg {
2440 my ($self, $color, $type, $msg, @extra) = @_; 2499 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2500
2442 $msg = $self->pl->expand_cfpod ($msg); 2501 $msg = $self->pl->expand_cfpod ($msg);
2443 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
2444 return unless @extra || length $msg; 2515 return unless @extra || length $msg;
2445 2516
2446 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
2447 $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]));
2448 } else { 2524 } else {
2449 # replace some tags by gcfclient-compatible ones
2450 for ($msg) {
2451 1 while
2452 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2453 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2454 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2455 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2456 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2457 }
2458
2459 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
2460 if (0 && $msg =~ /\[/) { 2540 if (0 && $msg =~ /\[/) {
2541 # COMMAND/INFO
2461 $self->send_packet ("drawextinfo $color 4 0 $msg") 2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2462 } else { 2543 } else {
2463 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2464 $self->send_packet ("drawinfo $color $msg") 2545 $self->send_packet ("drawinfo $color $msg")
2465 } 2546 }
2466 } 2547 }
2467 } 2548 }
2468} 2549}
2469 2550
2470=item $client->ext_event ($type, %msg) 2551=item $client->ext_msg ($type, @msg)
2471 2552
2472Sends an ext event to the client. 2553Sends an ext event to the client.
2473 2554
2474=cut 2555=cut
2475 2556
2476sub cf::client::ext_event($$%) { 2557sub cf::client::ext_msg($$@) {
2477 my ($self, $type, %msg) = @_; 2558 my ($self, $type, @msg) = @_;
2478 2559
2479 return unless $self->extcmd; 2560 my $extcmd = $self->extcmd;
2480 2561
2562 if ($extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove
2481 $msg{msgtype} = "event_$type"; 2565 push @msg, msgtype => "event_$type";
2482 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 }
2483} 2568}
2484 2569
2485=item $success = $client->query ($flags, "text", \&cb) 2570=item $success = $client->query ($flags, "text", \&cb)
2486 2571
2487Queues a query to the client, calling the given callback with 2572Queues a query to the client, calling the given callback with
… …
2542 my ($ns, $buf) = @_; 2627 my ($ns, $buf) = @_;
2543 2628
2544 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2629 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545 2630
2546 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
2547 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2637 if (my $cb = $EXTICMD{$type}) {
2548 if (my %reply = $cb->($ns, $msg)) { 2638 my @reply = $cb->($ns, @payload);
2549 $reply{msgid} = $msg->{msgid}; 2639
2550 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2640 $ns->ext_reply ($reply, @reply)
2551 } 2641 if $reply;
2552 } 2642 }
2553 } else { 2643 } else {
2554 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";
2555 } 2645 }
2556 2646
… …
2604our $safe = new Safe "safe"; 2694our $safe = new Safe "safe";
2605our $safe_hole = new Safe::Hole; 2695our $safe_hole = new Safe::Hole;
2606 2696
2607$SIG{FPE} = 'IGNORE'; 2697$SIG{FPE} = 'IGNORE';
2608 2698
2609$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));
2610 2704
2611# here we export the classes and methods available to script code 2705# here we export the classes and methods available to script code
2612 2706
2613=pod 2707=pod
2614 2708
2615The following functions and methods are available within a safe environment: 2709The following functions and methods are available within a safe environment:
2616 2710
2617 cf::object 2711 cf::object
2618 contr pay_amount pay_player map x y force_find force_add 2712 contr pay_amount pay_player map x y force_find force_add
2619 insert remove 2713 insert remove name archname title slaying race
2620 2714
2621 cf::object::player 2715 cf::object::player
2622 player 2716 player
2623 2717
2624 cf::player 2718 cf::player
… …
2629 2723
2630=cut 2724=cut
2631 2725
2632for ( 2726for (
2633 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2634 insert remove)], 2728 insert remove inv name archname title slaying race)],
2635 ["cf::object::player" => qw(player)], 2729 ["cf::object::player" => qw(player)],
2636 ["cf::player" => qw(peaceful)], 2730 ["cf::player" => qw(peaceful)],
2637 ["cf::map" => qw(trigger)], 2731 ["cf::map" => qw(trigger)],
2638) { 2732) {
2639 no strict 'refs'; 2733 no strict 'refs';
… …
2771 # TODO: for gcfclient pleasure, we should give resources 2865 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index. 2866 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource}; 2867 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical; 2868 my $enc = JSON::XS->new->utf8->canonical;
2775 2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871
2776 while (my ($name, $info) = each %$res) { 2872 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({ 2873 my $meta = $enc->encode ({
2778 name => $name, 2874 name => $name,
2779 type => $info->{type}, 2875 %{ $info->{meta} || {} },
2780 copyright => $info->{copyright}, #TODO#
2781 }); 2876 });
2782 2877
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2878 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2784 2879
2785 if ($name =~ /\.jpg$/) { 2880 if ($info->{type} & 1) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2881 # prepend meta info
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2882
2788 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data}; 2883 my $data = pack "(w/a*)*", $meta, $info->{data};
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791 2885
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk; 2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2794 } 2889 }
2795 2890
2891 cf::face::set_type $idx, $info->{type};
2892
2796 cf::cede_to_tick; 2893 cf::cede_to_tick;
2797 } 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 }
2798 } 2913 }
2799 2914
2800 1 2915 1
2801} 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};
2802 2925
2803sub reload_regions { 2926sub reload_regions {
2804 load_resource_file "$MAPDIR/regions" 2927 load_resource_file "$MAPDIR/regions"
2805 or die "unable to load regions file\n"; 2928 or die "unable to load regions file\n";
2806 2929

Diff Legend

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