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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.358 by root, Fri Sep 7 18:10:52 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
… …
322 }; 334 };
323 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
324 $guard 336 $guard
325} 337}
326 338
327=item cf::get_slot $time[, $priority] 339=item cf::get_slot $time[, $priority[, $name]]
328 340
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 341Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 342This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
332 347
333Useful for short background jobs. 348Useful for short background jobs.
334 349
335=cut 350=cut
336 351
… …
363 Coro::schedule; 378 Coro::schedule;
364 } 379 }
365 } 380 }
366}; 381};
367 382
368sub get_slot($;$) { 383sub get_slot($;$$) {
369 my ($time, $pri) = @_; 384 my ($time, $pri, $name) = @_;
370 385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 391 $SLOT_QUEUE->ready;
374 $sig->wait; 392 $sig->wait;
375} 393}
376 394
… …
466Coro::Storable. May, of course, block. Note that the executed sub may 484Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 485never block itself or use any form of Event handling.
468 486
469=cut 487=cut
470 488
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 489sub fork_call(&@) {
481 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
482 491
483# 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,
484# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 495
488 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 497 reset_signals;
502 local $SIG{__WARN__}; 498 &$cb
503 local $SIG{__DIE__}; 499 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 500
510 eval { 501 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 502}
523 503
524=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
525 505
526Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
606 if (1) { 586 if (1) {
607 $md5 = 587 $md5 =
608 join "\x00", 588 join "\x00",
609 $processversion, 589 $processversion,
610 map { 590 map {
611 Coro::cede; 591 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 593 } 0.. $#$src;
614 594
615 595
616 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
1032 }, 1012 },
1033); 1013);
1034 1014
1035sub object_freezer_save { 1015sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
1037 1019
1038 sync_job { 1020 sync_job {
1039 if (length $$rdata) { 1021 if (length $$rdata) {
1040 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
1065 } 1047 }
1066 } else { 1048 } else {
1067 aio_unlink $filename; 1049 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1069 } 1051 }
1070 } 1052 };
1053
1054 undef $guard;
1071} 1055}
1072 1056
1073sub object_freezer_as_string { 1057sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1075 1059
… …
1080 1064
1081sub object_thawer_load { 1065sub object_thawer_load {
1082 my ($filename) = @_; 1066 my ($filename) = @_;
1083 1067
1084 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1085 1071
1086 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1087 or return; 1073 or return;
1088 1074
1089 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1077 or return;
1078
1079 undef $guard;
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1093 } 1081 }
1094 1082
1095 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1097 return ($data, $av); 1086 ($data, $av)
1098} 1087}
1099 1088
1100=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1101 1090
1102=over 4 1091=over 4
… …
1175 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
1176 1165
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1167
1179 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1185 } else { 1183 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1185 }
1188 1186
1189 cf::override; 1187 cf::override;
… …
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1325
1328 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1327 or return;
1328
1329 $f->next;
1330 my $pl = cf::player::load_pl $f
1331 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1331 } 1335 }
1332 } 1336 }
1333} 1337}
1334 1338
… …
1344 1348
1345 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1347 1351
1348 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1349 Coro::cede; 1353 cf::cede_to_tick;
1350} 1354}
1351 1355
1352sub new($) { 1356sub new($) {
1353 my ($login) = @_; 1357 my ($login) = @_;
1354 1358
… …
1358 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1359 1363
1360 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1361 1365
1362 $self 1366 $self
1367}
1368
1369=item $player->send_msg ($channel, $msg, $color, [extra...])
1370
1371=cut
1372
1373sub send_msg {
1374 my $ns = shift->ns
1375 or return;
1376 $ns->send_msg (@_);
1363} 1377}
1364 1378
1365=item $pl->quit_character 1379=item $pl->quit_character
1366 1380
1367Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
… …
1422 or return []; 1436 or return [];
1423 1437
1424 my @logins; 1438 my @logins;
1425 1439
1426 for my $login (@$dirs) { 1440 for my $login (@$dirs) {
1441 my $path = path $login;
1442
1443 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1430 1449
1431 utf8::decode $login; 1450 utf8::decode $login;
1432 push @logins, $login; 1451 push @logins, $login;
1433 } 1452 }
1434 1453
… …
1472sub expand_cfpod { 1491sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1474 1493
1475 # escape & and < 1494 # escape & and <
1476 s/&/&amp;/g; 1495 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1478 1497
1479 # this is buggy, it needs to properly take care of nested <'s 1498 # this is buggy, it needs to properly take care of nested <'s
1480 1499
1481 1 while 1500 1 while
1482 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1506 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1489 }ge 1509 }ge
1490 # replace H<hint text> 1510 # replace H<hint text>
… …
1511sub hintmode { 1531sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1533 $_[0]{hintmode}
1514} 1534}
1515 1535
1516=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1517 1537
1518Sends an ext reply to the player. 1538Sends an ext reply to the player.
1519 1539
1520=cut 1540=cut
1521 1541
1522sub ext_reply($$%) { 1542sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1524 1544
1525 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1546}
1528 1547
1529=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1530 1549
1531Sends an ext event to the client. 1550Sends an ext event to the client.
1532 1551
1533=cut 1552=cut
1534 1553
1535sub ext_event($$%) { 1554sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1537 1556
1538 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1539} 1558}
1540 1559
1541=head3 cf::region 1560=head3 cf::region
1542 1561
1543=over 4 1562=over 4
… …
1759 1778
1760sub load_header_from($) { 1779sub load_header_from($) {
1761 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1762 1781
1763 utf8::encode $path; 1782 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1784 or return;
1785
1786 $self->_load_header ($f)
1787 or return;
1788
1789 local $MAP_LOADING{$self->{path}} = $self;
1790 $f->resolve_delayed_derefs;
1769 1791
1770 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1771 1793
1772 1 1794 1
1773} 1795}
… …
1827sub find { 1849sub find {
1828 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1829 1851
1830 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1831 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1833 1856
1834 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path"; 1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1836 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1837 or return; 1862 or return;
1838 1863
1839 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1840 1865
… …
1842 or return; 1867 or return;
1843 1868
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1847 $map->reset; 1874 $map->reset;
1848 undef $guard;
1849 return find $path; 1875 return find $path;
1850 } 1876 }
1851 1877
1852 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1853 } 1879 }
… …
1862 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1863 1889
1864 my $path = $self->{path}; 1890 my $path = $self->{path};
1865 1891
1866 { 1892 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1868 1894
1895 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1870 1897
1871 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1872 1899
1873 $self->alloc; 1900 $self->alloc;
1874 1901
1875 $self->pre_load; 1902 $self->pre_load;
1876 Coro::cede; 1903 cf::cede_to_tick;
1877 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1879 or return; 1908 or return;
1880 1909
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1883 1912
1884 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 1914 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 1917 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1889 } 1921 }
1890 } 1922 }
1891 1923
1892 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1893 # now do the right thing for maps 1927 # now do the right thing for maps
1894 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1930 unless $self->difficulty;
1897 Coro::cede; 1931 cf::cede_to_tick;
1898 1932
1899 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1934 $self->decay_objects;
1901 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1902 $self->update_buttons; 1936 $self->update_buttons;
1903 Coro::cede; 1937 cf::cede_to_tick;
1904 $self->set_darkness_map; 1938 $self->set_darkness_map;
1905 Coro::cede; 1939 cf::cede_to_tick;
1906 $self->activate; 1940 $self->activate;
1907 } 1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1908 1945
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1947 }
1911 1948
1912 $self->post_load; 1949 $self->post_load;
… …
1923 1960
1924 $self 1961 $self
1925} 1962}
1926 1963
1927# find and load all maps in the 3x3 area around a map 1964# find and load all maps in the 3x3 area around a map
1928sub load_diag { 1965sub load_neighbours {
1929 my ($map) = @_; 1966 my ($map) = @_;
1930 1967
1931 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1932 1969
1933 for (0 .. 3) { 1970 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1935 or next; 1972 or next;
1936 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1937 or next; 1974 or next;
1938 $neigh->load; 1975 $neigh->load;
1939 1976
1977 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 1980 }
1943 1981
1944 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1946 or next; 1985 or next;
1947 $neigh->load; 1986 $neigh->load;
1948 } 1987 }
1949} 1988}
1950 1989
… …
1955} 1994}
1956 1995
1957sub do_load_sync { 1996sub do_load_sync {
1958 my ($map) = @_; 1997 my ($map) = @_;
1959 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1960 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1961} 2003}
1962 2004
1963our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1965 2007
1966sub find_async { 2008sub find_async {
1967 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1968 2010
1969 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1970 2012
1971 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2015 }
1974 2016
1975 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1976 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1977 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2022 if (my $map = find $k) {
1980 $map->load; 2023 $map->load if $v;
1981 } 2024 }
1982 2025
1983 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1984 } 2027 }
1985 } 2028 }
1986 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1987 }; 2030 };
1988 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
1991} 2034}
1992 2035
1993sub save { 2036sub save {
1994 my ($self) = @_; 2037 my ($self) = @_;
1995 2038
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2040
1998 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1999 2042
2000 return unless $self->dirty; 2043 return unless $self->dirty;
2001 2044
… …
2024 my ($self) = @_; 2067 my ($self) = @_;
2025 2068
2026 # save first because save cedes 2069 # save first because save cedes
2027 $self->save; 2070 $self->save;
2028 2071
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2073
2031 return if $self->players; 2074 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2034 2077
2078 $self->deactivate;
2035 $self->clear; 2079 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED); 2080 $self->in_memory (cf::MAP_SWAPPED);
2037} 2081}
2038 2082
2039sub reset_at { 2083sub reset_at {
… …
2073 if $uniq; 2117 if $uniq;
2074 } 2118 }
2075 2119
2076 delete $cf::MAP{$self->path}; 2120 delete $cf::MAP{$self->path};
2077 2121
2122 $self->deactivate;
2078 $self->clear; 2123 $self->clear;
2079 2124
2080 $_->clear_links_to ($self) for values %cf::MAP; 2125 $_->clear_links_to ($self) for values %cf::MAP;
2081 2126
2082 $self->unlink_save; 2127 $self->unlink_save;
… …
2086my $nuke_counter = "aaaa"; 2131my $nuke_counter = "aaaa";
2087 2132
2088sub nuke { 2133sub nuke {
2089 my ($self) = @_; 2134 my ($self) = @_;
2090 2135
2136 {
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
2091 delete $cf::MAP{$self->path}; 2139 delete $cf::MAP{$self->path};
2092 2140
2093 $self->unlink_save; 2141 $self->unlink_save;
2094 2142
2095 bless $self, "cf::map"; 2143 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2144 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2145 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2146 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2147 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2148
2101 $cf::MAP{$self->path} = $self; 2149 $cf::MAP{$self->path} = $self;
2150 }
2102 2151
2103 $self->reset; # polite request, might not happen 2152 $self->reset; # polite request, might not happen
2104} 2153}
2105 2154
2106=item $maps = cf::map::tmp_maps 2155=item $maps = cf::map::tmp_maps
… …
2182 2231
2183sub inv_recursive { 2232sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2233 inv_recursive_ inv $_[0]
2185} 2234}
2186 2235
2236=item $ref = $ob->ref
2237
2238creates and returns a persistent reference to an objetc that can be stored as a string.
2239
2240=item $ob = cf::object::deref ($refstring)
2241
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block.
2244
2245=cut
2246
2247sub deref {
2248 my ($ref) = @_;
2249
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return;
2257 $pl->ob->uuid eq $uuid
2258 or return;
2259
2260 $pl->ob
2261 } else {
2262 warn "$ref: cannot resolve object reference\n";
2263 undef
2264 }
2265}
2266
2187package cf; 2267package cf;
2188 2268
2189=back 2269=back
2190 2270
2191=head3 cf::object::player 2271=head3 cf::object::player
… …
2213 2293
2214 } else { 2294 } else {
2215 my $pl = $self->contr; 2295 my $pl = $self->contr;
2216 2296
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2297 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2298 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2300
2226 } else { 2301 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2302 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2303 $self->message ($msg, $flags);
2229 } 2304 }
2230 } 2305 }
2306}
2307
2308=item $object->send_msg ($channel, $msg, $color, [extra...])
2309
2310=cut
2311
2312sub cf::object::send_msg {
2313 my $pl = shift->contr
2314 or return;
2315 $pl->send_msg (@_);
2231} 2316}
2232 2317
2233=item $player_object->may ("access") 2318=item $player_object->may ("access")
2234 2319
2235Returns wether the given player is authorized to access resource "access" 2320Returns wether the given player is authorized to access resource "access"
… …
2314 # use -1 or undef as default coordinates, not 0, 0 2399 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2400 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2401 if $x <=0 && $y <= 0;
2317 2402
2318 $map->load; 2403 $map->load;
2319 $map->load_diag; 2404 $map->load_neighbours;
2320 2405
2321 return unless $self->contr->active; 2406 return unless $self->contr->active;
2322 $self->activate_recursive; 2407 $self->activate_recursive;
2323 2408
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2409 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2580the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2581the message unless the client supports the msg packet.
2497 2582
2498=cut 2583=cut
2499 2584
2585our %CHANNEL = (
2586 "c/identify" => {
2587 id => "identify",
2588 title => "Identify",
2589 reply => undef,
2590 tooltip => "Items recently identified",
2591 },
2592 "c/examine" => {
2593 id => "examine",
2594 title => "Examine",
2595 reply => undef,
2596 tooltip => "Signs and other items you examined",
2597 },
2598);
2599
2500sub cf::client::send_msg { 2600sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2601 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2602
2503 $msg = $self->pl->expand_cfpod ($msg); 2603 $msg = $self->pl->expand_cfpod ($msg);
2504 2604
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2605 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606
2607 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2506 2609
2507 if (ref $channel) { 2610 if (ref $channel) {
2508 # send meta info to client, if not yet sent 2611 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2612 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2613 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2614 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg;
2512 } 2616 }
2513 2617
2514 $channel = $channel->{id}; 2618 $channel = $channel->{id};
2515 } 2619 }
2516 2620
2517 return unless @extra || length $msg; 2621 return unless @extra || length $msg;
2518 2622
2519 if ($self->can_msg) { 2623 if ($self->can_msg) {
2624 # default colour, mask it out
2625 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2626 if $color & cf::NDI_DEF;
2627
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2628 $self->send_packet ("msg " . $self->{json_coder}->encode (
2629 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2630 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2631 if ($color >= 0) {
2632 # replace some tags by gcfclient-compatible ones
2633 for ($msg) {
2634 1 while
2635 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2636 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2637 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2638 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2639 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2640 }
2641
2642 $color &= cf::NDI_COLOR_MASK;
2643
2644 utf8::encode $msg;
2645
2533 if (0 && $msg =~ /\[/) { 2646 if (0 && $msg =~ /\[/) {
2647 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2648 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2649 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2650 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2651 $self->send_packet ("drawinfo $color $msg")
2538 } 2652 }
2539 } 2653 }
2540 } 2654 }
2541} 2655}
2542 2656
2543=item $client->ext_event ($type, %msg) 2657=item $client->ext_msg ($type, @msg)
2544 2658
2545Sends an ext event to the client. 2659Sends an ext event to the client.
2546 2660
2547=cut 2661=cut
2548 2662
2549sub cf::client::ext_event($$%) { 2663sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2664 my ($self, $type, @msg) = @_;
2551 2665
2552 return unless $self->extcmd; 2666 if ($self->extcmd == 2) {
2553 2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2668 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2669 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 }
2672}
2673
2674=item $client->ext_reply ($msgid, @msg)
2675
2676Sends an ext reply to the client.
2677
2678=cut
2679
2680sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_;
2682
2683 if ($self->extcmd == 2) {
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id;
2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2689 }
2556} 2690}
2557 2691
2558=item $success = $client->query ($flags, "text", \&cb) 2692=item $success = $client->query ($flags, "text", \&cb)
2559 2693
2560Queues a query to the client, calling the given callback with 2694Queues a query to the client, calling the given callback with
… …
2615 my ($ns, $buf) = @_; 2749 my ($ns, $buf) = @_;
2616 2750
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2751 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2752
2619 if (ref $msg) { 2753 if (ref $msg) {
2754 my ($type, $reply, @payload) =
2755 "ARRAY" eq ref $msg
2756 ? @$msg
2757 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2758
2759 my @reply;
2760
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2761 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2762 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2763 }
2764
2765 $ns->ext_reply ($reply, @reply)
2766 if $reply;
2767
2626 } else { 2768 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2769 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2770 }
2629 2771
2630 cf::override; 2772 cf::override;
… …
2677our $safe = new Safe "safe"; 2819our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2820our $safe_hole = new Safe::Hole;
2679 2821
2680$SIG{FPE} = 'IGNORE'; 2822$SIG{FPE} = 'IGNORE';
2681 2823
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2824$safe->permit_only (Opcode::opset qw(
2825 :base_core :base_mem :base_orig :base_math
2826 grepstart grepwhile mapstart mapwhile
2827 sort time
2828));
2683 2829
2684# here we export the classes and methods available to script code 2830# here we export the classes and methods available to script code
2685 2831
2686=pod 2832=pod
2687 2833
2688The following functions and methods are available within a safe environment: 2834The following functions and methods are available within a safe environment:
2689 2835
2690 cf::object 2836 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 2837 contr pay_amount pay_player map x y force_find force_add
2692 insert remove 2838 insert remove name archname title slaying race decrease_ob_nr
2693 2839
2694 cf::object::player 2840 cf::object::player
2695 player 2841 player
2696 2842
2697 cf::player 2843 cf::player
… …
2702 2848
2703=cut 2849=cut
2704 2850
2705for ( 2851for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race
2707 insert remove)], 2854 decrease_ob_nr)],
2708 ["cf::object::player" => qw(player)], 2855 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2856 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2857 ["cf::map" => qw(trigger)],
2711) { 2858) {
2712 no strict 'refs'; 2859 no strict 'refs';
… …
2788# the server's init and main functions 2935# the server's init and main functions
2789 2936
2790sub load_facedata($) { 2937sub load_facedata($) {
2791 my ($path) = @_; 2938 my ($path) = @_;
2792 2939
2940 # HACK to clear player env face cache, we need some signal framework
2941 # for this (global event?)
2942 %ext::player_env::MUSIC_FACE_CACHE = ();
2943
2944 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2945
2793 warn "loading facedata from $path\n"; 2946 warn "loading facedata from $path\n";
2794 2947
2795 my $facedata; 2948 my $facedata;
2796 0 < aio_load $path, $facedata 2949 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 2950 or die "$path: $!";
2798 2951
2799 $facedata = Coro::Storable::thaw $facedata; 2952 $facedata = Coro::Storable::thaw $facedata;
2800 2953
2801 $facedata->{version} == 2 2954 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 2955 or cf::cleanup "$path: version mismatch, cannot proceed.";
2956
2957 # patch in the exptable
2958 $facedata->{resource}{"res/exp_table"} = {
2959 type => FT_RSRC,
2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2961 };
2962 cf::cede_to_tick;
2803 2963
2804 { 2964 {
2805 my $faces = $facedata->{faceinfo}; 2965 my $faces = $facedata->{faceinfo};
2806 2966
2807 while (my ($face, $info) = each %$faces) { 2967 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2968 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 2969 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 2970 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 2973
2814 cf::cede_to_tick; 2974 cf::cede_to_tick;
2815 } 2975 }
2816 2976
2817 while (my ($face, $info) = each %$faces) { 2977 while (my ($face, $info) = each %$faces) {
… …
2842 3002
2843 { 3003 {
2844 # TODO: for gcfclient pleasure, we should give resources 3004 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3005 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3006 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 3007
3008 my $soundconf = delete $res->{"res/sound.conf"};
2848 3009
2849 while (my ($name, $info) = each %$res) { 3010 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3011 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
2857 3013
2858 if ($name =~ /\.jpg$/) { 3014 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3015 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3016
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
3022 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 3023 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3024 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3025 }
2868 3026
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
2869 cf::cede_to_tick; 3030 cf::cede_to_tick;
2870 } 3031 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
2871 } 3050 }
2872 3051
2873 1 3052 1
2874} 3053}
2875 3054
3055register_exticmd fx_want => sub {
3056 my ($ns, $want) = @_;
3057
3058 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v);
3060 }
3061};
3062
2876sub reload_regions { 3063sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = ();
3067
2877 load_resource_file "$MAPDIR/regions" 3068 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3069 or die "unable to load regions file\n";
2879 3070
2880 for (cf::region::list) { 3071 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3072 $_->{match} = qr/$_->{match}/
… …
2917 3108
2918sub init { 3109sub init {
2919 reload_resources; 3110 reload_resources;
2920} 3111}
2921 3112
2922sub cfg_load { 3113sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3114 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3115 or return;
2925 3116
2926 local $/; 3117 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3118 *CFG = YAML::Syck::Load <$fh>;
… …
2947 (async { 3138 (async {
2948 Event::one_event; 3139 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3140 })->prio (Coro::PRIO_MAX);
2950 }; 3141 };
2951 3142
2952 cfg_load; 3143 reload_config;
2953 db_init; 3144 db_init;
2954 load_extensions; 3145 load_extensions;
2955 3146
2956 $TICK_WATCHER->start; 3147 $TICK_WATCHER->start;
2957 Event::loop; 3148 Event::loop;
… …
3150 warn "reloading cf.pm"; 3341 warn "reloading cf.pm";
3151 require cf; 3342 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3344
3154 warn "loading config and database again"; 3345 warn "loading config and database again";
3155 cf::cfg_load; 3346 cf::reload_config;
3156 3347
3157 warn "loading extensions"; 3348 warn "loading extensions";
3158 cf::load_extensions; 3349 cf::load_extensions;
3159 3350
3160 warn "reattaching attachments to objects/players"; 3351 warn "reattaching attachments to objects/players";
… …
3253 or die; 3444 or die;
3254 3445
3255 $map->width (50); 3446 $map->width (50);
3256 $map->height (50); 3447 $map->height (50);
3257 $map->alloc; 3448 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1); 3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3259 my $t = Event::time - $t; 3450 my $t = Event::time - $t;
3260 3451
3261 #next unless $t < 0.0013;#d# 3452 #next unless $t < 0.0013;#d#
3262 if ($t < $min) { 3453 if ($t < $min) {
3263 $min = $t; 3454 $min = $t;

Diff Legend

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