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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 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
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
… …
164=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
165 168
166These 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
167returns 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
168per 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.
169 178
170=back 179=back
171 180
172=cut 181=cut
173 182
… …
237 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238 $d 247 $d
239 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
240} 249}
241 250
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
245 252
246Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
247 254
248=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
249 256
250Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
251 258
252=cut 259=cut
253 260
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 262
256sub to_json ($) { $json_coder->encode ($_[0]) } 263sub to_json ($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 264sub from_json ($) { $json_coder->decode ($_[0]) }
258 265
259=item cf::lock_wait $string 266=item cf::lock_wait $string
… …
264 271
265Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
268returned. 275returned.
276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
269 279
270Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
272 282
273=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
… …
314 my $guard = Coro::guard { 324 my $guard = Coro::guard {
315 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
316 }; 326 };
317 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
318 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
319} 385}
320 386
321=item cf::async { BLOCK } 387=item cf::async { BLOCK }
322 388
323Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
413=cut 479=cut
414 480
415sub fork_call(&@) { 481sub fork_call(&@) {
416 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
417 483
418# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 484 # we seemingly have to make a local copy of the whole thing,
419# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
421 or die "pipe: $!";
422 487
423 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 489 reset_signals;
436 local $SIG{__WARN__}; 490 &$cb
437 local $SIG{__DIE__}; 491 }, @args;
438 eval {
439 close $fh1;
440 492
441 my @res = eval { $cb->(@args) }; 493 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443 };
444
445 warn $@ if $@;
446 _exit 0;
447 }
448} 494}
449 495
450=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
451 497
452Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
532 if (1) { 578 if (1) {
533 $md5 = 579 $md5 =
534 join "\x00", 580 join "\x00",
535 $processversion, 581 $processversion,
536 map { 582 map {
537 Coro::cede; 583 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 585 } 0.. $#$src;
540 586
541 587
542 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
848 "; 894 ";
849 die if $@; 895 die if $@;
850} 896}
851 897
852our $override; 898our $override;
853our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854 900
855sub override { 901sub override {
856 $override = 1; 902 $override = 1;
857 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
858} 904}
859 905
860sub do_invoke { 906sub do_invoke {
861 my $event = shift; 907 my $event = shift;
862 my $callbacks = shift; 908 my $callbacks = shift;
863 909
864 @invoke_results = (); 910 @INVOKE_RESULTS = ();
865 911
866 local $override; 912 local $override;
867 913
868 for (@$callbacks) { 914 for (@$callbacks) {
869 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
886 932
887Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
888 934
889This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
890removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
891results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 938
893=back 939=back
894 940
895=cut 941=cut
896 942
897############################################################################# 943#############################################################################
898# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
899 956
900sub reattach { 957sub reattach {
901 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 959 my ($obj) = @_;
903 960
… …
1087 cf::override; 1144 cf::override;
1088 }, 1145 },
1089 on_extcmd => sub { 1146 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1091 1148
1092 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1150
1094 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1100 } else { 1166 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1168 }
1103 1169
1104 cf::override; 1170 cf::override;
… …
1259 1325
1260 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1262 1328
1263 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1264 Coro::cede; 1330 cf::cede_to_tick;
1265} 1331}
1266 1332
1267sub new($) { 1333sub new($) {
1268 my ($login) = @_; 1334 my ($login) = @_;
1269 1335
… …
1273 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1274 1340
1275 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1276 1342
1277 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1278} 1354}
1279 1355
1280=item $pl->quit_character 1356=item $pl->quit_character
1281 1357
1282Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1387sub expand_cfpod { 1463sub expand_cfpod {
1388 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1389 1465
1390 # escape & and < 1466 # escape & and <
1391 s/&/&amp;/g; 1467 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1393 1469
1394 # this is buggy, it needs to properly take care of nested <'s 1470 # this is buggy, it needs to properly take care of nested <'s
1395 1471
1396 1 while 1472 1 while
1397 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1398 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1399 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1400 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401 # replace G<male|female> tags 1478 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1404 }ge 1481 }ge
1405 # replace H<hint text> 1482 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1407 1490
1408 # create single paragraphs (very hackish) 1491 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1492 s/(?<=\S)\n(?=\w)/ /g;
1410 1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1411 $_ 1500 $_
1412} 1501}
1413 1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507
1414=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1415 1509
1416Sends an ext reply to the player. 1510Sends an ext reply to the player.
1417 1511
1418=cut 1512=cut
1419 1513
1420sub ext_reply($$%) { 1514sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1422 1516
1423 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1518}
1426 1519
1427=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1428 1521
1429Sends an ext event to the client. 1522Sends an ext event to the client.
1430 1523
1431=cut 1524=cut
1432 1525
1433sub ext_event($$%) { 1526sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1435 1528
1436 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1437} 1530}
1438 1531
1439=head3 cf::region 1532=head3 cf::region
1440 1533
1441=over 4 1534=over 4
… …
1454 my ($path) = @_; 1547 my ($path) = @_;
1455 1548
1456 my ($match, $specificity); 1549 my ($match, $specificity);
1457 1550
1458 for my $region (list) { 1551 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1552 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1553 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1554 if $region->specificity > $specificity;
1462 } 1555 }
1463 } 1556 }
1464 1557
… …
1584 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1585 return $self; 1678 return $self;
1586 } 1679 }
1587 } 1680 }
1588 1681
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1683 ()
1591} 1684}
1592 1685
1593sub init { 1686sub init {
1594 my ($self) = @_; 1687 my ($self) = @_;
… …
1760 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1761 1854
1762 my $path = $self->{path}; 1855 my $path = $self->{path};
1763 1856
1764 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1765 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1766 1860
1767 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1768 1862
1769 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1770 1864
1771 $self->alloc; 1865 $self->alloc;
1772 1866
1773 $self->pre_load; 1867 $self->pre_load;
1774 Coro::cede; 1868 cf::cede_to_tick;
1775 1869
1776 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1777 or return; 1871 or return;
1778 1872
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1785 $self->clear_unique_items; 1879 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1787 } 1881 }
1788 } 1882 }
1789 1883
1790 Coro::cede; 1884 cf::cede_to_tick;
1791 # now do the right thing for maps 1885 # now do the right thing for maps
1792 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 1888 unless $self->difficulty;
1795 Coro::cede; 1889 cf::cede_to_tick;
1796 1890
1797 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 1892 $self->decay_objects;
1799 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1800 $self->update_buttons; 1894 $self->update_buttons;
1801 Coro::cede; 1895 cf::cede_to_tick;
1802 $self->set_darkness_map; 1896 $self->set_darkness_map;
1803 Coro::cede; 1897 cf::cede_to_tick;
1804 $self->activate; 1898 $self->activate;
1805 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1806 1903
1807 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 1905 }
1809 1906
1810 $self->post_load; 1907 $self->post_load;
… …
1821 1918
1822 $self 1919 $self
1823} 1920}
1824 1921
1825# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1826sub load_diag { 1923sub load_neighbours {
1827 my ($map) = @_; 1924 my ($map) = @_;
1828 1925
1829 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1830 1927
1831 for (0 .. 3) { 1928 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1833 or next; 1930 or next;
1834 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1835 or next; 1932 or next;
1836 $neigh->load; 1933 $neigh->load;
1837 1934
1935 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 1938 }
1841 1939
1842 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1844 or next; 1943 or next;
1845 $neigh->load; 1944 $neigh->load;
1846 } 1945 }
1847} 1946}
1848 1947
… …
1853} 1952}
1854 1953
1855sub do_load_sync { 1954sub do_load_sync {
1856 my ($map) = @_; 1955 my ($map) = @_;
1857 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1858 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1859} 1961}
1860 1962
1861our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1863 1965
1864sub find_async { 1966sub find_async {
1865 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1866 1968
1867 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1868 1970
1869 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871 } 1973 }
1872 1974
1873 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1874 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 1980 if (my $map = find $k) {
1878 or next;
1879 $map->load; 1981 $map->load if $v;
1982 }
1880 1983
1881 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1882 } 1985 }
1883 } 1986 }
1884 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1885 }; 1988 };
1886 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1889} 1992}
1890 1993
1891sub save { 1994sub save {
1892 my ($self) = @_; 1995 my ($self) = @_;
1893 1996
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 1998
1896 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1897 2000
1898 return unless $self->dirty; 2001 return unless $self->dirty;
1899 2002
… …
1922 my ($self) = @_; 2025 my ($self) = @_;
1923 2026
1924 # save first because save cedes 2027 # save first because save cedes
1925 $self->save; 2028 $self->save;
1926 2029
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2031
1929 return if $self->players; 2032 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1931 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1932 2035
… …
1984my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1985 2088
1986sub nuke { 2089sub nuke {
1987 my ($self) = @_; 2090 my ($self) = @_;
1988 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
1989 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
1990 2096
1991 $self->unlink_save; 2097 $self->unlink_save;
1992 2098
1993 bless $self, "cf::map"; 2099 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2104
1999 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2000 2107
2001 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2002} 2109}
2003 2110
2004=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2111 2218
2112 } else { 2219 } else {
2113 my $pl = $self->contr; 2220 my $pl = $self->contr;
2114 2221
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2223 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2225
2124 } else { 2226 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2127 } 2229 }
2128 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
2129} 2241}
2130 2242
2131=item $player_object->may ("access") 2243=item $player_object->may ("access")
2132 2244
2133Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
2212 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2215 2327
2216 $map->load; 2328 $map->load;
2217 $map->load_diag; 2329 $map->load_neighbours;
2218 2330
2219 return unless $self->contr->active; 2331 return unless $self->contr->active;
2220 $self->activate_recursive; 2332 $self->activate_recursive;
2221 2333
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
2224} 2336}
2225 2337
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2339
2228Moves the player to the given map-path and coordinates by first freezing 2340Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2341her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2342that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2343the new (success) or old (failed) map position. In either case, $done will
2344be called at the end of this process.
2232 2345
2233=cut 2346=cut
2234 2347
2235our $GOTOGEN; 2348our $GOTOGEN;
2236 2349
2237sub cf::object::player::goto { 2350sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2352
2240 # do generation counting so two concurrent goto's will be executed in-order 2353 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2355
2243 $self->enter_link; 2356 $self->enter_link;
… …
2263 2376
2264 if ($gen == $self->{_goto_generation}) { 2377 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2378 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2267 } 2380 }
2381
2382 $done->() if $done;
2268 })->prio (1); 2383 })->prio (1);
2269} 2384}
2270 2385
2271=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
2272 2387
… …
2341 my $hp = $exit->stats->hp; 2456 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2457 my $sp = $exit->stats->sp;
2343 2458
2344 $self->enter_link; 2459 $self->enter_link;
2345 2460
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
2464
2346 (async { 2465 (async {
2347 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2467 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2468 $self->goto ($slaying, $hp, $sp);
2350 2469
… …
2377 2496
2378 utf8::encode $text; 2497 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2499}
2381 2500
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2502
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2503Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 2504client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress 2505the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2388 2507
2389=cut 2508=cut
2390 2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2391sub cf::client::send_msg { 2525sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2527
2394 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2395 2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2541 }
2542
2543 $channel = $channel->{id};
2544 }
2545
2546 return unless @extra || length $msg;
2547
2396 if ($self->can_msg) { 2548 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2549 # default colour, mask it out
2550 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2551 if $color & cf::NDI_DEF;
2552
2553 $self->send_packet ("msg " . $self->{json_coder}->encode (
2554 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2555 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 if ($color >= 0) { 2556 if ($color >= 0) {
2557 # replace some tags by gcfclient-compatible ones
2558 for ($msg) {
2559 1 while
2560 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2561 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2562 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2563 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2564 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2565 }
2566
2567 $color &= cf::NDI_COLOR_MASK;
2568
2569 utf8::encode $msg;
2570
2410 if (0 && $msg =~ /\[/) { 2571 if (0 && $msg =~ /\[/) {
2572 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2574 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2576 $self->send_packet ("drawinfo $color $msg")
2415 } 2577 }
2416 } 2578 }
2417 } 2579 }
2418} 2580}
2419 2581
2420=item $client->ext_event ($type, %msg) 2582=item $client->ext_msg ($type, @msg)
2421 2583
2422Sends an ext event to the client. 2584Sends an ext event to the client.
2423 2585
2424=cut 2586=cut
2425 2587
2426sub cf::client::ext_event($$%) { 2588sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2589 my ($self, $type, @msg) = @_;
2428 2590
2591 if ($self->extcmd == 2) {
2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2593 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2594 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2596 }
2597}
2598
2599=item $client->ext_reply ($msgid, @msg)
2600
2601Sends an ext reply to the client.
2602
2603=cut
2604
2605sub cf::client::ext_reply($$@) {
2606 my ($self, $id, @msg) = @_;
2607
2608 if ($self->extcmd == 2) {
2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2610 } elsif ($self->extcmd == 1) {
2611 #TODO: version 1, remove
2612 unshift @msg, msgtype => "reply", msgid => $id;
2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2614 }
2431} 2615}
2432 2616
2433=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
2434 2618
2435Queues a query to the client, calling the given callback with 2619Queues a query to the client, calling the given callback with
… …
2458 2642
2459 1 2643 1
2460} 2644}
2461 2645
2462cf::client->attach ( 2646cf::client->attach (
2647 on_connect => sub {
2648 my ($ns) = @_;
2649
2650 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2651 },
2463 on_reply => sub { 2652 on_reply => sub {
2464 my ($ns, $msg) = @_; 2653 my ($ns, $msg) = @_;
2465 2654
2466 # this weird shuffling is so that direct followup queries 2655 # this weird shuffling is so that direct followup queries
2467 # get handled first 2656 # get handled first
… …
2482 } 2671 }
2483 }, 2672 },
2484 on_exticmd => sub { 2673 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2674 my ($ns, $buf) = @_;
2486 2675
2487 my $msg = eval { from_json $buf }; 2676 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2677
2489 if (ref $msg) { 2678 if (ref $msg) {
2679 my ($type, $reply, @payload) =
2680 "ARRAY" eq ref $msg
2681 ? @$msg
2682 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2683
2684 my @reply;
2685
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2686 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2687 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2496 } else { 2693 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2695 }
2499 2696
2500 cf::override; 2697 cf::override;
… …
2547our $safe = new Safe "safe"; 2744our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 2745our $safe_hole = new Safe::Hole;
2549 2746
2550$SIG{FPE} = 'IGNORE'; 2747$SIG{FPE} = 'IGNORE';
2551 2748
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2749$safe->permit_only (Opcode::opset qw(
2750 :base_core :base_mem :base_orig :base_math
2751 grepstart grepwhile mapstart mapwhile
2752 sort time
2753));
2553 2754
2554# here we export the classes and methods available to script code 2755# here we export the classes and methods available to script code
2555 2756
2556=pod 2757=pod
2557 2758
2558The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2559 2760
2560 cf::object contr pay_amount pay_player map 2761 cf::object
2762 contr pay_amount pay_player map x y force_find force_add
2763 insert remove name archname title slaying race decrease_ob_nr
2764
2561 cf::object::player player 2765 cf::object::player
2562 cf::player peaceful 2766 player
2563 cf::map trigger 2767
2768 cf::player
2769 peaceful
2770
2771 cf::map
2772 trigger
2564 2773
2565=cut 2774=cut
2566 2775
2567for ( 2776for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2778 insert remove inv name archname title slaying race
2779 decrease_ob_nr)],
2569 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2572) { 2783) {
2573 no strict 'refs'; 2784 no strict 'refs';
… …
2649# the server's init and main functions 2860# the server's init and main functions
2650 2861
2651sub load_facedata($) { 2862sub load_facedata($) {
2652 my ($path) = @_; 2863 my ($path) = @_;
2653 2864
2865 # HACK to clear player env face cache, we need some signal framework
2866 # for this (global event?)
2867 %ext::player_env::MUSIC_FACE_CACHE = ();
2868
2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2870
2654 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2655 2872
2656 my $facedata; 2873 my $facedata;
2657 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 2875 or die "$path: $!";
… …
2660 $facedata = Coro::Storable::thaw $facedata; 2877 $facedata = Coro::Storable::thaw $facedata;
2661 2878
2662 $facedata->{version} == 2 2879 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 2881
2882 # patch in the exptable
2883 $facedata->{resource}{"res/exp_table"} = {
2884 type => FT_RSRC,
2885 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2886 };
2887 cf::cede_to_tick;
2888
2665 { 2889 {
2666 my $faces = $facedata->{faceinfo}; 2890 my $faces = $facedata->{faceinfo};
2667 2891
2668 while (my ($face, $info) = each %$faces) { 2892 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2894 cf::face::set_visibility $idx, $info->{visibility};
2895 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 2898
2899 cf::cede_to_tick;
2674 } 2900 }
2675 2901
2676 while (my ($face, $info) = each %$faces) { 2902 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2903 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2904 my $idx = cf::face::find $face
2679 or next; 2905 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2906 if (my $smooth = cf::face::find $info->{smooth}) {
2907 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2908 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2909 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2910 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2911 }
2685 Coro::cede; 2912
2913 cf::cede_to_tick;
2686 } 2914 }
2687 } 2915 }
2688 2916
2689 { 2917 {
2690 my $anims = $facedata->{animinfo}; 2918 my $anims = $facedata->{animinfo};
2691 2919
2692 while (my ($anim, $info) = each %$anims) { 2920 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2921 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2922 cf::cede_to_tick;
2695 } 2923 }
2696 2924
2697 cf::anim::invalidate_all; # d'oh 2925 cf::anim::invalidate_all; # d'oh
2698 } 2926 }
2699 2927
2928 {
2929 # TODO: for gcfclient pleasure, we should give resources
2930 # that gcfclient doesn't grok a >10000 face index.
2931 my $res = $facedata->{resource};
2932
2933 my $soundconf = delete $res->{"res/sound.conf"};
2934
2935 while (my ($name, $info) = each %$res) {
2936 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data;
2938
2939 if ($info->{type} & 1) {
2940 # prepend meta info
2941
2942 my $meta = $enc->encode ({
2943 name => $name,
2944 %{ $info->{meta} || {} },
2945 });
2946
2947 $data = pack "(w/a*)*", $meta, $info->{data};
2948 } else {
2949 $data = $info->{data};
2950 }
2951
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2953 cf::face::set_type $idx, $info->{type};
2954
2955 cf::cede_to_tick;
2956 }
2957
2958 if ($soundconf) {
2959 $soundconf = $enc->decode (delete $soundconf->{data});
2960
2961 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2962 my $sound = $soundconf->{compat}[$_]
2963 or next;
2964
2965 my $face = cf::face::find "sound/$sound->[1]";
2966 cf::sound::set $sound->[0] => $face;
2967 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2968 }
2969
2970 while (my ($k, $v) = each %{$soundconf->{event}}) {
2971 my $face = cf::face::find "sound/$v";
2972 cf::sound::set $k => $face;
2973 }
2974 }
2975 }
2976
2700 1 2977 1
2701} 2978}
2702 2979
2980register_exticmd fx_want => sub {
2981 my ($ns, $want) = @_;
2982
2983 while (my ($k, $v) = each %$want) {
2984 $ns->fx_want ($k, $v);
2985 }
2986};
2987
2703sub reload_regions { 2988sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2704 load_resource_file "$MAPDIR/regions" 2993 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 2994 or die "unable to load regions file\n";
2995
2996 for (cf::region::list) {
2997 $_->{match} = qr/$_->{match}/
2998 if exists $_->{match};
2999 }
2706} 3000}
2707 3001
2708sub reload_facedata { 3002sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3003 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3004 or die "unable to load facedata\n";
2711} 3005}
2712 3006
2713sub reload_archetypes { 3007sub reload_archetypes {
3008 load_resource_file "$DATADIR/archetypes"
3009 or die "unable to load archetypes\n";
3010 #d# NEED to laod twice to resolve forward references
3011 # this really needs to be done in an extra post-pass
3012 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 3013 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 3014 or die "unable to load archetypes\n";
2716} 3015}
2717 3016
2718sub reload_treasures { 3017sub reload_treasures {
… …
2734 3033
2735sub init { 3034sub init {
2736 reload_resources; 3035 reload_resources;
2737} 3036}
2738 3037
2739sub cfg_load { 3038sub reload_config {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3040 or return;
2742 3041
2743 local $/; 3042 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
… …
2764 (async { 3063 (async {
2765 Event::one_event; 3064 Event::one_event;
2766 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
2767 }; 3066 };
2768 3067
2769 cfg_load; 3068 reload_config;
2770 db_init; 3069 db_init;
2771 load_extensions; 3070 load_extensions;
2772 3071
2773 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
2774 Event::loop; 3073 Event::loop;
… …
2967 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
2968 require cf; 3267 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3269
2971 warn "loading config and database again"; 3270 warn "loading config and database again";
2972 cf::cfg_load; 3271 cf::reload_config;
2973 3272
2974 warn "loading extensions"; 3273 warn "loading extensions";
2975 cf::load_extensions; 3274 cf::load_extensions;
2976 3275
2977 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";

Diff Legend

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