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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.355 by root, Sun Sep 2 12:45:44 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
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
411 478
412=cut 479=cut
413 480
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
423sub fork_call(&@) { 481sub fork_call(&@) {
424 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
425 483
426# 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,
427# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 487
431 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 489 reset_signals;
445 local $SIG{__WARN__}; 490 &$cb
446 local $SIG{__DIE__}; 491 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 492
453 eval { 493 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 494}
466 495
467=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
468 497
469Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
549 if (1) { 578 if (1) {
550 $md5 = 579 $md5 =
551 join "\x00", 580 join "\x00",
552 $processversion, 581 $processversion,
553 map { 582 map {
554 Coro::cede; 583 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 585 } 0.. $#$src;
557 586
558 587
559 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
865 "; 894 ";
866 die if $@; 895 die if $@;
867} 896}
868 897
869our $override; 898our $override;
870our @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?
871 900
872sub override { 901sub override {
873 $override = 1; 902 $override = 1;
874 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
875} 904}
876 905
877sub do_invoke { 906sub do_invoke {
878 my $event = shift; 907 my $event = shift;
879 my $callbacks = shift; 908 my $callbacks = shift;
880 909
881 @invoke_results = (); 910 @INVOKE_RESULTS = ();
882 911
883 local $override; 912 local $override;
884 913
885 for (@$callbacks) { 914 for (@$callbacks) {
886 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
903 932
904Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
905 934
906This 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
907removed 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
908results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 938
910=back 939=back
911 940
912=cut 941=cut
913 942
914############################################################################# 943#############################################################################
915# 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}
916 956
917sub reattach { 957sub reattach {
918 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 959 my ($obj) = @_;
920 960
… …
1107 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1108 1148
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1150
1111 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
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1117 } else { 1166 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1168 }
1120 1169
1121 cf::override; 1170 cf::override;
… …
1276 1325
1277 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1279 1328
1280 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1281 Coro::cede; 1330 cf::cede_to_tick;
1282} 1331}
1283 1332
1284sub new($) { 1333sub new($) {
1285 my ($login) = @_; 1334 my ($login) = @_;
1286 1335
… …
1290 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1291 1340
1292 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1293 1342
1294 $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 (@_);
1295} 1354}
1296 1355
1297=item $pl->quit_character 1356=item $pl->quit_character
1298 1357
1299Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1354 or return []; 1413 or return [];
1355 1414
1356 my @logins; 1415 my @logins;
1357 1416
1358 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") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1423 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1424 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 }
1362 1426
1363 utf8::decode $login; 1427 utf8::decode $login;
1364 push @logins, $login; 1428 push @logins, $login;
1365 } 1429 }
1366 1430
… …
1404sub expand_cfpod { 1468sub expand_cfpod {
1405 ((my $self), (local $_)) = @_; 1469 ((my $self), (local $_)) = @_;
1406 1470
1407 # escape & and < 1471 # escape & and <
1408 s/&/&amp;/g; 1472 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g; 1473 s/(?<![BIUGHT])</&lt;/g;
1410 1474
1411 # 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
1412 1476
1413 1 while 1477 1 while
1414 # replace B<>, I<>, U<> etc. 1478 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/ 1479 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/ 1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/ 1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1418 # replace G<male|female> tags 1483 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{ 1484 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1 1485 $self->gender ? $2 : $1
1421 }ge 1486 }ge
1422 # replace H<hint text> 1487 # replace H<hint text>
… …
1435 s/\s+\n/\n/g; # ws line-ends 1500 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1501 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1502 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1503 s/\n+$//; # ending lines
1439 1504
1440 warn $_;#d#
1441 $_ 1505 $_
1442} 1506}
1443 1507
1444sub hintmode { 1508sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1509 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1510 $_[0]{hintmode}
1447} 1511}
1448 1512
1449=item $player->ext_reply ($msgid, %msg) 1513=item $player->ext_reply ($msgid, @msg)
1450 1514
1451Sends an ext reply to the player. 1515Sends an ext reply to the player.
1452 1516
1453=cut 1517=cut
1454 1518
1455sub ext_reply($$%) { 1519sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1520 my ($self, $id, @msg) = @_;
1457 1521
1458 $msg{msgid} = $id; 1522 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1523}
1461 1524
1462=item $player->ext_event ($type, %msg) 1525=item $player->ext_msg ($type, @msg)
1463 1526
1464Sends an ext event to the client. 1527Sends an ext event to the client.
1465 1528
1466=cut 1529=cut
1467 1530
1468sub ext_event($$%) { 1531sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1532 my ($self, $type, @msg) = @_;
1470 1533
1471 $self->ns->ext_event ($type, %msg); 1534 $self->ns->ext_msg ($type, @msg);
1472} 1535}
1473 1536
1474=head3 cf::region 1537=head3 cf::region
1475 1538
1476=over 4 1539=over 4
… …
1489 my ($path) = @_; 1552 my ($path) = @_;
1490 1553
1491 my ($match, $specificity); 1554 my ($match, $specificity);
1492 1555
1493 for my $region (list) { 1556 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1557 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1558 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1559 if $region->specificity > $specificity;
1497 } 1560 }
1498 } 1561 }
1499 1562
… …
1619 $self->init; # pass $1 etc. 1682 $self->init; # pass $1 etc.
1620 return $self; 1683 return $self;
1621 } 1684 }
1622 } 1685 }
1623 1686
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1687 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1688 ()
1626} 1689}
1627 1690
1628sub init { 1691sub init {
1629 my ($self) = @_; 1692 my ($self) = @_;
… …
1795 local $self->{deny_reset} = 1; # loading can take a long time 1858 local $self->{deny_reset} = 1; # loading can take a long time
1796 1859
1797 my $path = $self->{path}; 1860 my $path = $self->{path};
1798 1861
1799 { 1862 {
1863 my $guard1 = cf::lock_acquire "map_data:$path";
1800 my $guard = cf::lock_acquire "map_load:$path"; 1864 my $guard2 = cf::lock_acquire "map_load:$path";
1801 1865
1802 return if $self->in_memory != cf::MAP_SWAPPED; 1866 return if $self->in_memory != cf::MAP_SWAPPED;
1803 1867
1804 $self->in_memory (cf::MAP_LOADING); 1868 $self->in_memory (cf::MAP_LOADING);
1805 1869
1806 $self->alloc; 1870 $self->alloc;
1807 1871
1808 $self->pre_load; 1872 $self->pre_load;
1809 Coro::cede; 1873 cf::cede_to_tick;
1810 1874
1811 $self->_load_objects ($self->{load_path}, 1) 1875 $self->_load_objects ($self->{load_path}, 1)
1812 or return; 1876 or return;
1813 1877
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1820 $self->clear_unique_items; 1884 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 1885 $self->_load_objects ($uniq, 0);
1822 } 1886 }
1823 } 1887 }
1824 1888
1825 Coro::cede; 1889 cf::cede_to_tick;
1826 # now do the right thing for maps 1890 # now do the right thing for maps
1827 $self->link_multipart_objects; 1891 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 1892 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 1893 unless $self->difficulty;
1830 Coro::cede; 1894 cf::cede_to_tick;
1831 1895
1832 unless ($self->{deny_activate}) { 1896 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 1897 $self->decay_objects;
1834 $self->fix_auto_apply; 1898 $self->fix_auto_apply;
1835 $self->update_buttons; 1899 $self->update_buttons;
1836 Coro::cede; 1900 cf::cede_to_tick;
1837 $self->set_darkness_map; 1901 $self->set_darkness_map;
1838 Coro::cede; 1902 cf::cede_to_tick;
1839 $self->activate; 1903 $self->activate;
1840 } 1904 }
1905
1906 $self->{last_save} = $cf::RUNTIME;
1907 $self->last_access ($cf::RUNTIME);
1841 1908
1842 $self->in_memory (cf::MAP_IN_MEMORY); 1909 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 1910 }
1844 1911
1845 $self->post_load; 1912 $self->post_load;
… …
1856 1923
1857 $self 1924 $self
1858} 1925}
1859 1926
1860# 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
1861sub load_diag { 1928sub load_neighbours {
1862 my ($map) = @_; 1929 my ($map) = @_;
1863 1930
1864 my @diag; # diagonal neighbours 1931 my @neigh; # diagonal neighbours
1865 1932
1866 for (0 .. 3) { 1933 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 1934 my $neigh = $map->tile_path ($_)
1868 or next; 1935 or next;
1869 $neigh = find $neigh, $map 1936 $neigh = find $neigh, $map
1870 or next; 1937 or next;
1871 $neigh->load; 1938 $neigh->load;
1872 1939
1940 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1941 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1942 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 1943 }
1876 1944
1877 for (@diag) { 1945 for (grep defined $_->[0], @neigh) {
1946 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 1947 my $neigh = find $path, $origin
1879 or next; 1948 or next;
1880 $neigh->load; 1949 $neigh->load;
1881 } 1950 }
1882} 1951}
1883 1952
… …
1888} 1957}
1889 1958
1890sub do_load_sync { 1959sub do_load_sync {
1891 my ($map) = @_; 1960 my ($map) = @_;
1892 1961
1962 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1963 if $Coro::current == $Coro::main;
1964
1893 cf::sync_job { $map->load }; 1965 cf::sync_job { $map->load };
1894} 1966}
1895 1967
1896our %MAP_PREFETCH; 1968our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 1969our $MAP_PREFETCHER = undef;
1898 1970
1899sub find_async { 1971sub find_async {
1900 my ($path, $origin) = @_; 1972 my ($path, $origin, $load) = @_;
1901 1973
1902 $path = normalise $path, $origin && $origin->{path}; 1974 $path = normalise $path, $origin && $origin->{path};
1903 1975
1904 if (my $map = $cf::MAP{$path}) { 1976 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 1978 }
1907 1979
1908 undef $MAP_PREFETCH{$path}; 1980 $MAP_PREFETCH{$path} |= $load;
1981
1909 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 1984 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 1985 if (my $map = find $k) {
1913 or next;
1914 $map->load; 1986 $map->load if $v;
1987 }
1915 1988
1916 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$k};
1917 } 1990 }
1918 } 1991 }
1919 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
1920 }; 1993 };
1921 $MAP_PREFETCHER->prio (6); 1994 $MAP_PREFETCHER->prio (6);
… …
1924} 1997}
1925 1998
1926sub save { 1999sub save {
1927 my ($self) = @_; 2000 my ($self) = @_;
1928 2001
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2003
1931 $self->{last_save} = $cf::RUNTIME; 2004 $self->{last_save} = $cf::RUNTIME;
1932 2005
1933 return unless $self->dirty; 2006 return unless $self->dirty;
1934 2007
… …
1957 my ($self) = @_; 2030 my ($self) = @_;
1958 2031
1959 # save first because save cedes 2032 # save first because save cedes
1960 $self->save; 2033 $self->save;
1961 2034
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2035 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2036
1964 return if $self->players; 2037 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2039 return if $self->{deny_save};
1967 2040
… …
2019my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
2020 2093
2021sub nuke { 2094sub nuke {
2022 my ($self) = @_; 2095 my ($self) = @_;
2023 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
2024 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
2025 2101
2026 $self->unlink_save; 2102 $self->unlink_save;
2027 2103
2028 bless $self, "cf::map"; 2104 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2109
2034 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
2035 2112
2036 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2037} 2114}
2038 2115
2039=item $maps = cf::map::tmp_maps 2116=item $maps = cf::map::tmp_maps
… …
2146 2223
2147 } else { 2224 } else {
2148 my $pl = $self->contr; 2225 my $pl = $self->contr;
2149 2226
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2227 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2228 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2229 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2230
2159 } else { 2231 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2232 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2233 $self->message ($msg, $flags);
2162 } 2234 }
2163 } 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 (@_);
2164} 2246}
2165 2247
2166=item $player_object->may ("access") 2248=item $player_object->may ("access")
2167 2249
2168Returns wether the given player is authorized to access resource "access" 2250Returns wether the given player is authorized to access resource "access"
… …
2247 # use -1 or undef as default coordinates, not 0, 0 2329 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2330 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2331 if $x <=0 && $y <= 0;
2250 2332
2251 $map->load; 2333 $map->load;
2252 $map->load_diag; 2334 $map->load_neighbours;
2253 2335
2254 return unless $self->contr->active; 2336 return unless $self->contr->active;
2255 $self->activate_recursive; 2337 $self->activate_recursive;
2256 2338
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2340 $self->enter_map ($map, $x, $y);
2259} 2341}
2260 2342
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2344
2263Moves 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
2264her, loading and preparing them map, calling the provided $check callback 2346her, loading and preparing them map, calling the provided $check callback
2265that 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
2266the 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.
2267 2350
2268=cut 2351=cut
2269 2352
2270our $GOTOGEN; 2353our $GOTOGEN;
2271 2354
2272sub cf::object::player::goto { 2355sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2356 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2357
2275 # 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
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2360
2278 $self->enter_link; 2361 $self->enter_link;
… …
2298 2381
2299 if ($gen == $self->{_goto_generation}) { 2382 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2383 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2384 $self->leave_link ($map, $x, $y);
2302 } 2385 }
2386
2387 $done->() if $done;
2303 })->prio (1); 2388 })->prio (1);
2304} 2389}
2305 2390
2306=item $player_object->enter_exit ($exit_object) 2391=item $player_object->enter_exit ($exit_object)
2307 2392
… …
2416 2501
2417 utf8::encode $text; 2502 utf8::encode $text;
2418 $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);
2419} 2504}
2420 2505
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2506=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2507
2423Send 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
2424client 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
2425the 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
2426the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2427 2512
2428=cut 2513=cut
2429 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
2430sub cf::client::send_msg { 2530sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2531 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2532
2433 $msg = $self->pl->expand_cfpod ($msg); 2533 $msg = $self->pl->expand_cfpod ($msg);
2434 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
2435 return unless @extra || length $msg; 2551 return unless @extra || length $msg;
2436 2552
2437 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
2438 $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]));
2439 } else { 2560 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 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
2451 if (0 && $msg =~ /\[/) { 2576 if (0 && $msg =~ /\[/) {
2577 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2578 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2579 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2581 $self->send_packet ("drawinfo $color $msg")
2456 } 2582 }
2457 } 2583 }
2458 } 2584 }
2459} 2585}
2460 2586
2461=item $client->ext_event ($type, %msg) 2587=item $client->ext_msg ($type, @msg)
2462 2588
2463Sends an ext event to the client. 2589Sends an ext event to the client.
2464 2590
2465=cut 2591=cut
2466 2592
2467sub cf::client::ext_event($$%) { 2593sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2594 my ($self, $type, @msg) = @_;
2469 2595
2596 if ($self->extcmd == 2) {
2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2598 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2599 push @msg, msgtype => "event_$type";
2471 $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 }
2472} 2620}
2473 2621
2474=item $success = $client->query ($flags, "text", \&cb) 2622=item $success = $client->query ($flags, "text", \&cb)
2475 2623
2476Queues a query to the client, calling the given callback with 2624Queues a query to the client, calling the given callback with
… …
2531 my ($ns, $buf) = @_; 2679 my ($ns, $buf) = @_;
2532 2680
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2681 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2682
2535 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
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2691 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 2692 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 2693 }
2694
2695 $ns->ext_reply ($reply, @reply)
2696 if $reply;
2697
2542 } else { 2698 } else {
2543 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";
2544 } 2700 }
2545 2701
2546 cf::override; 2702 cf::override;
… …
2593our $safe = new Safe "safe"; 2749our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 2750our $safe_hole = new Safe::Hole;
2595 2751
2596$SIG{FPE} = 'IGNORE'; 2752$SIG{FPE} = 'IGNORE';
2597 2753
2598$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));
2599 2759
2600# here we export the classes and methods available to script code 2760# here we export the classes and methods available to script code
2601 2761
2602=pod 2762=pod
2603 2763
2604The following functions and methods are available within a safe environment: 2764The following functions and methods are available within a safe environment:
2605 2765
2606 cf::object 2766 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 2767 contr pay_amount pay_player map x y force_find force_add
2608 insert remove 2768 insert remove name archname title slaying race decrease_ob_nr
2609 2769
2610 cf::object::player 2770 cf::object::player
2611 player 2771 player
2612 2772
2613 cf::player 2773 cf::player
… …
2618 2778
2619=cut 2779=cut
2620 2780
2621for ( 2781for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 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
2623 insert remove)], 2784 decrease_ob_nr)],
2624 ["cf::object::player" => qw(player)], 2785 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 2786 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 2787 ["cf::map" => qw(trigger)],
2627) { 2788) {
2628 no strict 'refs'; 2789 no strict 'refs';
… …
2704# the server's init and main functions 2865# the server's init and main functions
2705 2866
2706sub load_facedata($) { 2867sub load_facedata($) {
2707 my ($path) = @_; 2868 my ($path) = @_;
2708 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
2709 warn "loading facedata from $path\n"; 2876 warn "loading facedata from $path\n";
2710 2877
2711 my $facedata; 2878 my $facedata;
2712 0 < aio_load $path, $facedata 2879 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 2880 or die "$path: $!";
… …
2715 $facedata = Coro::Storable::thaw $facedata; 2882 $facedata = Coro::Storable::thaw $facedata;
2716 2883
2717 $facedata->{version} == 2 2884 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 2885 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 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
2720 { 2894 {
2721 my $faces = $facedata->{faceinfo}; 2895 my $faces = $facedata->{faceinfo};
2722 2896
2723 while (my ($face, $info) = each %$faces) { 2897 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2898 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2899 cf::face::set_visibility $idx, $info->{visibility};
2900 cf::face::set_magicmap $idx, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2728 Coro::cede; 2903
2904 cf::cede_to_tick;
2729 } 2905 }
2730 2906
2731 while (my ($face, $info) = each %$faces) { 2907 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth}; 2908 next unless $info->{smooth};
2733 my $idx = cf::face::find $face 2909 my $idx = cf::face::find $face
2734 or next; 2910 or next;
2735 if (my $smooth = cf::face::find $info->{smooth}) { 2911 if (my $smooth = cf::face::find $info->{smooth}) {
2912 cf::face::set_smooth $idx, $smooth;
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2913 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737 } else { 2914 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2915 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 } 2916 }
2740 Coro::cede; 2917
2918 cf::cede_to_tick;
2741 } 2919 }
2742 } 2920 }
2743 2921
2744 { 2922 {
2745 my $anims = $facedata->{animinfo}; 2923 my $anims = $facedata->{animinfo};
2746 2924
2747 while (my ($anim, $info) = each %$anims) { 2925 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2926 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede; 2927 cf::cede_to_tick;
2750 } 2928 }
2751 2929
2752 cf::anim::invalidate_all; # d'oh 2930 cf::anim::invalidate_all; # d'oh
2753 } 2931 }
2754 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
2755 1 2982 1
2756} 2983}
2757 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
2758sub 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
2759 load_resource_file "$MAPDIR/regions" 2998 load_resource_file "$MAPDIR/regions"
2760 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 }
2761} 3005}
2762 3006
2763sub reload_facedata { 3007sub reload_facedata {
2764 load_facedata "$DATADIR/facedata" 3008 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n"; 3009 or die "unable to load facedata\n";
… …
2794 3038
2795sub init { 3039sub init {
2796 reload_resources; 3040 reload_resources;
2797} 3041}
2798 3042
2799sub cfg_load { 3043sub reload_config {
2800 open my $fh, "<:utf8", "$CONFDIR/config" 3044 open my $fh, "<:utf8", "$CONFDIR/config"
2801 or return; 3045 or return;
2802 3046
2803 local $/; 3047 local $/;
2804 *CFG = YAML::Syck::Load <$fh>; 3048 *CFG = YAML::Syck::Load <$fh>;
… …
2824 (async { 3068 (async {
2825 Event::one_event; 3069 Event::one_event;
2826 })->prio (Coro::PRIO_MAX); 3070 })->prio (Coro::PRIO_MAX);
2827 }; 3071 };
2828 3072
2829 cfg_load; 3073 reload_config;
2830 db_init; 3074 db_init;
2831 load_extensions; 3075 load_extensions;
2832 3076
2833 $TICK_WATCHER->start; 3077 $TICK_WATCHER->start;
2834 Event::loop; 3078 Event::loop;
… …
3027 warn "reloading cf.pm"; 3271 warn "reloading cf.pm";
3028 require cf; 3272 require cf;
3029 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3030 3274
3031 warn "loading config and database again"; 3275 warn "loading config and database again";
3032 cf::cfg_load; 3276 cf::reload_config;
3033 3277
3034 warn "loading extensions"; 3278 warn "loading extensions";
3035 cf::load_extensions; 3279 cf::load_extensions;
3036 3280
3037 warn "reattaching attachments to objects/players"; 3281 warn "reattaching attachments to objects/players";

Diff Legend

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