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.305 by root, Thu Jul 12 08:40:14 2007 UTC vs.
Revision 1.331 by root, Mon Aug 13 13:10:01 2007 UTC

… …
166=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
167 167
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 169returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
171 177
172=back 178=back
173 179
174=cut 180=cut
175 181
… …
316 }; 322 };
317 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
318 $guard 324 $guard
319} 325}
320 326
327=item cf::get_slot $time[, $priority[, $name]]
328
329Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede.
332
333The optional C<$name> can be used to identify the job to run. It might be
334used for statistical purposes and should identify the same time-class.
335
336Useful for short background jobs.
337
338=cut
339
340our @SLOT_QUEUE;
341our $SLOT_QUEUE;
342
343$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async {
345 my $signal = new Coro::Signal;
346
347 while () {
348 next_job:
349 my $avail = cf::till_tick;
350 if ($avail > 0.01) {
351 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) {
353 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send;
355 Coro::cede;
356 goto next_job;
357 }
358 }
359 }
360
361 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait;
365 } else {
366 Coro::schedule;
367 }
368 }
369};
370
371sub get_slot($;$$) {
372 my ($time, $pri, $name) = @_;
373
374 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal;
376
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready;
380 $sig->wait;
381}
382
321=item cf::async { BLOCK } 383=item cf::async { BLOCK }
322 384
323Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
324C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 386C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
325thing you are allowed to do is call C<prio> on it. 387thing you are allowed to do is call C<prio> on it.
… …
866 "; 928 ";
867 die if $@; 929 die if $@;
868} 930}
869 931
870our $override; 932our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 933our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 934
873sub override { 935sub override {
874 $override = 1; 936 $override = 1;
875 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
876} 938}
877 939
878sub do_invoke { 940sub do_invoke {
879 my $event = shift; 941 my $event = shift;
880 my $callbacks = shift; 942 my $callbacks = shift;
881 943
882 @invoke_results = (); 944 @INVOKE_RESULTS = ();
883 945
884 local $override; 946 local $override;
885 947
886 for (@$callbacks) { 948 for (@$callbacks) {
887 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
904 966
905Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
906 968
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 969This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 970removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 972
911=back 973=back
912 974
913=cut 975=cut
914 976
915############################################################################# 977#############################################################################
916# object support 978# object support
979#
980
981sub _can_merge {
982 my ($ob1, $ob2) = @_;
983
984 local $Storable::canonical = 1;
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987
988 $fob1 eq $fob2
989}
917 990
918sub reattach { 991sub reattach {
919 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 993 my ($obj) = @_;
921 994
… …
1108 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1109 1182
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1184
1112 if (ref $msg) { 1185 if (ref $msg) {
1186 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg
1188 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
1115 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
1116 } 1195 if $reply;
1117 } 1196 }
1118 } else { 1197 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1199 }
1121 1200
… …
1291 $self->{deny_save} = 1; 1370 $self->{deny_save} = 1;
1292 1371
1293 $cf::PLAYER{$login} = $self; 1372 $cf::PLAYER{$login} = $self;
1294 1373
1295 $self 1374 $self
1375}
1376
1377=item $player->send_msg ($channel, $msg, $color, [extra...])
1378
1379=cut
1380
1381sub send_msg {
1382 my $ns = shift->ns
1383 or return;
1384 $ns->send_msg (@_);
1296} 1385}
1297 1386
1298=item $pl->quit_character 1387=item $pl->quit_character
1299 1388
1300Nukes the player without looking back. If logged in, the connection will 1389Nukes the player without looking back. If logged in, the connection will
… …
1444sub hintmode { 1533sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1535 $_[0]{hintmode}
1447} 1536}
1448 1537
1449=item $player->ext_reply ($msgid, %msg) 1538=item $player->ext_reply ($msgid, @msg)
1450 1539
1451Sends an ext reply to the player. 1540Sends an ext reply to the player.
1452 1541
1453=cut 1542=cut
1454 1543
1455sub ext_reply($$%) { 1544sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1545 my ($self, $id, @msg) = @_;
1457 1546
1458 $msg{msgid} = $id; 1547 if ($self->ns->extcmd == 2) {
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1460} 1554}
1461 1555
1462=item $player->ext_event ($type, %msg) 1556=item $player->ext_msg ($type, @msg)
1463 1557
1464Sends an ext event to the client. 1558Sends an ext event to the client.
1465 1559
1466=cut 1560=cut
1467 1561
1468sub ext_event($$%) { 1562sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1563 my ($self, $type, @msg) = @_;
1470 1564
1471 $self->ns->ext_event ($type, %msg); 1565 $self->ns->ext_msg ($type, @msg);
1472} 1566}
1473 1567
1474=head3 cf::region 1568=head3 cf::region
1475 1569
1476=over 4 1570=over 4
… …
1619 $self->init; # pass $1 etc. 1713 $self->init; # pass $1 etc.
1620 return $self; 1714 return $self;
1621 } 1715 }
1622 } 1716 }
1623 1717
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1718 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1719 ()
1626} 1720}
1627 1721
1628sub init { 1722sub init {
1629 my ($self) = @_; 1723 my ($self) = @_;
… …
1837 $self->set_darkness_map; 1931 $self->set_darkness_map;
1838 Coro::cede; 1932 Coro::cede;
1839 $self->activate; 1933 $self->activate;
1840 } 1934 }
1841 1935
1936 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME);
1938
1842 $self->in_memory (cf::MAP_IN_MEMORY); 1939 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 1940 }
1844 1941
1845 $self->post_load; 1942 $self->post_load;
1846} 1943}
… …
1907 2004
1908 undef $MAP_PREFETCH{$path}; 2005 undef $MAP_PREFETCH{$path};
1909 $MAP_PREFETCHER ||= cf::async { 2006 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 2007 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2008 for my $path (keys %MAP_PREFETCH) {
1912 my $map = find $path 2009 if (my $map = find $path) {
1913 or next;
1914 $map->load; 2010 $map->load;
2011 }
1915 2012
1916 delete $MAP_PREFETCH{$path}; 2013 delete $MAP_PREFETCH{$path};
1917 } 2014 }
1918 } 2015 }
1919 undef $MAP_PREFETCHER; 2016 undef $MAP_PREFETCHER;
… …
2146 2243
2147 } else { 2244 } else {
2148 my $pl = $self->contr; 2245 my $pl = $self->contr;
2149 2246
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2247 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2248 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2249 $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 2250
2159 } else { 2251 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2252 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2253 $self->message ($msg, $flags);
2162 } 2254 }
2163 } 2255 }
2256}
2257
2258=item $object->send_msg ($channel, $msg, $color, [extra...])
2259
2260=cut
2261
2262sub cf::object::send_msg {
2263 my $pl = shift->contr
2264 or return;
2265 $pl->send_msg (@_);
2164} 2266}
2165 2267
2166=item $player_object->may ("access") 2268=item $player_object->may ("access")
2167 2269
2168Returns wether the given player is authorized to access resource "access" 2270Returns wether the given player is authorized to access resource "access"
… …
2256 2358
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2360 $self->enter_map ($map, $x, $y);
2259} 2361}
2260 2362
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2363=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2364
2263Moves the player to the given map-path and coordinates by first freezing 2365Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2366her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2367that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2368the new (success) or old (failed) map position. In either case, $done will
2369be called at the end of this process.
2267 2370
2268=cut 2371=cut
2269 2372
2270our $GOTOGEN; 2373our $GOTOGEN;
2271 2374
2272sub cf::object::player::goto { 2375sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2376 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2377
2275 # do generation counting so two concurrent goto's will be executed in-order 2378 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2380
2278 $self->enter_link; 2381 $self->enter_link;
… …
2298 2401
2299 if ($gen == $self->{_goto_generation}) { 2402 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2403 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2404 $self->leave_link ($map, $x, $y);
2302 } 2405 }
2406
2407 $done->() if $done;
2303 })->prio (1); 2408 })->prio (1);
2304} 2409}
2305 2410
2306=item $player_object->enter_exit ($exit_object) 2411=item $player_object->enter_exit ($exit_object)
2307 2412
… …
2416 2521
2417 utf8::encode $text; 2522 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2523 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2524}
2420 2525
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2526=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2527
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2528Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2529client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2530the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2531the message unless the client supports the msg packet.
2427 2532
2428=cut 2533=cut
2429 2534
2430sub cf::client::send_msg { 2535sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2536 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2537
2433 $msg = $self->pl->expand_cfpod ($msg); 2538 $msg = $self->pl->expand_cfpod ($msg);
2434 2539
2540 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541
2542 if (ref $channel) {
2543 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel);
2547 }
2548
2549 $channel = $channel->{id};
2550 }
2551
2435 return unless @extra || length $msg; 2552 return unless @extra || length $msg;
2436 2553
2437 if ($self->can_msg) { 2554 if ($self->can_msg) {
2555 # default colour, mask it out
2556 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2557 if $color & cf::NDI_DEF;
2558
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2559 $self->send_packet ("msg " . $self->{json_coder}->encode (
2560 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2561 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2562 if ($color >= 0) {
2563 # replace some tags by gcfclient-compatible ones
2564 for ($msg) {
2565 1 while
2566 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2567 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2568 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2569 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2570 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2571 }
2572
2573 $color &= cf::NDI_COLOR_MASK;
2574
2575 utf8::encode $msg;
2576
2451 if (0 && $msg =~ /\[/) { 2577 if (0 && $msg =~ /\[/) {
2578 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2579 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2580 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2581 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2582 $self->send_packet ("drawinfo $color $msg")
2456 } 2583 }
2457 } 2584 }
2458 } 2585 }
2459} 2586}
2460 2587
2461=item $client->ext_event ($type, %msg) 2588=item $client->ext_msg ($type, @msg)
2462 2589
2463Sends an ext event to the client. 2590Sends an ext event to the client.
2464 2591
2465=cut 2592=cut
2466 2593
2467sub cf::client::ext_event($$%) { 2594sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2595 my ($self, $type, @msg) = @_;
2469 2596
2470 return unless $self->extcmd; 2597 my $extcmd = $self->extcmd;
2471 2598
2599 if ($extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove
2472 $msg{msgtype} = "event_$type"; 2602 push @msg, msgtype => "event_$type";
2473 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 }
2474} 2605}
2475 2606
2476=item $success = $client->query ($flags, "text", \&cb) 2607=item $success = $client->query ($flags, "text", \&cb)
2477 2608
2478Queues a query to the client, calling the given callback with 2609Queues a query to the client, calling the given callback with
… …
2533 my ($ns, $buf) = @_; 2664 my ($ns, $buf) = @_;
2534 2665
2535 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2666 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2536 2667
2537 if (ref $msg) { 2668 if (ref $msg) {
2669 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg
2671 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673
2538 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2674 if (my $cb = $EXTICMD{$type}) {
2539 if (my %reply = $cb->($ns, $msg)) { 2675 my @reply = $cb->($ns, @payload);
2540 $reply{msgid} = $msg->{msgid}; 2676
2541 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2677 $ns->ext_reply ($reply, @reply)
2542 } 2678 if $reply;
2543 } 2679 }
2544 } else { 2680 } else {
2545 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2546 } 2682 }
2547 2683
… …
2595our $safe = new Safe "safe"; 2731our $safe = new Safe "safe";
2596our $safe_hole = new Safe::Hole; 2732our $safe_hole = new Safe::Hole;
2597 2733
2598$SIG{FPE} = 'IGNORE'; 2734$SIG{FPE} = 'IGNORE';
2599 2735
2600$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2736$safe->permit_only (Opcode::opset qw(
2737 :base_core :base_mem :base_orig :base_math
2738 grepstart grepwhile mapstart mapwhile
2739 sort time
2740));
2601 2741
2602# here we export the classes and methods available to script code 2742# here we export the classes and methods available to script code
2603 2743
2604=pod 2744=pod
2605 2745
2606The following functions and methods are available within a safe environment: 2746The following functions and methods are available within a safe environment:
2607 2747
2608 cf::object 2748 cf::object
2609 contr pay_amount pay_player map x y force_find force_add 2749 contr pay_amount pay_player map x y force_find force_add
2610 insert remove 2750 insert remove name archname title slaying race
2611 2751
2612 cf::object::player 2752 cf::object::player
2613 player 2753 player
2614 2754
2615 cf::player 2755 cf::player
… …
2620 2760
2621=cut 2761=cut
2622 2762
2623for ( 2763for (
2624 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2625 insert remove)], 2765 insert remove inv name archname title slaying race)],
2626 ["cf::object::player" => qw(player)], 2766 ["cf::object::player" => qw(player)],
2627 ["cf::player" => qw(peaceful)], 2767 ["cf::player" => qw(peaceful)],
2628 ["cf::map" => qw(trigger)], 2768 ["cf::map" => qw(trigger)],
2629) { 2769) {
2630 no strict 'refs'; 2770 no strict 'refs';
… …
2762 # TODO: for gcfclient pleasure, we should give resources 2902 # TODO: for gcfclient pleasure, we should give resources
2763 # that gcfclient doesn't grok a >10000 face index. 2903 # that gcfclient doesn't grok a >10000 face index.
2764 my $res = $facedata->{resource}; 2904 my $res = $facedata->{resource};
2765 my $enc = JSON::XS->new->utf8->canonical; 2905 my $enc = JSON::XS->new->utf8->canonical;
2766 2906
2907 my $soundconf = delete $res->{"res/sound.conf"};
2908
2767 while (my ($name, $info) = each %$res) { 2909 while (my ($name, $info) = each %$res) {
2768 my $meta = $enc->encode ({ 2910 my $meta = $enc->encode ({
2769 name => $name, 2911 name => $name,
2770 type => $info->{type}, 2912 %{ $info->{meta} || {} },
2771 copyright => $info->{copyright}, #TODO#
2772 }); 2913 });
2773 my $data = pack "(w/a*)*", $meta, $info->{data};
2774 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2775 2914
2776 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2915 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2777 cf::face::set_type $idx, 1; 2916
2917 if ($info->{type} & 1) {
2918 # prepend meta info
2919
2920 my $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2778 cf::face::set_data $idx, 0, $data, $chk; 2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2926 }
2927
2928 cf::face::set_type $idx, $info->{type};
2779 2929
2780 cf::cede_to_tick; 2930 cf::cede_to_tick;
2781 } 2931 }
2932
2933 if ($soundconf) {
2934 $soundconf = $enc->decode (delete $soundconf->{data});
2935
2936 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2937 my $sound = $soundconf->{compat}[$_]
2938 or next;
2939
2940 my $face = cf::face::find "sound/$sound->[1]";
2941 cf::sound::set $sound->[0] => $face;
2942 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2943 }
2944
2945 while (my ($k, $v) = each %{$soundconf->{event}}) {
2946 my $face = cf::face::find "sound/$v";
2947 cf::sound::set $k => $face;
2948 }
2949 }
2782 } 2950 }
2783 2951
2784 1 2952 1
2785} 2953}
2954
2955register_exticmd fx_want => sub {
2956 my ($ns, $want) = @_;
2957
2958 while (my ($k, $v) = each %$want) {
2959 $ns->fx_want ($k, $v);
2960 }
2961};
2786 2962
2787sub reload_regions { 2963sub reload_regions {
2788 load_resource_file "$MAPDIR/regions" 2964 load_resource_file "$MAPDIR/regions"
2789 or die "unable to load regions file\n"; 2965 or die "unable to load regions file\n";
2790 2966

Diff Legend

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