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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.354 by root, Sun Sep 2 12:26:54 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
… …
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.
268 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
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
273 284
… …
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
… …
1089 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1090 1148
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($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
… …
1336 or return []; 1413 or return [];
1337 1414
1338 my @logins; 1415 my @logins;
1339 1416
1340 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1418 my $path = path $login;
1419
1420 # a .pst is a dead give-away for a valid player
1421 unless (-e "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1423 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1424 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 }
1344 1426
1345 utf8::decode $login; 1427 utf8::decode $login;
1346 push @logins, $login; 1428 push @logins, $login;
1347 } 1429 }
1348 1430
… …
1386sub expand_cfpod { 1468sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1469 ((my $self), (local $_)) = @_;
1388 1470
1389 # escape & and < 1471 # escape & and <
1390 s/&/&amp;/g; 1472 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g; 1473 s/(?<![BIUGHT])</&lt;/g;
1392 1474
1393 # this is buggy, it needs to properly take care of nested <'s 1475 # this is buggy, it needs to properly take care of nested <'s
1394 1476
1395 1 while 1477 1 while
1396 # replace B<>, I<>, U<> etc. 1478 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1479 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400 # replace G<male|female> tags 1483 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1484 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1485 $self->gender ? $2 : $1
1403 }ge 1486 }ge
1404 # replace H<hint text> 1487 # replace H<hint text>
… …
1412 1495
1413 # create single paragraphs (very hackish) 1496 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1497 s/(?<=\S)\n(?=\w)/ /g;
1415 1498
1416 # compress some whitespace 1499 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1500 s/\s+\n/\n/g; # ws line-ends
1501 s/\n\n+/\n/g; # double lines
1502 s/^\n+//; # beginning lines
1503 s/\n+$//; # ending lines
1418 1504
1419 $_ 1505 $_
1420} 1506}
1421 1507
1422sub hintmode { 1508sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1509 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1510 $_[0]{hintmode}
1426} 1511}
1427 1512
1428=item $player->ext_reply ($msgid, %msg) 1513=item $player->ext_reply ($msgid, @msg)
1429 1514
1430Sends an ext reply to the player. 1515Sends an ext reply to the player.
1431 1516
1432=cut 1517=cut
1433 1518
1434sub ext_reply($$%) { 1519sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1520 my ($self, $id, @msg) = @_;
1436 1521
1437 $msg{msgid} = $id; 1522 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1523}
1440 1524
1441=item $player->ext_event ($type, %msg) 1525=item $player->ext_msg ($type, @msg)
1442 1526
1443Sends an ext event to the client. 1527Sends an ext event to the client.
1444 1528
1445=cut 1529=cut
1446 1530
1447sub ext_event($$%) { 1531sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1532 my ($self, $type, @msg) = @_;
1449 1533
1450 $self->ns->ext_event ($type, %msg); 1534 $self->ns->ext_msg ($type, @msg);
1451} 1535}
1452 1536
1453=head3 cf::region 1537=head3 cf::region
1454 1538
1455=over 4 1539=over 4
… …
1468 my ($path) = @_; 1552 my ($path) = @_;
1469 1553
1470 my ($match, $specificity); 1554 my ($match, $specificity);
1471 1555
1472 for my $region (list) { 1556 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1557 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1558 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1559 if $region->specificity > $specificity;
1476 } 1560 }
1477 } 1561 }
1478 1562
… …
1598 $self->init; # pass $1 etc. 1682 $self->init; # pass $1 etc.
1599 return $self; 1683 return $self;
1600 } 1684 }
1601 } 1685 }
1602 1686
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1687 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1688 ()
1605} 1689}
1606 1690
1607sub init { 1691sub init {
1608 my ($self) = @_; 1692 my ($self) = @_;
… …
1774 local $self->{deny_reset} = 1; # loading can take a long time 1858 local $self->{deny_reset} = 1; # loading can take a long time
1775 1859
1776 my $path = $self->{path}; 1860 my $path = $self->{path};
1777 1861
1778 { 1862 {
1863 my $guard1 = cf::lock_acquire "map_data:$path";
1779 my $guard = cf::lock_acquire "map_load:$path"; 1864 my $guard2 = cf::lock_acquire "map_load:$path";
1780 1865
1781 return if $self->in_memory != cf::MAP_SWAPPED; 1866 return if $self->in_memory != cf::MAP_SWAPPED;
1782 1867
1783 $self->in_memory (cf::MAP_LOADING); 1868 $self->in_memory (cf::MAP_LOADING);
1784 1869
1785 $self->alloc; 1870 $self->alloc;
1786 1871
1787 $self->pre_load; 1872 $self->pre_load;
1788 Coro::cede; 1873 cf::cede_to_tick;
1789 1874
1790 $self->_load_objects ($self->{load_path}, 1) 1875 $self->_load_objects ($self->{load_path}, 1)
1791 or return; 1876 or return;
1792 1877
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1799 $self->clear_unique_items; 1884 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 1885 $self->_load_objects ($uniq, 0);
1801 } 1886 }
1802 } 1887 }
1803 1888
1804 Coro::cede; 1889 cf::cede_to_tick;
1805 # now do the right thing for maps 1890 # now do the right thing for maps
1806 $self->link_multipart_objects; 1891 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 1892 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 1893 unless $self->difficulty;
1809 Coro::cede; 1894 cf::cede_to_tick;
1810 1895
1811 unless ($self->{deny_activate}) { 1896 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 1897 $self->decay_objects;
1813 $self->fix_auto_apply; 1898 $self->fix_auto_apply;
1814 $self->update_buttons; 1899 $self->update_buttons;
1815 Coro::cede; 1900 cf::cede_to_tick;
1816 $self->set_darkness_map; 1901 $self->set_darkness_map;
1817 Coro::cede; 1902 cf::cede_to_tick;
1818 $self->activate; 1903 $self->activate;
1819 } 1904 }
1905
1906 $self->{last_save} = $cf::RUNTIME;
1907 $self->last_access ($cf::RUNTIME);
1820 1908
1821 $self->in_memory (cf::MAP_IN_MEMORY); 1909 $self->in_memory (cf::MAP_IN_MEMORY);
1822 } 1910 }
1823 1911
1824 $self->post_load; 1912 $self->post_load;
… …
1835 1923
1836 $self 1924 $self
1837} 1925}
1838 1926
1839# find and load all maps in the 3x3 area around a map 1927# find and load all maps in the 3x3 area around a map
1840sub load_diag { 1928sub load_neighbours {
1841 my ($map) = @_; 1929 my ($map) = @_;
1842 1930
1843 my @diag; # diagonal neighbours 1931 my @neigh; # diagonal neighbours
1844 1932
1845 for (0 .. 3) { 1933 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 1934 my $neigh = $map->tile_path ($_)
1847 or next; 1935 or next;
1848 $neigh = find $neigh, $map 1936 $neigh = find $neigh, $map
1849 or next; 1937 or next;
1850 $neigh->load; 1938 $neigh->load;
1851 1939
1940 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1941 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1942 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 1943 }
1855 1944
1856 for (@diag) { 1945 for (grep defined $_->[0], @neigh) {
1946 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 1947 my $neigh = find $path, $origin
1858 or next; 1948 or next;
1859 $neigh->load; 1949 $neigh->load;
1860 } 1950 }
1861} 1951}
1862 1952
… …
1867} 1957}
1868 1958
1869sub do_load_sync { 1959sub do_load_sync {
1870 my ($map) = @_; 1960 my ($map) = @_;
1871 1961
1962 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1963 if $Coro::current == $Coro::main;
1964
1872 cf::sync_job { $map->load }; 1965 cf::sync_job { $map->load };
1873} 1966}
1874 1967
1875our %MAP_PREFETCH; 1968our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 1969our $MAP_PREFETCHER = undef;
1877 1970
1878sub find_async { 1971sub find_async {
1879 my ($path, $origin) = @_; 1972 my ($path, $origin, $load) = @_;
1880 1973
1881 $path = normalise $path, $origin && $origin->{path}; 1974 $path = normalise $path, $origin && $origin->{path};
1882 1975
1883 if (my $map = $cf::MAP{$path}) { 1976 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1885 } 1978 }
1886 1979
1887 undef $MAP_PREFETCH{$path}; 1980 $MAP_PREFETCH{$path} |= $load;
1981
1888 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1889 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 1984 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 1985 if (my $map = find $k) {
1892 or next;
1893 $map->load; 1986 $map->load if $v;
1987 }
1894 1988
1895 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$k};
1896 } 1990 }
1897 } 1991 }
1898 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
1899 }; 1993 };
1900 $MAP_PREFETCHER->prio (6); 1994 $MAP_PREFETCHER->prio (6);
… …
1903} 1997}
1904 1998
1905sub save { 1999sub save {
1906 my ($self) = @_; 2000 my ($self) = @_;
1907 2001
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 2003
1910 $self->{last_save} = $cf::RUNTIME; 2004 $self->{last_save} = $cf::RUNTIME;
1911 2005
1912 return unless $self->dirty; 2006 return unless $self->dirty;
1913 2007
… …
1936 my ($self) = @_; 2030 my ($self) = @_;
1937 2031
1938 # save first because save cedes 2032 # save first because save cedes
1939 $self->save; 2033 $self->save;
1940 2034
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2035 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2036
1943 return if $self->players; 2037 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
1945 return if $self->{deny_save}; 2039 return if $self->{deny_save};
1946 2040
… …
1998my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
1999 2093
2000sub nuke { 2094sub nuke {
2001 my ($self) = @_; 2095 my ($self) = @_;
2002 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
2003 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
2004 2101
2005 $self->unlink_save; 2102 $self->unlink_save;
2006 2103
2007 bless $self, "cf::map"; 2104 bless $self, "cf::map";
2008 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
2009 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
2010 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
2011 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012 2109
2013 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
2014 2112
2015 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2016} 2114}
2017 2115
2018=item $maps = cf::map::tmp_maps 2116=item $maps = cf::map::tmp_maps
… …
2125 2223
2126 } else { 2224 } else {
2127 my $pl = $self->contr; 2225 my $pl = $self->contr;
2128 2226
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2227 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2228 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2229 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132 $diag->{id},
2133 msgtype => "reply",
2134 msg => $diag->{pl}->expand_cfpod ($msg),
2135 add_topics => []
2136 );
2137 2230
2138 } else { 2231 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2232 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2233 $self->message ($msg, $flags);
2141 } 2234 }
2142 } 2235 }
2236}
2237
2238=item $object->send_msg ($channel, $msg, $color, [extra...])
2239
2240=cut
2241
2242sub cf::object::send_msg {
2243 my $pl = shift->contr
2244 or return;
2245 $pl->send_msg (@_);
2143} 2246}
2144 2247
2145=item $player_object->may ("access") 2248=item $player_object->may ("access")
2146 2249
2147Returns wether the given player is authorized to access resource "access" 2250Returns wether the given player is authorized to access resource "access"
… …
2226 # use -1 or undef as default coordinates, not 0, 0 2329 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2330 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2331 if $x <=0 && $y <= 0;
2229 2332
2230 $map->load; 2333 $map->load;
2231 $map->load_diag; 2334 $map->load_neighbours;
2232 2335
2233 return unless $self->contr->active; 2336 return unless $self->contr->active;
2234 $self->activate_recursive; 2337 $self->activate_recursive;
2235 2338
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2340 $self->enter_map ($map, $x, $y);
2238} 2341}
2239 2342
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2344
2242Moves the player to the given map-path and coordinates by first freezing 2345Moves the player to the given map-path and coordinates by first freezing
2243her, loading and preparing them map, calling the provided $check callback 2346her, loading and preparing them map, calling the provided $check callback
2244that has to return the map if sucecssful, and then unfreezes the player on 2347that has to return the map if sucecssful, and then unfreezes the player on
2245the new (success) or old (failed) map position. 2348the new (success) or old (failed) map position. In either case, $done will
2349be called at the end of this process.
2246 2350
2247=cut 2351=cut
2248 2352
2249our $GOTOGEN; 2353our $GOTOGEN;
2250 2354
2251sub cf::object::player::goto { 2355sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2356 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2357
2254 # do generation counting so two concurrent goto's will be executed in-order 2358 # do generation counting so two concurrent goto's will be executed in-order
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2360
2257 $self->enter_link; 2361 $self->enter_link;
… …
2277 2381
2278 if ($gen == $self->{_goto_generation}) { 2382 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2383 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2384 $self->leave_link ($map, $x, $y);
2281 } 2385 }
2386
2387 $done->() if $done;
2282 })->prio (1); 2388 })->prio (1);
2283} 2389}
2284 2390
2285=item $player_object->enter_exit ($exit_object) 2391=item $player_object->enter_exit ($exit_object)
2286 2392
… …
2355 my $hp = $exit->stats->hp; 2461 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2462 my $sp = $exit->stats->sp;
2357 2463
2358 $self->enter_link; 2464 $self->enter_link;
2359 2465
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2360 (async { 2470 (async {
2361 $self->deactivate_recursive; # just to be sure 2471 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2472 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2473 $self->goto ($slaying, $hp, $sp);
2364 2474
… …
2391 2501
2392 utf8::encode $text; 2502 utf8::encode $text;
2393 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2394} 2504}
2395 2505
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2506=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2507
2398Send a drawinfo or msg packet to the client, formatting the msg for the 2508Send a drawinfo or msg packet to the client, formatting the msg for the
2399client if neccessary. C<$type> should be a string identifying the type of 2509client if neccessary. C<$type> should be a string identifying the type of
2400the message, with C<log> being the default. If C<$color> is negative, suppress 2510the message, with C<log> being the default. If C<$color> is negative, suppress
2401the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2402 2512
2403=cut 2513=cut
2404 2514
2515our %CHANNEL = (
2516 "c/identify" => {
2517 id => "identify",
2518 title => "Identify",
2519 reply => undef,
2520 tooltip => "Items recently identified",
2521 },
2522 "c/examine" => {
2523 id => "examine",
2524 title => "Examine",
2525 reply => undef,
2526 tooltip => "Signs and other items you examined",
2527 },
2528);
2529
2405sub cf::client::send_msg { 2530sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2531 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2532
2408 $msg = $self->pl->expand_cfpod ($msg); 2533 $msg = $self->pl->expand_cfpod ($msg);
2409 2534
2535 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536
2537 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2539
2540 if (ref $channel) {
2541 # send meta info to client, if not yet sent
2542 unless (exists $self->{channel}{$channel->{id}}) {
2543 $self->{channel}{$channel->{id}} = $channel;
2544 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg;
2546 }
2547
2548 $channel = $channel->{id};
2549 }
2550
2551 return unless @extra || length $msg;
2552
2410 if ($self->can_msg) { 2553 if ($self->can_msg) {
2554 # default colour, mask it out
2555 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2556 if $color & cf::NDI_DEF;
2557
2411 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2558 $self->send_packet ("msg " . $self->{json_coder}->encode (
2559 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2412 } else { 2560 } else {
2413 # replace some tags by gcfclient-compatible ones
2414 for ($msg) {
2415 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421 }
2422
2423 if ($color >= 0) { 2561 if ($color >= 0) {
2562 # replace some tags by gcfclient-compatible ones
2563 for ($msg) {
2564 1 while
2565 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2566 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2567 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2568 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2569 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2570 }
2571
2572 $color &= cf::NDI_COLOR_MASK;
2573
2574 utf8::encode $msg;
2575
2424 if (0 && $msg =~ /\[/) { 2576 if (0 && $msg =~ /\[/) {
2577 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2578 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2579 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2581 $self->send_packet ("drawinfo $color $msg")
2429 } 2582 }
2430 } 2583 }
2431 } 2584 }
2432} 2585}
2433 2586
2434=item $client->ext_event ($type, %msg) 2587=item $client->ext_msg ($type, @msg)
2435 2588
2436Sends an ext event to the client. 2589Sends an ext event to the client.
2437 2590
2438=cut 2591=cut
2439 2592
2440sub cf::client::ext_event($$%) { 2593sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2594 my ($self, $type, @msg) = @_;
2442 2595
2596 if ($self->extcmd == 2) {
2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2598 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2599 push @msg, msgtype => "event_$type";
2444 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2600 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2601 }
2602}
2603
2604=item $client->ext_reply ($msgid, @msg)
2605
2606Sends an ext reply to the client.
2607
2608=cut
2609
2610sub cf::client::ext_reply($$@) {
2611 my ($self, $id, @msg) = @_;
2612
2613 if ($self->extcmd == 2) {
2614 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2615 } elsif ($self->extcmd == 1) {
2616 #TODO: version 1, remove
2617 unshift @msg, msgtype => "reply", msgid => $id;
2618 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2619 }
2445} 2620}
2446 2621
2447=item $success = $client->query ($flags, "text", \&cb) 2622=item $success = $client->query ($flags, "text", \&cb)
2448 2623
2449Queues a query to the client, calling the given callback with 2624Queues a query to the client, calling the given callback with
… …
2504 my ($ns, $buf) = @_; 2679 my ($ns, $buf) = @_;
2505 2680
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2681 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 2682
2508 if (ref $msg) { 2683 if (ref $msg) {
2684 my ($type, $reply, @payload) =
2685 "ARRAY" eq ref $msg
2686 ? @$msg
2687 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2688
2689 my @reply;
2690
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2691 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 2692 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 2693 }
2694
2695 $ns->ext_reply ($reply, @reply)
2696 if $reply;
2697
2515 } else { 2698 } else {
2516 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2699 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2517 } 2700 }
2518 2701
2519 cf::override; 2702 cf::override;
… …
2566our $safe = new Safe "safe"; 2749our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 2750our $safe_hole = new Safe::Hole;
2568 2751
2569$SIG{FPE} = 'IGNORE'; 2752$SIG{FPE} = 'IGNORE';
2570 2753
2571$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2754$safe->permit_only (Opcode::opset qw(
2755 :base_core :base_mem :base_orig :base_math
2756 grepstart grepwhile mapstart mapwhile
2757 sort time
2758));
2572 2759
2573# here we export the classes and methods available to script code 2760# here we export the classes and methods available to script code
2574 2761
2575=pod 2762=pod
2576 2763
2577The following functions and methods are available within a safe environment: 2764The following functions and methods are available within a safe environment:
2578 2765
2579 cf::object contr pay_amount pay_player map 2766 cf::object
2767 contr pay_amount pay_player map x y force_find force_add
2768 insert remove name archname title slaying race decrease_ob_nr
2769
2580 cf::object::player player 2770 cf::object::player
2581 cf::player peaceful 2771 player
2582 cf::map trigger 2772
2773 cf::player
2774 peaceful
2775
2776 cf::map
2777 trigger
2583 2778
2584=cut 2779=cut
2585 2780
2586for ( 2781for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 2782 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2783 insert remove inv name archname title slaying race
2784 decrease_ob_nr)],
2588 ["cf::object::player" => qw(player)], 2785 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 2786 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 2787 ["cf::map" => qw(trigger)],
2591) { 2788) {
2592 no strict 'refs'; 2789 no strict 'refs';
… …
2668# the server's init and main functions 2865# the server's init and main functions
2669 2866
2670sub load_facedata($) { 2867sub load_facedata($) {
2671 my ($path) = @_; 2868 my ($path) = @_;
2672 2869
2870 # HACK to clear player env face cache, we need some signal framework
2871 # for this (global event?)
2872 %ext::player_env::MUSIC_FACE_CACHE = ();
2873
2874 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2875
2673 warn "loading facedata from $path\n"; 2876 warn "loading facedata from $path\n";
2674 2877
2675 my $facedata; 2878 my $facedata;
2676 0 < aio_load $path, $facedata 2879 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 2880 or die "$path: $!";
… …
2679 $facedata = Coro::Storable::thaw $facedata; 2882 $facedata = Coro::Storable::thaw $facedata;
2680 2883
2681 $facedata->{version} == 2 2884 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 2885 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 2886
2887 # patch in the exptable
2888 $facedata->{resource}{"res/exp_table"} = {
2889 type => FT_RSRC,
2890 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2891 };
2892 cf::cede_to_tick;
2893
2684 { 2894 {
2685 my $faces = $facedata->{faceinfo}; 2895 my $faces = $facedata->{faceinfo};
2686 2896
2687 while (my ($face, $info) = each %$faces) { 2897 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2898 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2899 cf::face::set_visibility $idx, $info->{visibility};
2900 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 2903
2904 cf::cede_to_tick;
2693 } 2905 }
2694 2906
2695 while (my ($face, $info) = each %$faces) { 2907 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 2908 next unless $info->{smooth};
2697 my $idx = cf::face::find $face 2909 my $idx = cf::face::find $face
2698 or next; 2910 or next;
2699 if (my $smooth = cf::face::find $info->{smooth}) { 2911 if (my $smooth = cf::face::find $info->{smooth}) {
2912 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2913 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 2914 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2915 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 2916 }
2704 Coro::cede; 2917
2918 cf::cede_to_tick;
2705 } 2919 }
2706 } 2920 }
2707 2921
2708 { 2922 {
2709 my $anims = $facedata->{animinfo}; 2923 my $anims = $facedata->{animinfo};
2710 2924
2711 while (my ($anim, $info) = each %$anims) { 2925 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2926 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 2927 cf::cede_to_tick;
2714 } 2928 }
2715 2929
2716 cf::anim::invalidate_all; # d'oh 2930 cf::anim::invalidate_all; # d'oh
2717 } 2931 }
2718 2932
2933 {
2934 # TODO: for gcfclient pleasure, we should give resources
2935 # that gcfclient doesn't grok a >10000 face index.
2936 my $res = $facedata->{resource};
2937
2938 my $soundconf = delete $res->{"res/sound.conf"};
2939
2940 while (my ($name, $info) = each %$res) {
2941 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2942 my $data;
2943
2944 if ($info->{type} & 1) {
2945 # prepend meta info
2946
2947 my $meta = $enc->encode ({
2948 name => $name,
2949 %{ $info->{meta} || {} },
2950 });
2951
2952 $data = pack "(w/a*)*", $meta, $info->{data};
2953 } else {
2954 $data = $info->{data};
2955 }
2956
2957 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2958 cf::face::set_type $idx, $info->{type};
2959
2960 cf::cede_to_tick;
2961 }
2962
2963 if ($soundconf) {
2964 $soundconf = $enc->decode (delete $soundconf->{data});
2965
2966 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2967 my $sound = $soundconf->{compat}[$_]
2968 or next;
2969
2970 my $face = cf::face::find "sound/$sound->[1]";
2971 cf::sound::set $sound->[0] => $face;
2972 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2973 }
2974
2975 while (my ($k, $v) = each %{$soundconf->{event}}) {
2976 my $face = cf::face::find "sound/$v";
2977 cf::sound::set $k => $face;
2978 }
2979 }
2980 }
2981
2719 1 2982 1
2720} 2983}
2721 2984
2985register_exticmd fx_want => sub {
2986 my ($ns, $want) = @_;
2987
2988 while (my ($k, $v) = each %$want) {
2989 $ns->fx_want ($k, $v);
2990 }
2991};
2992
2722sub reload_regions { 2993sub reload_regions {
2994 # HACK to clear player env face cache, we need some signal framework
2995 # for this (global event?)
2996 %ext::player_env::MUSIC_FACE_CACHE = ();
2997
2723 load_resource_file "$MAPDIR/regions" 2998 load_resource_file "$MAPDIR/regions"
2724 or die "unable to load regions file\n"; 2999 or die "unable to load regions file\n";
3000
3001 for (cf::region::list) {
3002 $_->{match} = qr/$_->{match}/
3003 if exists $_->{match};
3004 }
2725} 3005}
2726 3006
2727sub reload_facedata { 3007sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 3008 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 3009 or die "unable to load facedata\n";
… …
2758 3038
2759sub init { 3039sub init {
2760 reload_resources; 3040 reload_resources;
2761} 3041}
2762 3042
2763sub cfg_load { 3043sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3044 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3045 or return;
2766 3046
2767 local $/; 3047 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3048 *CFG = YAML::Syck::Load <$fh>;
… …
2788 (async { 3068 (async {
2789 Event::one_event; 3069 Event::one_event;
2790 })->prio (Coro::PRIO_MAX); 3070 })->prio (Coro::PRIO_MAX);
2791 }; 3071 };
2792 3072
2793 cfg_load; 3073 reload_config;
2794 db_init; 3074 db_init;
2795 load_extensions; 3075 load_extensions;
2796 3076
2797 $TICK_WATCHER->start; 3077 $TICK_WATCHER->start;
2798 Event::loop; 3078 Event::loop;
… …
2991 warn "reloading cf.pm"; 3271 warn "reloading cf.pm";
2992 require cf; 3272 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3274
2995 warn "loading config and database again"; 3275 warn "loading config and database again";
2996 cf::cfg_load; 3276 cf::reload_config;
2997 3277
2998 warn "loading extensions"; 3278 warn "loading extensions";
2999 cf::load_extensions; 3279 cf::load_extensions;
3000 3280
3001 warn "reattaching attachments to objects/players"; 3281 warn "reattaching attachments to objects/players";

Diff Legend

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