ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.349 by root, Fri Aug 31 04:10:43 2007 UTC

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

Diff Legend

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