| … | |
… | |
| 322 | }; |
322 | }; |
| 323 | $TICK_WATCHER->stop; |
323 | $TICK_WATCHER->stop; |
| 324 | $guard |
324 | $guard |
| 325 | } |
325 | } |
| 326 | |
326 | |
|
|
327 | =item cf::get_slot $time[, $priority[, $name]] |
|
|
328 | |
|
|
329 | Allocate $time seconds of blocking CPU time at priority C<$priority>: |
|
|
330 | This call blocks and returns only when you have at least C<$time> seconds |
|
|
331 | of cpu time till the next tick. The slot is only valid till the next cede. |
|
|
332 | |
|
|
333 | The optional C<$name> can be used to identify the job to run. It might be |
|
|
334 | used for statistical purposes and should identify the same time-class. |
|
|
335 | |
|
|
336 | Useful for short background jobs. |
|
|
337 | |
|
|
338 | =cut |
|
|
339 | |
|
|
340 | our @SLOT_QUEUE; |
|
|
341 | our $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 | |
|
|
371 | sub 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 | |
| 327 | =item cf::async { BLOCK } |
383 | =item cf::async { BLOCK } |
| 328 | |
384 | |
| 329 | Currently the same as Coro::async_pool, meaning you cannot use |
385 | Currently the same as Coro::async_pool, meaning you cannot use |
| 330 | C<on_destroy>, C<join> or other gimmicks on these coroutines. The only |
386 | C<on_destroy>, C<join> or other gimmicks on these coroutines. The only |
| 331 | thing you are allowed to do is call C<prio> on it. |
387 | thing you are allowed to do is call C<prio> on it. |
| … | |
… | |
| 918 | |
974 | |
| 919 | =cut |
975 | =cut |
| 920 | |
976 | |
| 921 | ############################################################################# |
977 | ############################################################################# |
| 922 | # object support |
978 | # object support |
|
|
979 | # |
|
|
980 | |
|
|
981 | sub _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 | } |
| 923 | |
990 | |
| 924 | sub reattach { |
991 | sub reattach { |
| 925 | # basically do the same as instantiate, without calling instantiate |
992 | # basically do the same as instantiate, without calling instantiate |
| 926 | my ($obj) = @_; |
993 | my ($obj) = @_; |
| 927 | |
994 | |
| … | |
… | |
| 1114 | my ($pl, $buf) = @_; |
1181 | my ($pl, $buf) = @_; |
| 1115 | |
1182 | |
| 1116 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
1183 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
| 1117 | |
1184 | |
| 1118 | 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 | |
| 1119 | if (my $cb = $EXTCMD{$msg->{msgtype}}) { |
1191 | if (my $cb = $EXTCMD{$type}) { |
| 1120 | if (my %reply = $cb->($pl, $msg)) { |
1192 | my @reply = $cb->($pl, @payload); |
|
|
1193 | |
| 1121 | $pl->ext_reply ($msg->{msgid}, %reply); |
1194 | $pl->ext_reply ($reply, @reply) |
| 1122 | } |
1195 | if $reply; |
| 1123 | } |
1196 | } |
| 1124 | } else { |
1197 | } else { |
| 1125 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1198 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
| 1126 | } |
1199 | } |
| 1127 | |
1200 | |
| … | |
… | |
| 1297 | $self->{deny_save} = 1; |
1370 | $self->{deny_save} = 1; |
| 1298 | |
1371 | |
| 1299 | $cf::PLAYER{$login} = $self; |
1372 | $cf::PLAYER{$login} = $self; |
| 1300 | |
1373 | |
| 1301 | $self |
1374 | $self |
|
|
1375 | } |
|
|
1376 | |
|
|
1377 | =item $player->send_msg ($channel, $msg, $color, [extra...]) |
|
|
1378 | |
|
|
1379 | =cut |
|
|
1380 | |
|
|
1381 | sub send_msg { |
|
|
1382 | my $ns = shift->ns |
|
|
1383 | or return; |
|
|
1384 | $ns->send_msg (@_); |
| 1302 | } |
1385 | } |
| 1303 | |
1386 | |
| 1304 | =item $pl->quit_character |
1387 | =item $pl->quit_character |
| 1305 | |
1388 | |
| 1306 | Nukes the player without looking back. If logged in, the connection will |
1389 | Nukes the player without looking back. If logged in, the connection will |
| … | |
… | |
| 1450 | sub hintmode { |
1533 | sub hintmode { |
| 1451 | $_[0]{hintmode} = $_[1] if @_ > 1; |
1534 | $_[0]{hintmode} = $_[1] if @_ > 1; |
| 1452 | $_[0]{hintmode} |
1535 | $_[0]{hintmode} |
| 1453 | } |
1536 | } |
| 1454 | |
1537 | |
| 1455 | =item $player->ext_reply ($msgid, %msg) |
1538 | =item $player->ext_reply ($msgid, @msg) |
| 1456 | |
1539 | |
| 1457 | Sends an ext reply to the player. |
1540 | Sends an ext reply to the player. |
| 1458 | |
1541 | |
| 1459 | =cut |
1542 | =cut |
| 1460 | |
1543 | |
| 1461 | sub ext_reply($$%) { |
1544 | sub ext_reply($$@) { |
| 1462 | my ($self, $id, %msg) = @_; |
1545 | my ($self, $id, @msg) = @_; |
| 1463 | |
1546 | |
| 1464 | $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; |
| 1465 | $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); |
1552 | $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg})); |
|
|
1553 | } |
| 1466 | } |
1554 | } |
| 1467 | |
1555 | |
| 1468 | =item $player->ext_event ($type, %msg) |
1556 | =item $player->ext_msg ($type, @msg) |
| 1469 | |
1557 | |
| 1470 | Sends an ext event to the client. |
1558 | Sends an ext event to the client. |
| 1471 | |
1559 | |
| 1472 | =cut |
1560 | =cut |
| 1473 | |
1561 | |
| 1474 | sub ext_event($$%) { |
1562 | sub ext_msg($$@) { |
| 1475 | my ($self, $type, %msg) = @_; |
1563 | my ($self, $type, @msg) = @_; |
| 1476 | |
1564 | |
| 1477 | $self->ns->ext_event ($type, %msg); |
1565 | $self->ns->ext_msg ($type, @msg); |
| 1478 | } |
1566 | } |
| 1479 | |
1567 | |
| 1480 | =head3 cf::region |
1568 | =head3 cf::region |
| 1481 | |
1569 | |
| 1482 | =over 4 |
1570 | =over 4 |
| … | |
… | |
| 1843 | $self->set_darkness_map; |
1931 | $self->set_darkness_map; |
| 1844 | Coro::cede; |
1932 | Coro::cede; |
| 1845 | $self->activate; |
1933 | $self->activate; |
| 1846 | } |
1934 | } |
| 1847 | |
1935 | |
|
|
1936 | $self->{last_save} = $cf::RUNTIME; |
|
|
1937 | $self->last_access ($cf::RUNTIME); |
|
|
1938 | |
| 1848 | $self->in_memory (cf::MAP_IN_MEMORY); |
1939 | $self->in_memory (cf::MAP_IN_MEMORY); |
| 1849 | } |
1940 | } |
| 1850 | |
1941 | |
| 1851 | $self->post_load; |
1942 | $self->post_load; |
| 1852 | } |
1943 | } |
| … | |
… | |
| 2152 | |
2243 | |
| 2153 | } else { |
2244 | } else { |
| 2154 | my $pl = $self->contr; |
2245 | my $pl = $self->contr; |
| 2155 | |
2246 | |
| 2156 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
2247 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
| 2157 | my $diag = $pl->{npc_dialog}; |
2248 | my $dialog = $pl->{npc_dialog}; |
| 2158 | $diag->{pl}->ext_reply ( |
2249 | $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 | |
2250 | |
| 2165 | } else { |
2251 | } else { |
| 2166 | $msg = $npc->name . " says: $msg" if $npc; |
2252 | $msg = $npc->name . " says: $msg" if $npc; |
| 2167 | $self->message ($msg, $flags); |
2253 | $self->message ($msg, $flags); |
| 2168 | } |
2254 | } |
| 2169 | } |
2255 | } |
|
|
2256 | } |
|
|
2257 | |
|
|
2258 | =item $object->send_msg ($channel, $msg, $color, [extra...]) |
|
|
2259 | |
|
|
2260 | =cut |
|
|
2261 | |
|
|
2262 | sub cf::object::send_msg { |
|
|
2263 | my $pl = shift->contr |
|
|
2264 | or return; |
|
|
2265 | $pl->send_msg (@_); |
| 2170 | } |
2266 | } |
| 2171 | |
2267 | |
| 2172 | =item $player_object->may ("access") |
2268 | =item $player_object->may ("access") |
| 2173 | |
2269 | |
| 2174 | Returns wether the given player is authorized to access resource "access" |
2270 | Returns wether the given player is authorized to access resource "access" |
| … | |
… | |
| 2439 | sub cf::client::send_msg { |
2535 | sub cf::client::send_msg { |
| 2440 | my ($self, $channel, $msg, $color, @extra) = @_; |
2536 | my ($self, $channel, $msg, $color, @extra) = @_; |
| 2441 | |
2537 | |
| 2442 | $msg = $self->pl->expand_cfpod ($msg); |
2538 | $msg = $self->pl->expand_cfpod ($msg); |
| 2443 | |
2539 | |
| 2444 | return unless @extra || length $msg; |
|
|
| 2445 | |
|
|
| 2446 | $color &= ~cf::NDI_UNIQUE; # just in case... |
2540 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
| 2447 | |
2541 | |
| 2448 | if (ref $channel) { |
2542 | if (ref $channel) { |
| 2449 | # send meta info to client, if not yet sent |
2543 | # send meta info to client, if not yet sent |
| 2450 | unless (exists $self->{channel}{$channel->{id}}) { |
2544 | unless (exists $self->{channel}{$channel->{id}}) { |
| 2451 | $self->{channel}{$channel->{id}} = $channel; |
2545 | $self->{channel}{$channel->{id}} = $channel; |
| 2452 | $self->ext_event (channel_info => %$channel); |
2546 | $self->ext_msg (channel_info => $channel); |
| 2453 | } |
2547 | } |
| 2454 | |
2548 | |
| 2455 | $channel = $channel->{id}; |
2549 | $channel = $channel->{id}; |
| 2456 | } |
2550 | } |
| 2457 | |
2551 | |
|
|
2552 | return unless @extra || length $msg; |
|
|
2553 | |
| 2458 | 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 | |
| 2459 | $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); |
2559 | $self->send_packet ("msg " . $self->{json_coder}->encode ( |
|
|
2560 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); |
| 2460 | } else { |
2561 | } else { |
| 2461 | # replace some tags by gcfclient-compatible ones |
|
|
| 2462 | for ($msg) { |
|
|
| 2463 | 1 while |
|
|
| 2464 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
| 2465 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
| 2466 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
| 2467 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
| 2468 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; |
|
|
| 2469 | } |
|
|
| 2470 | |
|
|
| 2471 | 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 | |
| 2472 | if (0 && $msg =~ /\[/) { |
2577 | if (0 && $msg =~ /\[/) { |
| 2473 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
2578 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
| 2474 | } else { |
2579 | } else { |
| 2475 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2580 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
| 2476 | $self->send_packet ("drawinfo $color $msg") |
2581 | $self->send_packet ("drawinfo $color $msg") |
| 2477 | } |
2582 | } |
| 2478 | } |
2583 | } |
| 2479 | } |
2584 | } |
| 2480 | } |
2585 | } |
| 2481 | |
2586 | |
| 2482 | =item $client->ext_event ($type, %msg) |
2587 | =item $client->ext_msg ($type, @msg) |
| 2483 | |
2588 | |
| 2484 | Sends an ext event to the client. |
2589 | Sends an ext event to the client. |
| 2485 | |
2590 | |
| 2486 | =cut |
2591 | =cut |
| 2487 | |
2592 | |
| 2488 | sub cf::client::ext_event($$%) { |
2593 | sub cf::client::ext_msg($$@) { |
| 2489 | my ($self, $type, %msg) = @_; |
2594 | my ($self, $type, @msg) = @_; |
| 2490 | |
2595 | |
| 2491 | return unless $self->extcmd; |
2596 | my $extcmd = $self->extcmd; |
| 2492 | |
2597 | |
|
|
2598 | if ($extcmd == 2) { |
|
|
2599 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
|
|
2600 | } elsif ($extcmd == 1) { # TODO: remove |
| 2493 | $msg{msgtype} = "event_$type"; |
2601 | push @msg, msgtype => "event_$type"; |
| 2494 | $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); |
2602 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2603 | } |
| 2495 | } |
2604 | } |
| 2496 | |
2605 | |
| 2497 | =item $success = $client->query ($flags, "text", \&cb) |
2606 | =item $success = $client->query ($flags, "text", \&cb) |
| 2498 | |
2607 | |
| 2499 | Queues a query to the client, calling the given callback with |
2608 | Queues a query to the client, calling the given callback with |
| … | |
… | |
| 2554 | my ($ns, $buf) = @_; |
2663 | my ($ns, $buf) = @_; |
| 2555 | |
2664 | |
| 2556 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
2665 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
| 2557 | |
2666 | |
| 2558 | if (ref $msg) { |
2667 | if (ref $msg) { |
|
|
2668 | my ($type, $reply, @payload) = |
|
|
2669 | "ARRAY" eq ref $msg |
|
|
2670 | ? @$msg |
|
|
2671 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
|
|
2672 | |
| 2559 | if (my $cb = $EXTICMD{$msg->{msgtype}}) { |
2673 | if (my $cb = $EXTICMD{$type}) { |
| 2560 | if (my %reply = $cb->($ns, $msg)) { |
2674 | my @reply = $cb->($ns, @payload); |
| 2561 | $reply{msgid} = $msg->{msgid}; |
2675 | |
| 2562 | $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); |
2676 | $ns->ext_reply ($reply, @reply) |
| 2563 | } |
2677 | if $reply; |
| 2564 | } |
2678 | } |
| 2565 | } else { |
2679 | } else { |
| 2566 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2680 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
| 2567 | } |
2681 | } |
| 2568 | |
2682 | |
| … | |
… | |
| 2616 | our $safe = new Safe "safe"; |
2730 | our $safe = new Safe "safe"; |
| 2617 | our $safe_hole = new Safe::Hole; |
2731 | our $safe_hole = new Safe::Hole; |
| 2618 | |
2732 | |
| 2619 | $SIG{FPE} = 'IGNORE'; |
2733 | $SIG{FPE} = 'IGNORE'; |
| 2620 | |
2734 | |
| 2621 | $safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); |
2735 | $safe->permit_only (Opcode::opset qw( |
|
|
2736 | :base_core :base_mem :base_orig :base_math |
|
|
2737 | grepstart grepwhile mapstart mapwhile |
|
|
2738 | sort time |
|
|
2739 | )); |
| 2622 | |
2740 | |
| 2623 | # here we export the classes and methods available to script code |
2741 | # here we export the classes and methods available to script code |
| 2624 | |
2742 | |
| 2625 | =pod |
2743 | =pod |
| 2626 | |
2744 | |
| 2627 | The following functions and methods are available within a safe environment: |
2745 | The following functions and methods are available within a safe environment: |
| 2628 | |
2746 | |
| 2629 | cf::object |
2747 | cf::object |
| 2630 | contr pay_amount pay_player map x y force_find force_add |
2748 | contr pay_amount pay_player map x y force_find force_add |
| 2631 | insert remove |
2749 | insert remove name archname title slaying race |
| 2632 | |
2750 | |
| 2633 | cf::object::player |
2751 | cf::object::player |
| 2634 | player |
2752 | player |
| 2635 | |
2753 | |
| 2636 | cf::player |
2754 | cf::player |
| … | |
… | |
| 2641 | |
2759 | |
| 2642 | =cut |
2760 | =cut |
| 2643 | |
2761 | |
| 2644 | for ( |
2762 | for ( |
| 2645 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2763 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
| 2646 | insert remove)], |
2764 | insert remove inv name archname title slaying race)], |
| 2647 | ["cf::object::player" => qw(player)], |
2765 | ["cf::object::player" => qw(player)], |
| 2648 | ["cf::player" => qw(peaceful)], |
2766 | ["cf::player" => qw(peaceful)], |
| 2649 | ["cf::map" => qw(trigger)], |
2767 | ["cf::map" => qw(trigger)], |
| 2650 | ) { |
2768 | ) { |
| 2651 | no strict 'refs'; |
2769 | no strict 'refs'; |
| … | |
… | |
| 2783 | # TODO: for gcfclient pleasure, we should give resources |
2901 | # TODO: for gcfclient pleasure, we should give resources |
| 2784 | # that gcfclient doesn't grok a >10000 face index. |
2902 | # that gcfclient doesn't grok a >10000 face index. |
| 2785 | my $res = $facedata->{resource}; |
2903 | my $res = $facedata->{resource}; |
| 2786 | my $enc = JSON::XS->new->utf8->canonical; |
2904 | my $enc = JSON::XS->new->utf8->canonical; |
| 2787 | |
2905 | |
|
|
2906 | my $soundconf = delete $res->{"res/sound.conf"}; |
|
|
2907 | |
| 2788 | while (my ($name, $info) = each %$res) { |
2908 | while (my ($name, $info) = each %$res) { |
| 2789 | my $meta = $enc->encode ({ |
2909 | my $meta = $enc->encode ({ |
| 2790 | name => $name, |
2910 | name => $name, |
| 2791 | type => $info->{type}, |
2911 | %{ $info->{meta} || {} }, |
| 2792 | copyright => $info->{copyright}, #TODO# |
|
|
| 2793 | }); |
2912 | }); |
| 2794 | |
2913 | |
| 2795 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
2914 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
| 2796 | |
2915 | |
| 2797 | if ($name =~ /\.jpg$/) { |
2916 | if ($info->{type} & 1) { |
| 2798 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack |
2917 | # prepend meta info |
| 2799 | cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack |
2918 | |
| 2800 | } else { |
|
|
| 2801 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
2919 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
| 2802 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
2920 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
| 2803 | |
2921 | |
| 2804 | cf::face::set_type $idx, 1; |
|
|
| 2805 | cf::face::set_data $idx, 0, $data, $chk; |
2922 | cf::face::set_data $idx, 0, $data, $chk; |
|
|
2923 | } else { |
|
|
2924 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; |
| 2806 | } |
2925 | } |
| 2807 | |
2926 | |
|
|
2927 | cf::face::set_type $idx, $info->{type}; |
|
|
2928 | |
| 2808 | cf::cede_to_tick; |
2929 | cf::cede_to_tick; |
| 2809 | } |
2930 | } |
|
|
2931 | |
|
|
2932 | if ($soundconf) { |
|
|
2933 | $soundconf = $enc->decode (delete $soundconf->{data}); |
|
|
2934 | |
|
|
2935 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
2936 | my $sound = $soundconf->{compat}[$_] |
|
|
2937 | or next; |
|
|
2938 | |
|
|
2939 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
2940 | cf::sound::set $sound->[0] => $face; |
|
|
2941 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
2942 | } |
|
|
2943 | |
|
|
2944 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
|
|
2945 | my $face = cf::face::find "sound/$v"; |
|
|
2946 | cf::sound::set $k => $face; |
|
|
2947 | } |
|
|
2948 | } |
| 2810 | } |
2949 | } |
| 2811 | |
2950 | |
| 2812 | 1 |
2951 | 1 |
| 2813 | } |
2952 | } |
|
|
2953 | |
|
|
2954 | register_exticmd fx_want => sub { |
|
|
2955 | my ($ns, $want) = @_; |
|
|
2956 | |
|
|
2957 | while (my ($k, $v) = each %$want) { |
|
|
2958 | $ns->fx_want ($k, $v); |
|
|
2959 | } |
|
|
2960 | }; |
| 2814 | |
2961 | |
| 2815 | sub reload_regions { |
2962 | sub reload_regions { |
| 2816 | load_resource_file "$MAPDIR/regions" |
2963 | load_resource_file "$MAPDIR/regions" |
| 2817 | or die "unable to load regions file\n"; |
2964 | or die "unable to load regions file\n"; |
| 2818 | |
2965 | |
