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.288 by root, Mon Jun 25 07:40:53 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
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::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
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
166 168
167These 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
168returns 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
169per 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.
170 178
171=back 179=back
172 180
173=cut 181=cut
174 182
… …
248 256
249Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
250 258
251=cut 259=cut
252 260
253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 262
255sub to_json ($) { $json_coder->encode ($_[0]) } 263sub to_json ($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 264sub from_json ($) { $json_coder->decode ($_[0]) }
257 265
258=item cf::lock_wait $string 266=item cf::lock_wait $string
… …
263 271
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
267returned. 275returned.
276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
268 279
269Lock 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
270uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
271 282
272=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
… …
313 my $guard = Coro::guard { 324 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
315 }; 326 };
316 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
317 $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;
318} 385}
319 386
320=item cf::async { BLOCK } 387=item cf::async { BLOCK }
321 388
322Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
412=cut 479=cut
413 480
414sub fork_call(&@) { 481sub fork_call(&@) {
415 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
416 483
417# 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,
418# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
420 or die "pipe: $!";
421 487
422 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 489 reset_signals;
435 local $SIG{__WARN__}; 490 &$cb
436 local $SIG{__DIE__}; 491 }, @args;
437 eval {
438 close $fh1;
439 492
440 my @res = eval { $cb->(@args) }; 493 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 494}
448 495
449=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
450 497
451Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
531 if (1) { 578 if (1) {
532 $md5 = 579 $md5 =
533 join "\x00", 580 join "\x00",
534 $processversion, 581 $processversion,
535 map { 582 map {
536 Coro::cede; 583 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 585 } 0.. $#$src;
539 586
540 587
541 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
847 "; 894 ";
848 die if $@; 895 die if $@;
849} 896}
850 897
851our $override; 898our $override;
852our @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?
853 900
854sub override { 901sub override {
855 $override = 1; 902 $override = 1;
856 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
857} 904}
858 905
859sub do_invoke { 906sub do_invoke {
860 my $event = shift; 907 my $event = shift;
861 my $callbacks = shift; 908 my $callbacks = shift;
862 909
863 @invoke_results = (); 910 @INVOKE_RESULTS = ();
864 911
865 local $override; 912 local $override;
866 913
867 for (@$callbacks) { 914 for (@$callbacks) {
868 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
885 932
886Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
887 934
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 938
892=back 939=back
893 940
894=cut 941=cut
895 942
896############################################################################# 943#############################################################################
897# 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}
898 956
899sub reattach { 957sub reattach {
900 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 959 my ($obj) = @_;
902 960
… …
1086 cf::override; 1144 cf::override;
1087 }, 1145 },
1088 on_extcmd => sub { 1146 on_extcmd => sub {
1089 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1090 1148
1091 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1150
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1099 } else { 1166 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1168 }
1102 1169
1103 cf::override; 1170 cf::override;
… …
1258 1325
1259 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1261 1328
1262 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1263 Coro::cede; 1330 cf::cede_to_tick;
1264} 1331}
1265 1332
1266sub new($) { 1333sub new($) {
1267 my ($login) = @_; 1334 my ($login) = @_;
1268 1335
… …
1272 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1273 1340
1274 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1275 1342
1276 $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 (@_);
1277} 1354}
1278 1355
1279=item $pl->quit_character 1356=item $pl->quit_character
1280 1357
1281Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1386sub expand_cfpod { 1463sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1388 1465
1389 # escape & and < 1466 # escape & and <
1390 s/&/&amp;/g; 1467 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1392 1469
1393 # 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
1394 1471
1395 1 while 1472 1 while
1396 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400 # replace G<male|female> tags 1478 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1403 }ge 1481 }ge
1404 # replace H<hint text> 1482 # replace H<hint text>
1405 || 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;
1406 1490
1407 # create single paragraphs (very hackish) 1491 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g; 1492 s/(?<=\S)\n(?=\w)/ /g;
1409 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
1410 $_ 1500 $_
1411} 1501}
1412 1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507
1413=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1414 1509
1415Sends an ext reply to the player. 1510Sends an ext reply to the player.
1416 1511
1417=cut 1512=cut
1418 1513
1419sub ext_reply($$%) { 1514sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1421 1516
1422 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . cf::to_json \%msg);
1424} 1518}
1425 1519
1426=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1427 1521
1428Sends an ext event to the client. 1522Sends an ext event to the client.
1429 1523
1430=cut 1524=cut
1431 1525
1432sub ext_event($$%) { 1526sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1434 1528
1435 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1436} 1530}
1437 1531
1438=head3 cf::region 1532=head3 cf::region
1439 1533
1440=over 4 1534=over 4
… …
1453 my ($path) = @_; 1547 my ($path) = @_;
1454 1548
1455 my ($match, $specificity); 1549 my ($match, $specificity);
1456 1550
1457 for my $region (list) { 1551 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1552 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1553 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1554 if $region->specificity > $specificity;
1461 } 1555 }
1462 } 1556 }
1463 1557
… …
1583 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1584 return $self; 1678 return $self;
1585 } 1679 }
1586 } 1680 }
1587 1681
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1683 ()
1590} 1684}
1591 1685
1592sub init { 1686sub init {
1593 my ($self) = @_; 1687 my ($self) = @_;
… …
1759 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1760 1854
1761 my $path = $self->{path}; 1855 my $path = $self->{path};
1762 1856
1763 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1764 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1765 1860
1766 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1767 1862
1768 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1769 1864
1770 $self->alloc; 1865 $self->alloc;
1771 1866
1772 $self->pre_load; 1867 $self->pre_load;
1773 Coro::cede; 1868 cf::cede_to_tick;
1774 1869
1775 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1776 or return; 1871 or return;
1777 1872
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1784 $self->clear_unique_items; 1879 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1786 } 1881 }
1787 } 1882 }
1788 1883
1789 Coro::cede; 1884 cf::cede_to_tick;
1790 # now do the right thing for maps 1885 # now do the right thing for maps
1791 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 1888 unless $self->difficulty;
1794 Coro::cede; 1889 cf::cede_to_tick;
1795 1890
1796 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 1892 $self->decay_objects;
1798 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1799 $self->update_buttons; 1894 $self->update_buttons;
1800 Coro::cede; 1895 cf::cede_to_tick;
1801 $self->set_darkness_map; 1896 $self->set_darkness_map;
1802 Coro::cede; 1897 cf::cede_to_tick;
1803 $self->activate; 1898 $self->activate;
1804 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1805 1903
1806 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1807 } 1905 }
1808 1906
1809 $self->post_load; 1907 $self->post_load;
… …
1820 1918
1821 $self 1919 $self
1822} 1920}
1823 1921
1824# 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
1825sub load_diag { 1923sub load_neighbours {
1826 my ($map) = @_; 1924 my ($map) = @_;
1827 1925
1828 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1829 1927
1830 for (0 .. 3) { 1928 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1832 or next; 1930 or next;
1833 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1834 or next; 1932 or next;
1835 $neigh->load; 1933 $neigh->load;
1836 1934
1935 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 1938 }
1840 1939
1841 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1843 or next; 1943 or next;
1844 $neigh->load; 1944 $neigh->load;
1845 } 1945 }
1846} 1946}
1847 1947
… …
1852} 1952}
1853 1953
1854sub do_load_sync { 1954sub do_load_sync {
1855 my ($map) = @_; 1955 my ($map) = @_;
1856 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1857 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1858} 1961}
1859 1962
1860our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1862 1965
1863sub find_async { 1966sub find_async {
1864 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1865 1968
1866 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1867 1970
1868 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1870 } 1973 }
1871 1974
1872 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1873 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1874 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 1980 if (my $map = find $k) {
1877 or next;
1878 $map->load; 1981 $map->load if $v;
1982 }
1879 1983
1880 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1881 } 1985 }
1882 } 1986 }
1883 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1884 }; 1988 };
1885 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1888} 1992}
1889 1993
1890sub save { 1994sub save {
1891 my ($self) = @_; 1995 my ($self) = @_;
1892 1996
1893 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1894 1998
1895 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1896 2000
1897 return unless $self->dirty; 2001 return unless $self->dirty;
1898 2002
… …
1921 my ($self) = @_; 2025 my ($self) = @_;
1922 2026
1923 # save first because save cedes 2027 # save first because save cedes
1924 $self->save; 2028 $self->save;
1925 2029
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2031
1928 return if $self->players; 2032 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1930 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1931 2035
… …
1983my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1984 2088
1985sub nuke { 2089sub nuke {
1986 my ($self) = @_; 2090 my ($self) = @_;
1987 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
1988 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
1989 2096
1990 $self->unlink_save; 2097 $self->unlink_save;
1991 2098
1992 bless $self, "cf::map"; 2099 bless $self, "cf::map";
1993 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2104
1998 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
1999 2107
2000 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2001} 2109}
2002 2110
2003=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2110 2218
2111 } else { 2219 } else {
2112 my $pl = $self->contr; 2220 my $pl = $self->contr;
2113 2221
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2223 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2225
2123 } else { 2226 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2126 } 2229 }
2127 } 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 (@_);
2128} 2241}
2129 2242
2130=item $player_object->may ("access") 2243=item $player_object->may ("access")
2131 2244
2132Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
2211 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2214 2327
2215 $map->load; 2328 $map->load;
2216 $map->load_diag; 2329 $map->load_neighbours;
2217 2330
2218 return unless $self->contr->active; 2331 return unless $self->contr->active;
2219 $self->activate_recursive; 2332 $self->activate_recursive;
2220 2333
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
2223} 2336}
2224 2337
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2339
2227Moves 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
2228her, loading and preparing them map, calling the provided $check callback 2341her, loading and preparing them map, calling the provided $check callback
2229that 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
2230the 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.
2231 2345
2232=cut 2346=cut
2233 2347
2234our $GOTOGEN; 2348our $GOTOGEN;
2235 2349
2236sub cf::object::player::goto { 2350sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2352
2239 # 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
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2355
2242 $self->enter_link; 2356 $self->enter_link;
… …
2262 2376
2263 if ($gen == $self->{_goto_generation}) { 2377 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2378 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2266 } 2380 }
2381
2382 $done->() if $done;
2267 })->prio (1); 2383 })->prio (1);
2268} 2384}
2269 2385
2270=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
2271 2387
… …
2340 my $hp = $exit->stats->hp; 2456 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp; 2457 my $sp = $exit->stats->sp;
2342 2458
2343 $self->enter_link; 2459 $self->enter_link;
2344 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
2345 (async { 2465 (async {
2346 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
2347 unless (eval { 2467 unless (eval {
2348 $self->goto ($slaying, $hp, $sp); 2468 $self->goto ($slaying, $hp, $sp);
2349 2469
… …
2376 2496
2377 utf8::encode $text; 2497 utf8::encode $text;
2378 $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);
2379} 2499}
2380 2500
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2502
2383Send 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
2384client 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
2385the 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
2386the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2387 2507
2388=cut 2508=cut
2389 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
2390sub cf::client::send_msg { 2525sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2527
2393 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2394 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
2395 if ($self->can_msg) { 2548 if ($self->can_msg) {
2396 $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]));
2397 } else { 2555 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 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
2409 if (0 && $msg =~ /\[/) { 2571 if (0 && $msg =~ /\[/) {
2572 # COMMAND/INFO
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2411 } else { 2574 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg") 2576 $self->send_packet ("drawinfo $color $msg")
2414 } 2577 }
2415 } 2578 }
2416 } 2579 }
2417} 2580}
2418 2581
2419=item $client->ext_event ($type, %msg) 2582=item $client->ext_msg ($type, @msg)
2420 2583
2421Sends an ext event to the client. 2584Sends an ext event to the client.
2422 2585
2423=cut 2586=cut
2424 2587
2425sub cf::client::ext_event($$%) { 2588sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2589 my ($self, $type, @msg) = @_;
2427 2590
2591 if ($self->extcmd == 2) {
2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2593 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 2594 push @msg, msgtype => "event_$type";
2429 $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 }
2430} 2615}
2431 2616
2432=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
2433 2618
2434Queues a query to the client, calling the given callback with 2619Queues a query to the client, calling the given callback with
… …
2457 2642
2458 1 2643 1
2459} 2644}
2460 2645
2461cf::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 },
2462 on_reply => sub { 2652 on_reply => sub {
2463 my ($ns, $msg) = @_; 2653 my ($ns, $msg) = @_;
2464 2654
2465 # this weird shuffling is so that direct followup queries 2655 # this weird shuffling is so that direct followup queries
2466 # get handled first 2656 # get handled first
… …
2481 } 2671 }
2482 }, 2672 },
2483 on_exticmd => sub { 2673 on_exticmd => sub {
2484 my ($ns, $buf) = @_; 2674 my ($ns, $buf) = @_;
2485 2675
2486 my $msg = eval { from_json $buf }; 2676 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487 2677
2488 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
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2686 if (my $cb = $EXTICMD{$type}) {
2490 if (my %reply = $cb->($ns, $msg)) { 2687 @reply = $cb->($ns, @payload);
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 } 2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2495 } else { 2693 } else {
2496 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";
2497 } 2695 }
2498 2696
2499 cf::override; 2697 cf::override;
… …
2546our $safe = new Safe "safe"; 2744our $safe = new Safe "safe";
2547our $safe_hole = new Safe::Hole; 2745our $safe_hole = new Safe::Hole;
2548 2746
2549$SIG{FPE} = 'IGNORE'; 2747$SIG{FPE} = 'IGNORE';
2550 2748
2551$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));
2552 2754
2553# here we export the classes and methods available to script code 2755# here we export the classes and methods available to script code
2554 2756
2555=pod 2757=pod
2556 2758
2557The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2558 2760
2559 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
2560 cf::object::player player 2765 cf::object::player
2561 cf::player peaceful 2766 player
2562 cf::map trigger 2767
2768 cf::player
2769 peaceful
2770
2771 cf::map
2772 trigger
2563 2773
2564=cut 2774=cut
2565 2775
2566for ( 2776for (
2567 ["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)],
2568 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2569 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2570 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2571) { 2783) {
2572 no strict 'refs'; 2784 no strict 'refs';
… …
2648# the server's init and main functions 2860# the server's init and main functions
2649 2861
2650sub load_facedata($) { 2862sub load_facedata($) {
2651 my ($path) = @_; 2863 my ($path) = @_;
2652 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
2653 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2654 2872
2655 my $facedata; 2873 my $facedata;
2656 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
2657 or die "$path: $!"; 2875 or die "$path: $!";
… …
2659 $facedata = Coro::Storable::thaw $facedata; 2877 $facedata = Coro::Storable::thaw $facedata;
2660 2878
2661 $facedata->{version} == 2 2879 $facedata->{version} == 2
2662 or cf::cleanup "$path: version mismatch, cannot proceed."; 2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2663 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
2664 { 2889 {
2665 my $faces = $facedata->{faceinfo}; 2890 my $faces = $facedata->{faceinfo};
2666 2891
2667 while (my ($face, $info) = each %$faces) { 2892 while (my ($face, $info) = each %$faces) {
2668 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2894 cf::face::set_visibility $idx, $info->{visibility};
2895 cf::face::set_magicmap $idx, $info->{magicmap};
2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2672 Coro::cede; 2898
2899 cf::cede_to_tick;
2673 } 2900 }
2674 2901
2675 while (my ($face, $info) = each %$faces) { 2902 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth}; 2903 next unless $info->{smooth};
2677 my $idx = cf::face::find $face 2904 my $idx = cf::face::find $face
2678 or next; 2905 or next;
2679 if (my $smooth = cf::face::find $info->{smooth}) { 2906 if (my $smooth = cf::face::find $info->{smooth}) {
2907 cf::face::set_smooth $idx, $smooth;
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2908 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681 } else { 2909 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2910 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 } 2911 }
2684 Coro::cede; 2912
2913 cf::cede_to_tick;
2685 } 2914 }
2686 } 2915 }
2687 2916
2688 { 2917 {
2689 my $anims = $facedata->{animinfo}; 2918 my $anims = $facedata->{animinfo};
2690 2919
2691 while (my ($anim, $info) = each %$anims) { 2920 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2921 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede; 2922 cf::cede_to_tick;
2694 } 2923 }
2695 2924
2696 cf::anim::invalidate_all; # d'oh 2925 cf::anim::invalidate_all; # d'oh
2697 } 2926 }
2698 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
2699 1 2977 1
2700} 2978}
2701 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
2702sub 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
2703 load_resource_file "$MAPDIR/regions" 2993 load_resource_file "$MAPDIR/regions"
2704 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 }
2705} 3000}
2706 3001
2707sub reload_facedata { 3002sub reload_facedata {
2708 load_facedata "$DATADIR/facedata" 3003 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n"; 3004 or die "unable to load facedata\n";
2710} 3005}
2711 3006
2712sub 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)
2713 load_resource_file "$DATADIR/archetypes" 3013 load_resource_file "$DATADIR/archetypes"
2714 or die "unable to load archetypes\n"; 3014 or die "unable to load archetypes\n";
2715} 3015}
2716 3016
2717sub reload_treasures { 3017sub reload_treasures {
… …
2733 3033
2734sub init { 3034sub init {
2735 reload_resources; 3035 reload_resources;
2736} 3036}
2737 3037
2738sub cfg_load { 3038sub reload_config {
2739 open my $fh, "<:utf8", "$CONFDIR/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2740 or return; 3040 or return;
2741 3041
2742 local $/; 3042 local $/;
2743 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
… …
2763 (async { 3063 (async {
2764 Event::one_event; 3064 Event::one_event;
2765 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
2766 }; 3066 };
2767 3067
2768 cfg_load; 3068 reload_config;
2769 db_init; 3069 db_init;
2770 load_extensions; 3070 load_extensions;
2771 3071
2772 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
2773 Event::loop; 3073 Event::loop;
… …
2966 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
2967 require cf; 3267 require cf;
2968 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2969 3269
2970 warn "loading config and database again"; 3270 warn "loading config and database again";
2971 cf::cfg_load; 3271 cf::reload_config;
2972 3272
2973 warn "loading extensions"; 3273 warn "loading extensions";
2974 cf::load_extensions; 3274 cf::load_extensions;
2975 3275
2976 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";

Diff Legend

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