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.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
… …
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;
… …
1279 1277
1280=head3 cf::player 1278=head3 cf::player
1281 1279
1282=over 4 1280=over 4
1283 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
1284=item cf::player::find $login 1296=item cf::player::find $login
1285 1297
1286Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1287 1299
1288=cut 1300=cut
… …
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1339
1328 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1329 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;
1330 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1331 } 1349 }
1332 } 1350 }
1333} 1351}
1334 1352
… …
1344 1362
1345 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1347 1365
1348 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1349 Coro::cede; 1367 cf::cede_to_tick;
1350} 1368}
1351 1369
1352sub new($) { 1370sub new($) {
1353 my ($login) = @_; 1371 my ($login) = @_;
1354 1372
… …
1358 $self->{deny_save} = 1; 1376 $self->{deny_save} = 1;
1359 1377
1360 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1361 1379
1362 $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 (@_);
1363} 1391}
1364 1392
1365=item $pl->quit_character 1393=item $pl->quit_character
1366 1394
1367Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
… …
1422 or return []; 1450 or return [];
1423 1451
1424 my @logins; 1452 my @logins;
1425 1453
1426 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") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1430 1463
1431 utf8::decode $login; 1464 utf8::decode $login;
1432 push @logins, $login; 1465 push @logins, $login;
1433 } 1466 }
1434 1467
… …
1472sub expand_cfpod { 1505sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1506 ((my $self), (local $_)) = @_;
1474 1507
1475 # escape & and < 1508 # escape & and <
1476 s/&/&amp;/g; 1509 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1510 s/(?<![BIUGHT])</&lt;/g;
1478 1511
1479 # 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
1480 1513
1481 1 while 1514 1 while
1482 # replace B<>, I<>, U<> etc. 1515 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1516 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1520 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1521 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1522 $self->gender ? $2 : $1
1489 }ge 1523 }ge
1490 # replace H<hint text> 1524 # replace H<hint text>
… …
1511sub hintmode { 1545sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1547 $_[0]{hintmode}
1514} 1548}
1515 1549
1516=item $player->ext_reply ($msgid, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1517 1551
1518Sends an ext reply to the player. 1552Sends an ext reply to the player.
1519 1553
1520=cut 1554=cut
1521 1555
1522sub ext_reply($$%) { 1556sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1524 1558
1525 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1560}
1528 1561
1529=item $player->ext_event ($type, %msg) 1562=item $player->ext_msg ($type, @msg)
1530 1563
1531Sends an ext event to the client. 1564Sends an ext event to the client.
1532 1565
1533=cut 1566=cut
1534 1567
1535sub ext_event($$%) { 1568sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1569 my ($self, $type, @msg) = @_;
1537 1570
1538 $self->ns->ext_event ($type, %msg); 1571 $self->ns->ext_msg ($type, @msg);
1539} 1572}
1540 1573
1541=head3 cf::region 1574=head3 cf::region
1542 1575
1543=over 4 1576=over 4
… …
1759 1792
1760sub load_header_from($) { 1793sub load_header_from($) {
1761 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1762 1795
1763 utf8::encode $path; 1796 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 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;
1769 1805
1770 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1771 1807
1772 1 1808 1
1773} 1809}
… …
1827sub find { 1863sub find {
1828 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1829 1865
1830 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1831 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1833 1870
1834 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1835 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
1836 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1837 or return; 1876 or return;
1838 1877
1839 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1840 1879
… …
1842 or return; 1881 or return;
1843 1882
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1847 $map->reset; 1888 $map->reset;
1848 undef $guard;
1849 return find $path; 1889 return find $path;
1850 } 1890 }
1851 1891
1852 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1853 } 1893 }
… …
1862 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1863 1903
1864 my $path = $self->{path}; 1904 my $path = $self->{path};
1865 1905
1866 { 1906 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1868 1908
1909 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 1911
1871 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1872 1913
1873 $self->alloc; 1914 $self->alloc;
1874 1915
1875 $self->pre_load; 1916 $self->pre_load;
1876 Coro::cede; 1917 cf::cede_to_tick;
1877 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1879 or return; 1922 or return;
1880 1923
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1883 1926
1884 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 1928 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 1931 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1889 } 1935 }
1890 } 1936 }
1891 1937
1892 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1893 # now do the right thing for maps 1941 # now do the right thing for maps
1894 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1944 unless $self->difficulty;
1897 Coro::cede; 1945 cf::cede_to_tick;
1898 1946
1899 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1948 $self->decay_objects;
1901 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1902 $self->update_buttons; 1950 $self->update_buttons;
1903 Coro::cede; 1951 cf::cede_to_tick;
1904 $self->set_darkness_map; 1952 $self->set_darkness_map;
1905 Coro::cede; 1953 cf::cede_to_tick;
1906 $self->activate; 1954 $self->activate;
1907 } 1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1908 1959
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1960 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1961 }
1911 1962
1912 $self->post_load; 1963 $self->post_load;
… …
1923 1974
1924 $self 1975 $self
1925} 1976}
1926 1977
1927# 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
1928sub load_diag { 1979sub load_neighbours {
1929 my ($map) = @_; 1980 my ($map) = @_;
1930 1981
1931 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1932 1983
1933 for (0 .. 3) { 1984 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1935 or next; 1986 or next;
1936 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1937 or next; 1988 or next;
1938 $neigh->load; 1989 $neigh->load;
1939 1990
1991 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 1994 }
1943 1995
1944 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1946 or next; 1999 or next;
1947 $neigh->load; 2000 $neigh->load;
1948 } 2001 }
1949} 2002}
1950 2003
… …
1955} 2008}
1956 2009
1957sub do_load_sync { 2010sub do_load_sync {
1958 my ($map) = @_; 2011 my ($map) = @_;
1959 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1960 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1961} 2017}
1962 2018
1963our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1965 2021
1966sub find_async { 2022sub find_async {
1967 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1968 2024
1969 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1970 2026
1971 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2029 }
1974 2030
1975 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1976 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1977 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2036 if (my $map = find $k) {
1980 $map->load; 2037 $map->load if $v;
1981 } 2038 }
1982 2039
1983 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1984 } 2041 }
1985 } 2042 }
1986 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1987 }; 2044 };
1988 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
… …
1991} 2048}
1992 2049
1993sub save { 2050sub save {
1994 my ($self) = @_; 2051 my ($self) = @_;
1995 2052
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2054
1998 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1999 2056
2000 return unless $self->dirty; 2057 return unless $self->dirty;
2001 2058
… …
2024 my ($self) = @_; 2081 my ($self) = @_;
2025 2082
2026 # save first because save cedes 2083 # save first because save cedes
2027 $self->save; 2084 $self->save;
2028 2085
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2087
2031 return if $self->players; 2088 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2090 return if $self->{deny_save};
2034 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2096 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2097}
2038 2098
2039sub reset_at { 2099sub reset_at {
2040 my ($self) = @_; 2100 my ($self) = @_;
2041 2101
… …
2073 if $uniq; 2133 if $uniq;
2074 } 2134 }
2075 2135
2076 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
2077 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2140 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2141
2082 $self->unlink_save; 2142 $self->unlink_save;
2083 $self->destroy; 2143 $self->destroy;
2084} 2144}
2085 2145
2086my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
2087 2147
2088sub nuke { 2148sub nuke {
2089 my ($self) = @_; 2149 my ($self) = @_;
2090 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
2091 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
2092 2155
2093 $self->unlink_save; 2156 $self->unlink_save;
2094 2157
2095 bless $self, "cf::map"; 2158 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2163
2101 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
2102 2166
2103 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2104} 2168}
2105 2169
2106=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
… …
2182 2246
2183sub inv_recursive { 2247sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2185} 2249}
2186 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
2187package cf; 2282package cf;
2188 2283
2189=back 2284=back
2190 2285
2191=head3 cf::object::player 2286=head3 cf::object::player
… …
2213 2308
2214 } else { 2309 } else {
2215 my $pl = $self->contr; 2310 my $pl = $self->contr;
2216 2311
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2313 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2314 $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 2315
2226 } else { 2316 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2229 } 2319 }
2230 } 2320 }
2321}
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 (@_);
2231} 2331}
2232 2332
2233=item $player_object->may ("access") 2333=item $player_object->may ("access")
2234 2334
2235Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
… …
2314 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
2317 2417
2318 $map->load; 2418 $map->load;
2319 $map->load_diag; 2419 $map->load_neighbours;
2320 2420
2321 return unless $self->contr->active; 2421 return unless $self->contr->active;
2322 $self->activate_recursive; 2422 $self->activate_recursive;
2323 2423
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 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 2595the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2596the message unless the client supports the msg packet.
2497 2597
2498=cut 2598=cut
2499 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
2500sub cf::client::send_msg { 2615sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2616 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2617
2503 $msg = $self->pl->expand_cfpod ($msg); 2618 $msg = $self->pl->expand_cfpod ($msg);
2504 2619
2505 $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};
2506 2624
2507 if (ref $channel) { 2625 if (ref $channel) {
2508 # send meta info to client, if not yet sent 2626 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2627 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2628 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2512 } 2631 }
2513 2632
2514 $channel = $channel->{id}; 2633 $channel = $channel->{id};
2515 } 2634 }
2516 2635
2517 return unless @extra || length $msg; 2636 return unless @extra || length $msg;
2518 2637
2519 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
2520 $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]));
2521 } else { 2645 } 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) { 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
2533 if (0 && $msg =~ /\[/) { 2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2664 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2666 $self->send_packet ("drawinfo $color $msg")
2538 } 2667 }
2539 } 2668 }
2540 } 2669 }
2541} 2670}
2542 2671
2543=item $client->ext_event ($type, %msg) 2672=item $client->ext_msg ($type, @msg)
2544 2673
2545Sends an ext event to the client. 2674Sends an ext event to the client.
2546 2675
2547=cut 2676=cut
2548 2677
2549sub cf::client::ext_event($$%) { 2678sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2679 my ($self, $type, @msg) = @_;
2551 2680
2552 return unless $self->extcmd; 2681 if ($self->extcmd == 2) {
2553 2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2684 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 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;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 }
2556} 2705}
2557 2706
2558=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
2559 2708
2560Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
… …
2615 my ($ns, $buf) = @_; 2764 my ($ns, $buf) = @_;
2616 2765
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2767
2619 if (ref $msg) { 2768 if (ref $msg) {
2769 my ($type, $reply, @payload) =
2770 "ARRAY" eq ref $msg
2771 ? @$msg
2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2773
2774 my @reply;
2775
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2776 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2777 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2626 } else { 2783 } else {
2627 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";
2628 } 2785 }
2629 2786
2630 cf::override; 2787 cf::override;
… …
2677our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2679 2836
2680$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2681 2838
2682$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));
2683 2844
2684# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2685 2846
2686=pod 2847=pod
2687 2848
2688The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2689 2850
2690 cf::object 2851 cf::object
2691 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
2692 insert remove 2853 insert remove name archname title slaying race decrease_ob_nr
2693 2854
2694 cf::object::player 2855 cf::object::player
2695 player 2856 player
2696 2857
2697 cf::player 2858 cf::player
… …
2702 2863
2703=cut 2864=cut
2704 2865
2705for ( 2866for (
2706 ["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
2707 insert remove)], 2869 decrease_ob_nr)],
2708 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2711) { 2873) {
2712 no strict 'refs'; 2874 no strict 'refs';
… …
2788# the server's init and main functions 2950# the server's init and main functions
2789 2951
2790sub load_facedata($) { 2952sub load_facedata($) {
2791 my ($path) = @_; 2953 my ($path) = @_;
2792 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
2793 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2794 2962
2795 my $facedata; 2963 my $facedata;
2796 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 2965 or die "$path: $!";
2798 2966
2799 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2800 2968
2801 $facedata->{version} == 2 2969 $facedata->{version} == 2
2802 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;
2803 2978
2804 { 2979 {
2805 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2806 2981
2807 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 2985 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 2988
2814 cf::cede_to_tick; 2989 cf::cede_to_tick;
2815 } 2990 }
2816 2991
2817 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
… …
2842 3017
2843 { 3018 {
2844 # TODO: for gcfclient pleasure, we should give resources 3019 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3020 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3021 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 3022
3023 my $soundconf = delete $res->{"res/sound.conf"};
2848 3024
2849 while (my ($name, $info) = each %$res) { 3025 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; 3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
2857 3028
2858 if ($name =~ /\.jpg$/) { 3029 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3030 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 3038 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3039 $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 } 3040 }
2868 3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
2869 cf::cede_to_tick; 3045 cf::cede_to_tick;
2870 } 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 }
3064 }
2871 } 3065 }
2872 3066
2873 1 3067 1
2874} 3068}
2875 3069
3070register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_;
3072
3073 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v);
3075 }
3076};
3077
2876sub 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
2877 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
2879 3085
2880 for (cf::region::list) { 3086 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3087 $_->{match} = qr/$_->{match}/
… …
2917 3123
2918sub init { 3124sub init {
2919 reload_resources; 3125 reload_resources;
2920} 3126}
2921 3127
2922sub cfg_load { 3128sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3130 or return;
2925 3131
2926 local $/; 3132 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
… …
2947 (async { 3153 (async {
2948 Event::one_event; 3154 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2950 }; 3156 };
2951 3157
2952 cfg_load; 3158 reload_config;
2953 db_init; 3159 db_init;
2954 load_extensions; 3160 load_extensions;
2955 3161
2956 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2957 Event::loop; 3163 Event::loop;
… …
3150 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
3151 require cf; 3357 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3359
3154 warn "loading config and database again"; 3360 warn "loading config and database again";
3155 cf::cfg_load; 3361 cf::reload_config;
3156 3362
3157 warn "loading extensions"; 3363 warn "loading extensions";
3158 cf::load_extensions; 3364 cf::load_extensions;
3159 3365
3160 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
… …
3253 or die; 3459 or die;
3254 3460
3255 $map->width (50); 3461 $map->width (50);
3256 $map->height (50); 3462 $map->height (50);
3257 $map->alloc; 3463 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3259 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
3260 3466
3261 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
3262 if ($t < $min) { 3468 if ($t < $min) {
3263 $min = $t; 3469 $min = $t;

Diff Legend

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