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.320 by root, Tue Jul 24 22:49:40 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 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
281Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
282 286
283=cut 287=cut
284 288
285our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
286 291
287sub lock_wait($) { 292sub lock_wait($) {
288 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
289 299
290 # wait for lock, if any 300 # wait for lock, if any
291 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 303 Coro::schedule;
… …
299 309
300 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
301 lock_wait $key; 311 lock_wait $key;
302 312
303 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
304 315
305 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
308 } 320 }
309} 321}
310 322
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 484Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 485never block itself or use any form of Event handling.
474 486
475=cut 487=cut
476 488
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 489sub fork_call(&@) {
487 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
488 491
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 492 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 495
494 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 497 reset_signals;
508 local $SIG{__WARN__}; 498 &$cb
509 local $SIG{__DIE__}; 499 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 500
516 eval { 501 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 502}
529 503
530=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
531 505
532Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
612 if (1) { 586 if (1) {
613 $md5 = 587 $md5 =
614 join "\x00", 588 join "\x00",
615 $processversion, 589 $processversion,
616 map { 590 map {
617 Coro::cede; 591 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 593 } 0.. $#$src;
620 594
621 595
622 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
1038 }, 1012 },
1039); 1013);
1040 1014
1041sub object_freezer_save { 1015sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
1043 1019
1044 sync_job { 1020 sync_job {
1045 if (length $$rdata) { 1021 if (length $$rdata) {
1046 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
1071 } 1047 }
1072 } else { 1048 } else {
1073 aio_unlink $filename; 1049 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1075 } 1051 }
1076 } 1052 };
1053
1054 undef $guard;
1077} 1055}
1078 1056
1079sub object_freezer_as_string { 1057sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1081 1059
… …
1086 1064
1087sub object_thawer_load { 1065sub object_thawer_load {
1088 my ($filename) = @_; 1066 my ($filename) = @_;
1089 1067
1090 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1091 1071
1092 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1093 or return; 1073 or return;
1094 1074
1095 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1077 or return;
1078
1079 undef $guard;
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1081 }
1100 1082
1101 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1103 return ($data, $av); 1086 ($data, $av)
1104} 1087}
1105 1088
1106=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1107 1090
1108=over 4 1091=over 4
… …
1186 my ($type, $reply, @payload) = 1169 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1170 "ARRAY" eq ref $msg
1188 ? @$msg 1171 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1173
1174 my @reply;
1175
1191 if (my $cb = $EXTCMD{$type}) { 1176 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1177 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1197 } else { 1183 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1185 }
1200 1186
1201 cf::override; 1187 cf::override;
… …
1291 1277
1292=head3 cf::player 1278=head3 cf::player
1293 1279
1294=over 4 1280=over 4
1295 1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
1295
1296=item cf::player::find $login 1296=item cf::player::find $login
1297 1297
1298Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1299 1299
1300=cut 1300=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1339
1340 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1343 } 1349 }
1344 } 1350 }
1345} 1351}
1346 1352
… …
1356 1362
1357 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1359 1365
1360 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1361 Coro::cede; 1367 cf::cede_to_tick;
1362} 1368}
1363 1369
1364sub new($) { 1370sub new($) {
1365 my ($login) = @_; 1371 my ($login) = @_;
1366 1372
… …
1370 $self->{deny_save} = 1; 1376 $self->{deny_save} = 1;
1371 1377
1372 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1373 1379
1374 $self 1380 $self
1381}
1382
1383=item $player->send_msg ($channel, $msg, $color, [extra...])
1384
1385=cut
1386
1387sub send_msg {
1388 my $ns = shift->ns
1389 or return;
1390 $ns->send_msg (@_);
1375} 1391}
1376 1392
1377=item $pl->quit_character 1393=item $pl->quit_character
1378 1394
1379Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1450 or return [];
1435 1451
1436 my @logins; 1452 my @logins;
1437 1453
1438 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1442 1463
1443 utf8::decode $login; 1464 utf8::decode $login;
1444 push @logins, $login; 1465 push @logins, $login;
1445 } 1466 }
1446 1467
… …
1484sub expand_cfpod { 1505sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1506 ((my $self), (local $_)) = @_;
1486 1507
1487 # escape & and < 1508 # escape & and <
1488 s/&/&amp;/g; 1509 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1510 s/(?<![BIUGHT])</&lt;/g;
1490 1511
1491 # this is buggy, it needs to properly take care of nested <'s 1512 # this is buggy, it needs to properly take care of nested <'s
1492 1513
1493 1 while 1514 1 while
1494 # replace B<>, I<>, U<> etc. 1515 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1516 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1520 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1521 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1522 $self->gender ? $2 : $1
1501 }ge 1523 }ge
1502 # replace H<hint text> 1524 # replace H<hint text>
… …
1532=cut 1554=cut
1533 1555
1534sub ext_reply($$@) { 1556sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1557 my ($self, $id, @msg) = @_;
1536 1558
1537 if ($self->ns->extcmd == 2) { 1559 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1560}
1545 1561
1546=item $player->ext_msg ($type, @msg) 1562=item $player->ext_msg ($type, @msg)
1547 1563
1548Sends an ext event to the client. 1564Sends an ext event to the client.
… …
1776 1792
1777sub load_header_from($) { 1793sub load_header_from($) {
1778 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1779 1795
1780 utf8::encode $path; 1796 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1798 or return;
1799
1800 $self->_load_header ($f)
1801 or return;
1802
1803 local $MAP_LOADING{$self->{path}} = $self;
1804 $f->resolve_delayed_derefs;
1786 1805
1787 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1788 1807
1789 1 1808 1
1790} 1809}
… …
1844sub find { 1863sub find {
1845 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1846 1865
1847 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1848 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1850 1870
1851 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1853 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1854 or return; 1876 or return;
1855 1877
1856 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1857 1879
… …
1859 or return; 1881 or return;
1860 1882
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1864 $map->reset; 1888 $map->reset;
1865 undef $guard;
1866 return find $path; 1889 return find $path;
1867 } 1890 }
1868 1891
1869 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1870 } 1893 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1880 1903
1881 my $path = $self->{path}; 1904 my $path = $self->{path};
1882 1905
1883 { 1906 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1885 1908
1909 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1911
1888 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1889 1913
1890 $self->alloc; 1914 $self->alloc;
1891 1915
1892 $self->pre_load; 1916 $self->pre_load;
1893 Coro::cede; 1917 cf::cede_to_tick;
1894 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1896 or return; 1922 or return;
1897 1923
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1900 1926
1901 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 1928 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 1931 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1906 } 1935 }
1907 } 1936 }
1908 1937
1909 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1910 # now do the right thing for maps 1941 # now do the right thing for maps
1911 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1944 unless $self->difficulty;
1914 Coro::cede; 1945 cf::cede_to_tick;
1915 1946
1916 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1948 $self->decay_objects;
1918 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1919 $self->update_buttons; 1950 $self->update_buttons;
1920 Coro::cede; 1951 cf::cede_to_tick;
1921 $self->set_darkness_map; 1952 $self->set_darkness_map;
1922 Coro::cede; 1953 cf::cede_to_tick;
1923 $self->activate; 1954 $self->activate;
1924 } 1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1925 1959
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1960 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1961 }
1928 1962
1929 $self->post_load; 1963 $self->post_load;
… …
1940 1974
1941 $self 1975 $self
1942} 1976}
1943 1977
1944# find and load all maps in the 3x3 area around a map 1978# find and load all maps in the 3x3 area around a map
1945sub load_diag { 1979sub load_neighbours {
1946 my ($map) = @_; 1980 my ($map) = @_;
1947 1981
1948 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1949 1983
1950 for (0 .. 3) { 1984 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1952 or next; 1986 or next;
1953 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1954 or next; 1988 or next;
1955 $neigh->load; 1989 $neigh->load;
1956 1990
1991 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1994 }
1960 1995
1961 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1963 or next; 1999 or next;
1964 $neigh->load; 2000 $neigh->load;
1965 } 2001 }
1966} 2002}
1967 2003
… …
1972} 2008}
1973 2009
1974sub do_load_sync { 2010sub do_load_sync {
1975 my ($map) = @_; 2011 my ($map) = @_;
1976 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1977 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1978} 2017}
1979 2018
1980our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1982 2021
1983sub find_async { 2022sub find_async {
1984 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1985 2024
1986 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1987 2026
1988 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 2029 }
1991 2030
1992 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1993 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1994 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2036 if (my $map = find $k) {
1997 $map->load; 2037 $map->load if $v;
1998 } 2038 }
1999 2039
2000 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
2001 } 2041 }
2002 } 2042 }
2003 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
2004 }; 2044 };
2005 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
… …
2008} 2048}
2009 2049
2010sub save { 2050sub save {
2011 my ($self) = @_; 2051 my ($self) = @_;
2012 2052
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2054
2015 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
2016 2056
2017 return unless $self->dirty; 2057 return unless $self->dirty;
2018 2058
… …
2041 my ($self) = @_; 2081 my ($self) = @_;
2042 2082
2043 # save first because save cedes 2083 # save first because save cedes
2044 $self->save; 2084 $self->save;
2045 2085
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2087
2048 return if $self->players; 2088 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2090 return if $self->{deny_save};
2051 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2096 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2097}
2055 2098
2056sub reset_at { 2099sub reset_at {
2057 my ($self) = @_; 2100 my ($self) = @_;
2058 2101
… …
2090 if $uniq; 2133 if $uniq;
2091 } 2134 }
2092 2135
2093 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
2094 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2140 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2141
2099 $self->unlink_save; 2142 $self->unlink_save;
2100 $self->destroy; 2143 $self->destroy;
2101} 2144}
2102 2145
2103my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
2104 2147
2105sub nuke { 2148sub nuke {
2106 my ($self) = @_; 2149 my ($self) = @_;
2107 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
2108 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
2109 2155
2110 $self->unlink_save; 2156 $self->unlink_save;
2111 2157
2112 bless $self, "cf::map"; 2158 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2163
2118 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
2119 2166
2120 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2121} 2168}
2122 2169
2123=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
… …
2199 2246
2200sub inv_recursive { 2247sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2202} 2249}
2203 2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
2280}
2281
2204package cf; 2282package cf;
2205 2283
2206=back 2284=back
2207 2285
2208=head3 cf::object::player 2286=head3 cf::object::player
… …
2240 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2241 } 2319 }
2242 } 2320 }
2243} 2321}
2244 2322
2323=item $object->send_msg ($channel, $msg, $color, [extra...])
2324
2325=cut
2326
2327sub cf::object::send_msg {
2328 my $pl = shift->contr
2329 or return;
2330 $pl->send_msg (@_);
2331}
2332
2245=item $player_object->may ("access") 2333=item $player_object->may ("access")
2246 2334
2247Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2336(e.g. "command_wizcast").
2249 2337
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
2329 2417
2330 $map->load; 2418 $map->load;
2331 $map->load_diag; 2419 $map->load_neighbours;
2332 2420
2333 return unless $self->contr->active; 2421 return unless $self->contr->active;
2334 $self->activate_recursive; 2422 $self->activate_recursive;
2335 2423
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2595the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2596the message unless the client supports the msg packet.
2509 2597
2510=cut 2598=cut
2511 2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2512sub cf::client::send_msg { 2615sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2616 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2617
2515 $msg = $self->pl->expand_cfpod ($msg); 2618 $msg = $self->pl->expand_cfpod ($msg);
2516 2619
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2518 2624
2519 if (ref $channel) { 2625 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2626 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2627 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2628 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2524 } 2631 }
2525 2632
2526 $channel = $channel->{id}; 2633 $channel = $channel->{id};
2527 } 2634 }
2528 2635
2529 return unless @extra || length $msg; 2636 return unless @extra || length $msg;
2530 2637
2531 if ($self->can_msg) { 2638 if ($self->can_msg) {
2639 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF;
2642
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2643 $self->send_packet ("msg " . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2645 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656
2657 $color &= cf::NDI_COLOR_MASK;
2658
2659 utf8::encode $msg;
2660
2545 if (0 && $msg =~ /\[/) { 2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2664 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2666 $self->send_packet ("drawinfo $color $msg")
2550 } 2667 }
2551 } 2668 }
… …
2559=cut 2676=cut
2560 2677
2561sub cf::client::ext_msg($$@) { 2678sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2679 my ($self, $type, @msg) = @_;
2563 2680
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2681 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2683 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2684 push @msg, msgtype => "event_$type";
2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 }
2687}
2688
2689=item $client->ext_reply ($msgid, @msg)
2690
2691Sends an ext reply to the client.
2692
2693=cut
2694
2695sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_;
2697
2698 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2704 }
2572} 2705}
2573 2706
2574=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 2769 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2770 "ARRAY" eq ref $msg
2638 ? @$msg 2771 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2773
2774 my @reply;
2775
2641 if (my $cb = $EXTICMD{$type}) { 2776 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2777 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2647 } else { 2783 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2784 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2785 }
2650 2786
2651 cf::override; 2787 cf::override;
… …
2698our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2700 2836
2701$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2702 2838
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2839$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math
2841 grepstart grepwhile mapstart mapwhile
2842 sort time
2843));
2704 2844
2705# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2706 2846
2707=pod 2847=pod
2708 2848
2709The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2710 2850
2711 cf::object 2851 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2852 contr pay_amount pay_player map x y force_find force_add
2713 insert remove 2853 insert remove name archname title slaying race decrease_ob_nr
2714 2854
2715 cf::object::player 2855 cf::object::player
2716 player 2856 player
2717 2857
2718 cf::player 2858 cf::player
… …
2723 2863
2724=cut 2864=cut
2725 2865
2726for ( 2866for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race
2728 insert remove)], 2869 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2732) { 2873) {
2733 no strict 'refs'; 2874 no strict 'refs';
… …
2809# the server's init and main functions 2950# the server's init and main functions
2810 2951
2811sub load_facedata($) { 2952sub load_facedata($) {
2812 my ($path) = @_; 2953 my ($path) = @_;
2813 2954
2955 # HACK to clear player env face cache, we need some signal framework
2956 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2958
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2960
2814 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2815 2962
2816 my $facedata; 2963 my $facedata;
2817 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2965 or die "$path: $!";
2819 2966
2820 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2821 2968
2822 $facedata->{version} == 2 2969 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2971
2972 # patch in the exptable
2973 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC,
2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2976 };
2977 cf::cede_to_tick;
2824 2978
2825 { 2979 {
2826 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2827 2981
2828 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2985 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2988
2835 cf::cede_to_tick; 2989 cf::cede_to_tick;
2836 } 2990 }
2837 2991
2838 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
… …
2863 3017
2864 { 3018 {
2865 # TODO: for gcfclient pleasure, we should give resources 3019 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3020 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3021 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3022
2870 if (my $soundconf = delete $res->{"res/sound.conf"}) { 3023 my $soundconf = delete $res->{"res/sound.conf"};
2871 $soundconf = $enc->decode (delete $soundconf->{data});
2872 # todo
2873 }
2874 3024
2875 while (my ($name, $info) = each %$res) { 3025 while (my ($name, $info) = each %$res) {
2876 my $meta = $enc->encode ({
2877 name => $name,
2878 %{ $info->{meta} || {} },
2879 });
2880
2881 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
2882 3028
2883 if ($info->{type} & 1) { 3029 if ($info->{type} & 1) {
2884 # prepend meta info 3030 # prepend meta info
2885 3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
2886 my $data = pack "(w/a*)*", $meta, $info->{data}; 3037 $data = pack "(w/a*)*", $meta, $info->{data};
2887 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2888
2889 cf::face::set_data $idx, 0, $data, $chk;
2890 } else { 3038 } else {
2891 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3039 $data = $info->{data};
2892 } 3040 }
2893 3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2894 cf::face::set_type $idx, $info->{type}; 3043 cf::face::set_type $idx, $info->{type};
2895 3044
2896 cf::cede_to_tick; 3045 cf::cede_to_tick;
3046 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
2897 } 3064 }
2898 } 3065 }
2899 3066
2900 1 3067 1
2901} 3068}
… …
2907 $ns->fx_want ($k, $v); 3074 $ns->fx_want ($k, $v);
2908 } 3075 }
2909}; 3076};
2910 3077
2911sub reload_regions { 3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
2912 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2913 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
2914 3085
2915 for (cf::region::list) { 3086 for (cf::region::list) {
2916 $_->{match} = qr/$_->{match}/ 3087 $_->{match} = qr/$_->{match}/
… …
2952 3123
2953sub init { 3124sub init {
2954 reload_resources; 3125 reload_resources;
2955} 3126}
2956 3127
2957sub cfg_load { 3128sub reload_config {
2958 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2959 or return; 3130 or return;
2960 3131
2961 local $/; 3132 local $/;
2962 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
… …
2982 (async { 3153 (async {
2983 Event::one_event; 3154 Event::one_event;
2984 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2985 }; 3156 };
2986 3157
2987 cfg_load; 3158 reload_config;
2988 db_init; 3159 db_init;
2989 load_extensions; 3160 load_extensions;
2990 3161
2991 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2992 Event::loop; 3163 Event::loop;
… …
3185 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
3186 require cf; 3357 require cf;
3187 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3188 3359
3189 warn "loading config and database again"; 3360 warn "loading config and database again";
3190 cf::cfg_load; 3361 cf::reload_config;
3191 3362
3192 warn "loading extensions"; 3363 warn "loading extensions";
3193 cf::load_extensions; 3364 cf::load_extensions;
3194 3365
3195 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
… …
3288 or die; 3459 or die;
3289 3460
3290 $map->width (50); 3461 $map->width (50);
3291 $map->height (50); 3462 $map->height (50);
3292 $map->alloc; 3463 $map->alloc;
3293 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3294 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
3295 3466
3296 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
3297 if ($t < $min) { 3468 if ($t < $min) {
3298 $min = $t; 3469 $min = $t;

Diff Legend

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