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.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.356 by root, Tue Sep 4 05:43:21 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 ();
… …
86our %CFG; 87our %CFG;
87 88
88our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 90our $RUNTIME;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
… …
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock 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
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
… …
320 my $guard = Coro::guard { 324 my $guard = Coro::guard {
321 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
322 }; 326 };
323 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
324 $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;
325} 385}
326 386
327=item cf::async { BLOCK } 387=item cf::async { BLOCK }
328 388
329Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
418 478
419=cut 479=cut
420 480
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 481sub fork_call(&@) {
431 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
432 483
433# 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,
434# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 487
438 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 489 reset_signals;
452 local $SIG{__WARN__}; 490 &$cb
453 local $SIG{__DIE__}; 491 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 492
460 eval { 493 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 494}
473 495
474=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
475 497
476Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
556 if (1) { 578 if (1) {
557 $md5 = 579 $md5 =
558 join "\x00", 580 join "\x00",
559 $processversion, 581 $processversion,
560 map { 582 map {
561 Coro::cede; 583 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 585 } 0.. $#$src;
564 586
565 587
566 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
918 940
919=cut 941=cut
920 942
921############################################################################# 943#############################################################################
922# 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}
923 956
924sub reattach { 957sub reattach {
925 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 959 my ($obj) = @_;
927 960
… …
971 }, 1004 },
972); 1005);
973 1006
974sub object_freezer_save { 1007sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
976 1011
977 sync_job { 1012 sync_job {
978 if (length $$rdata) { 1013 if (length $$rdata) {
979 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
… …
1004 } 1039 }
1005 } else { 1040 } else {
1006 aio_unlink $filename; 1041 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
1008 } 1043 }
1009 } 1044 };
1045
1046 undef $guard;
1010} 1047}
1011 1048
1012sub object_freezer_as_string { 1049sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
1014 1051
… …
1019 1056
1020sub object_thawer_load { 1057sub object_thawer_load {
1021 my ($filename) = @_; 1058 my ($filename) = @_;
1022 1059
1023 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1024 1063
1025 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
1026 or return; 1065 or return;
1027 1066
1028 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1069 or return;
1070
1071 undef $guard;
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
1032 } 1073 }
1033 1074
1034 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
1036 return ($data, $av); 1078 ($data, $av)
1037} 1079}
1038 1080
1039=head2 COMMAND CALLBACKS 1081=head2 COMMAND CALLBACKS
1040 1082
1041=over 4 1083=over 4
… …
1114 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
1115 1157
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1159
1118 if (ref $msg) { 1160 if (ref $msg) {
1161 my ($type, $reply, @payload) =
1162 "ARRAY" eq ref $msg
1163 ? @$msg
1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1165
1166 my @reply;
1167
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
1124 } else { 1175 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1177 }
1127 1178
1128 cf::override; 1179 cf::override;
… …
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1317
1267 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1268 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
1269 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1270 } 1327 }
1271 } 1328 }
1272} 1329}
1273 1330
… …
1283 1340
1284 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1286 1343
1287 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1288 Coro::cede; 1345 cf::cede_to_tick;
1289} 1346}
1290 1347
1291sub new($) { 1348sub new($) {
1292 my ($login) = @_; 1349 my ($login) = @_;
1293 1350
… …
1297 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1298 1355
1299 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1300 1357
1301 $self 1358 $self
1359}
1360
1361=item $player->send_msg ($channel, $msg, $color, [extra...])
1362
1363=cut
1364
1365sub send_msg {
1366 my $ns = shift->ns
1367 or return;
1368 $ns->send_msg (@_);
1302} 1369}
1303 1370
1304=item $pl->quit_character 1371=item $pl->quit_character
1305 1372
1306Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
… …
1361 or return []; 1428 or return [];
1362 1429
1363 my @logins; 1430 my @logins;
1364 1431
1365 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1369 1441
1370 utf8::decode $login; 1442 utf8::decode $login;
1371 push @logins, $login; 1443 push @logins, $login;
1372 } 1444 }
1373 1445
… …
1411sub expand_cfpod { 1483sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1484 ((my $self), (local $_)) = @_;
1413 1485
1414 # escape & and < 1486 # escape & and <
1415 s/&/&amp;/g; 1487 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g; 1488 s/(?<![BIUGHT])</&lt;/g;
1417 1489
1418 # this is buggy, it needs to properly take care of nested <'s 1490 # this is buggy, it needs to properly take care of nested <'s
1419 1491
1420 1 while 1492 1 while
1421 # replace B<>, I<>, U<> etc. 1493 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1494 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1425 # replace G<male|female> tags 1498 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1499 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1 1500 $self->gender ? $2 : $1
1428 }ge 1501 }ge
1429 # replace H<hint text> 1502 # replace H<hint text>
… …
1450sub hintmode { 1523sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1525 $_[0]{hintmode}
1453} 1526}
1454 1527
1455=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1456 1529
1457Sends an ext reply to the player. 1530Sends an ext reply to the player.
1458 1531
1459=cut 1532=cut
1460 1533
1461sub ext_reply($$%) { 1534sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1463 1536
1464 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1538}
1467 1539
1468=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1469 1541
1470Sends an ext event to the client. 1542Sends an ext event to the client.
1471 1543
1472=cut 1544=cut
1473 1545
1474sub ext_event($$%) { 1546sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1476 1548
1477 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1478} 1550}
1479 1551
1480=head3 cf::region 1552=head3 cf::region
1481 1553
1482=over 4 1554=over 4
… …
1698 1770
1699sub load_header_from($) { 1771sub load_header_from($) {
1700 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1701 1773
1702 utf8::encode $path; 1774 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1708 1783
1709 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1710 1785
1711 1 1786 1
1712} 1787}
… …
1801 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1802 1877
1803 my $path = $self->{path}; 1878 my $path = $self->{path};
1804 1879
1805 { 1880 {
1881 my $guard1 = cf::lock_acquire "map_data:$path";
1806 my $guard = cf::lock_acquire "map_load:$path"; 1882 my $guard2 = cf::lock_acquire "map_load:$path";
1807 1883
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1809 1885
1810 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1811 1887
1812 $self->alloc; 1888 $self->alloc;
1813 1889
1814 $self->pre_load; 1890 $self->pre_load;
1815 Coro::cede; 1891 cf::cede_to_tick;
1816 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1818 or return; 1896 or return;
1819 1897
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1822 1900
1823 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 1902 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 1905 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1828 } 1909 }
1829 } 1910 }
1830 1911
1831 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1832 # now do the right thing for maps 1915 # now do the right thing for maps
1833 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 1918 unless $self->difficulty;
1836 Coro::cede; 1919 cf::cede_to_tick;
1837 1920
1838 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 1922 $self->decay_objects;
1840 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1841 $self->update_buttons; 1924 $self->update_buttons;
1842 Coro::cede; 1925 cf::cede_to_tick;
1843 $self->set_darkness_map; 1926 $self->set_darkness_map;
1844 Coro::cede; 1927 cf::cede_to_tick;
1845 $self->activate; 1928 $self->activate;
1846 } 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1847 1933
1848 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 1935 }
1850 1936
1851 $self->post_load; 1937 $self->post_load;
… …
1862 1948
1863 $self 1949 $self
1864} 1950}
1865 1951
1866# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1867sub load_diag { 1953sub load_neighbours {
1868 my ($map) = @_; 1954 my ($map) = @_;
1869 1955
1870 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1871 1957
1872 for (0 .. 3) { 1958 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1874 or next; 1960 or next;
1875 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1876 or next; 1962 or next;
1877 $neigh->load; 1963 $neigh->load;
1878 1964
1965 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 1968 }
1882 1969
1883 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1885 or next; 1973 or next;
1886 $neigh->load; 1974 $neigh->load;
1887 } 1975 }
1888} 1976}
1889 1977
… …
1894} 1982}
1895 1983
1896sub do_load_sync { 1984sub do_load_sync {
1897 my ($map) = @_; 1985 my ($map) = @_;
1898 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1899 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1900} 1991}
1901 1992
1902our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1904 1995
1905sub find_async { 1996sub find_async {
1906 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1907 1998
1908 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1909 2000
1910 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 2003 }
1913 2004
1914 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1915 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1916 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2010 if (my $map = find $k) {
1919 $map->load; 2011 $map->load if $v;
1920 } 2012 }
1921 2013
1922 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1923 } 2015 }
1924 } 2016 }
1925 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1926 }; 2018 };
1927 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
… …
1930} 2022}
1931 2023
1932sub save { 2024sub save {
1933 my ($self) = @_; 2025 my ($self) = @_;
1934 2026
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2028
1937 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1938 2030
1939 return unless $self->dirty; 2031 return unless $self->dirty;
1940 2032
… …
1963 my ($self) = @_; 2055 my ($self) = @_;
1964 2056
1965 # save first because save cedes 2057 # save first because save cedes
1966 $self->save; 2058 $self->save;
1967 2059
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2061
1970 return if $self->players; 2062 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1973 2065
… …
2025my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
2026 2118
2027sub nuke { 2119sub nuke {
2028 my ($self) = @_; 2120 my ($self) = @_;
2029 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
2030 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
2031 2126
2032 $self->unlink_save; 2127 $self->unlink_save;
2033 2128
2034 bless $self, "cf::map"; 2129 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2134
2040 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
2041 2137
2042 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2043} 2139}
2044 2140
2045=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2121 2217
2122sub inv_recursive { 2218sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2124} 2220}
2125 2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
2251}
2252
2126package cf; 2253package cf;
2127 2254
2128=back 2255=back
2129 2256
2130=head3 cf::object::player 2257=head3 cf::object::player
… …
2152 2279
2153 } else { 2280 } else {
2154 my $pl = $self->contr; 2281 my $pl = $self->contr;
2155 2282
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2284 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2286
2165 } else { 2287 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2168 } 2290 }
2169 } 2291 }
2292}
2293
2294=item $object->send_msg ($channel, $msg, $color, [extra...])
2295
2296=cut
2297
2298sub cf::object::send_msg {
2299 my $pl = shift->contr
2300 or return;
2301 $pl->send_msg (@_);
2170} 2302}
2171 2303
2172=item $player_object->may ("access") 2304=item $player_object->may ("access")
2173 2305
2174Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
… …
2253 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2256 2388
2257 $map->load; 2389 $map->load;
2258 $map->load_diag; 2390 $map->load_neighbours;
2259 2391
2260 return unless $self->contr->active; 2392 return unless $self->contr->active;
2261 $self->activate_recursive; 2393 $self->activate_recursive;
2262 2394
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2566the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2567the message unless the client supports the msg packet.
2436 2568
2437=cut 2569=cut
2438 2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2439sub cf::client::send_msg { 2586sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2587 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2588
2442 $msg = $self->pl->expand_cfpod ($msg); 2589 $msg = $self->pl->expand_cfpod ($msg);
2443 2590
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2447 2595
2448 if (ref $channel) { 2596 if (ref $channel) {
2449 # send meta info to client, if not yet sent 2597 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2598 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2599 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2453 } 2602 }
2454 2603
2455 $channel = $channel->{id}; 2604 $channel = $channel->{id};
2456 } 2605 }
2457 2606
2607 return unless @extra || length $msg;
2608
2458 if ($self->can_msg) { 2609 if ($self->can_msg) {
2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460 } else { 2616 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 if ($color >= 0) { 2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627
2628 $color &= cf::NDI_COLOR_MASK;
2629
2630 utf8::encode $msg;
2631
2472 if (0 && $msg =~ /\[/) { 2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2635 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2637 $self->send_packet ("drawinfo $color $msg")
2477 } 2638 }
2478 } 2639 }
2479 } 2640 }
2480} 2641}
2481 2642
2482=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2483 2644
2484Sends an ext event to the client. 2645Sends an ext event to the client.
2485 2646
2486=cut 2647=cut
2487 2648
2488sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2490 2651
2491 return unless $self->extcmd; 2652 if ($self->extcmd == 2) {
2492 2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675 }
2495} 2676}
2496 2677
2497=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2498 2679
2499Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
… …
2554 my ($ns, $buf) = @_; 2735 my ($ns, $buf) = @_;
2555 2736
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2738
2558 if (ref $msg) { 2739 if (ref $msg) {
2740 my ($type, $reply, @payload) =
2741 "ARRAY" eq ref $msg
2742 ? @$msg
2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2744
2745 my @reply;
2746
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2747 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2748 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2565 } else { 2754 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 } 2756 }
2568 2757
2569 cf::override; 2758 cf::override;
… …
2616our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2618 2807
2619$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2620 2809
2621$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2810$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math
2812 grepstart grepwhile mapstart mapwhile
2813 sort time
2814));
2622 2815
2623# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2624 2817
2625=pod 2818=pod
2626 2819
2627The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2628 2821
2629 cf::object 2822 cf::object
2630 contr pay_amount pay_player map x y force_find force_add 2823 contr pay_amount pay_player map x y force_find force_add
2631 insert remove 2824 insert remove name archname title slaying race decrease_ob_nr
2632 2825
2633 cf::object::player 2826 cf::object::player
2634 player 2827 player
2635 2828
2636 cf::player 2829 cf::player
… …
2641 2834
2642=cut 2835=cut
2643 2836
2644for ( 2837for (
2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race
2646 insert remove)], 2840 decrease_ob_nr)],
2647 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2650) { 2844) {
2651 no strict 'refs'; 2845 no strict 'refs';
… …
2727# the server's init and main functions 2921# the server's init and main functions
2728 2922
2729sub load_facedata($) { 2923sub load_facedata($) {
2730 my ($path) = @_; 2924 my ($path) = @_;
2731 2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2931
2732 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2733 2933
2734 my $facedata; 2934 my $facedata;
2735 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 2936 or die "$path: $!";
2737 2937
2738 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2739 2939
2740 $facedata->{version} == 2 2940 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2942
2943 # patch in the exptable
2944 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2947 };
2948 cf::cede_to_tick;
2742 2949
2743 { 2950 {
2744 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2745 2952
2746 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2748 cf::face::set_visibility $idx, $info->{visibility}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 2956 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 2959
2753 cf::cede_to_tick; 2960 cf::cede_to_tick;
2754 } 2961 }
2755 2962
2756 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
… …
2781 2988
2782 { 2989 {
2783 # TODO: for gcfclient pleasure, we should give resources 2990 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 2991 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 2992 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical; 2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2787 2995
2788 while (my ($name, $info) = each %$res) { 2996 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2796 2999
2797 if ($name =~ /\.jpg$/) { 3000 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3001 # prepend meta info
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
2800 } else { 3009 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3010 $data = $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3011 }
2807 3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
2808 cf::cede_to_tick; 3016 cf::cede_to_tick;
2809 } 3017 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
2810 } 3036 }
2811 3037
2812 1 3038 1
2813} 3039}
2814 3040
3041register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_;
3043
3044 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v);
3046 }
3047};
3048
2815sub reload_regions { 3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
2816 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
2818 3056
2819 for (cf::region::list) { 3057 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3058 $_->{match} = qr/$_->{match}/
… …
2856 3094
2857sub init { 3095sub init {
2858 reload_resources; 3096 reload_resources;
2859} 3097}
2860 3098
2861sub cfg_load { 3099sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3101 or return;
2864 3102
2865 local $/; 3103 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
… …
2886 (async { 3124 (async {
2887 Event::one_event; 3125 Event::one_event;
2888 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2889 }; 3127 };
2890 3128
2891 cfg_load; 3129 reload_config;
2892 db_init; 3130 db_init;
2893 load_extensions; 3131 load_extensions;
2894 3132
2895 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2896 Event::loop; 3134 Event::loop;
… …
3089 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
3090 require cf; 3328 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3330
3093 warn "loading config and database again"; 3331 warn "loading config and database again";
3094 cf::cfg_load; 3332 cf::reload_config;
3095 3333
3096 warn "loading extensions"; 3334 warn "loading extensions";
3097 cf::load_extensions; 3335 cf::load_extensions;
3098 3336
3099 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
… …
3192 or die; 3430 or die;
3193 3431
3194 $map->width (50); 3432 $map->width (50);
3195 $map->height (50); 3433 $map->height (50);
3196 $map->alloc; 3434 $map->alloc;
3197 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3198 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
3199 3437
3200 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
3201 if ($t < $min) { 3439 if ($t < $min) {
3202 $min = $t; 3440 $min = $t;

Diff Legend

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