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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.359 by root, Sat Sep 8 18:15:55 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
… …
320 my $guard = Coro::guard { 332 my $guard = Coro::guard {
321 $TICK_WATCHER->start; 333 $TICK_WATCHER->start;
322 }; 334 };
323 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
324 $guard 336 $guard
337}
338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
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.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
325} 393}
326 394
327=item cf::async { BLOCK } 395=item cf::async { BLOCK }
328 396
329Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 484Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 485never block itself or use any form of Event handling.
418 486
419=cut 487=cut
420 488
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 489sub fork_call(&@) {
431 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
432 491
433# 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,
434# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 495
438 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 497 reset_signals;
452 local $SIG{__WARN__}; 498 &$cb
453 local $SIG{__DIE__}; 499 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 500
460 eval { 501 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 502}
473 503
474=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
475 505
476Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
556 if (1) { 586 if (1) {
557 $md5 = 587 $md5 =
558 join "\x00", 588 join "\x00",
559 $processversion, 589 $processversion,
560 map { 590 map {
561 Coro::cede; 591 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 593 } 0.. $#$src;
564 594
565 595
566 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
982 }, 1012 },
983); 1013);
984 1014
985sub object_freezer_save { 1015sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
987 1019
988 sync_job { 1020 sync_job {
989 if (length $$rdata) { 1021 if (length $$rdata) {
990 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
1015 } 1047 }
1016 } else { 1048 } else {
1017 aio_unlink $filename; 1049 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1019 } 1051 }
1020 } 1052 };
1053
1054 undef $guard;
1021} 1055}
1022 1056
1023sub object_freezer_as_string { 1057sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1025 1059
… …
1030 1064
1031sub object_thawer_load { 1065sub object_thawer_load {
1032 my ($filename) = @_; 1066 my ($filename) = @_;
1033 1067
1034 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1035 1071
1036 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1037 or return; 1073 or return;
1038 1074
1039 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1077 or return;
1078
1079 undef $guard;
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1043 } 1081 }
1044 1082
1045 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1047 return ($data, $av); 1086 ($data, $av)
1048} 1087}
1049 1088
1050=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1051 1090
1052=over 4 1091=over 4
… …
1125 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
1126 1165
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1167
1129 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
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1135 } else { 1183 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1185 }
1138 1186
1139 cf::override; 1187 cf::override;
… …
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1325
1278 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1279 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;
1280 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1281 } 1335 }
1282 } 1336 }
1283} 1337}
1284 1338
… …
1294 1348
1295 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1297 1351
1298 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1299 Coro::cede; 1353 cf::cede_to_tick;
1300} 1354}
1301 1355
1302sub new($) { 1356sub new($) {
1303 my ($login) = @_; 1357 my ($login) = @_;
1304 1358
… …
1308 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1309 1363
1310 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1311 1365
1312 $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 (@_);
1313} 1377}
1314 1378
1315=item $pl->quit_character 1379=item $pl->quit_character
1316 1380
1317Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
… …
1372 or return []; 1436 or return [];
1373 1437
1374 my @logins; 1438 my @logins;
1375 1439
1376 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") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1380 1449
1381 utf8::decode $login; 1450 utf8::decode $login;
1382 push @logins, $login; 1451 push @logins, $login;
1383 } 1452 }
1384 1453
… …
1422sub expand_cfpod { 1491sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1424 1493
1425 # escape & and < 1494 # escape & and <
1426 s/&/&amp;/g; 1495 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1428 1497
1429 # 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
1430 1499
1431 1 while 1500 1 while
1432 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1436 # replace G<male|female> tags 1506 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1439 }ge 1509 }ge
1440 # replace H<hint text> 1510 # replace H<hint text>
… …
1461sub hintmode { 1531sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1533 $_[0]{hintmode}
1464} 1534}
1465 1535
1466=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1467 1537
1468Sends an ext reply to the player. 1538Sends an ext reply to the player.
1469 1539
1470=cut 1540=cut
1471 1541
1472sub ext_reply($$%) { 1542sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1474 1544
1475 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1546}
1478 1547
1479=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1480 1549
1481Sends an ext event to the client. 1550Sends an ext event to the client.
1482 1551
1483=cut 1552=cut
1484 1553
1485sub ext_event($$%) { 1554sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1487 1556
1488 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1489} 1558}
1490 1559
1491=head3 cf::region 1560=head3 cf::region
1492 1561
1493=over 4 1562=over 4
… …
1709 1778
1710sub load_header_from($) { 1779sub load_header_from($) {
1711 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1712 1781
1713 utf8::encode $path; 1782 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 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;
1719 1791
1720 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1721 1793
1722 1 1794 1
1723} 1795}
… …
1777sub find { 1849sub find {
1778 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1779 1851
1780 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1781 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1783 1856
1784 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1785 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
1786 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1787 or return; 1862 or return;
1788 1863
1789 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1790 1865
… …
1792 or return; 1867 or return;
1793 1868
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1797 $map->reset; 1874 $map->reset;
1798 undef $guard;
1799 return find $path; 1875 return find $path;
1800 } 1876 }
1801 1877
1802 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1803 } 1879 }
… …
1812 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1813 1889
1814 my $path = $self->{path}; 1890 my $path = $self->{path};
1815 1891
1816 { 1892 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1818 1894
1895 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1820 1897
1821 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1822 1899
1823 $self->alloc; 1900 $self->alloc;
1824 1901
1825 $self->pre_load; 1902 $self->pre_load;
1826 Coro::cede; 1903 cf::cede_to_tick;
1827 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1829 or return; 1908 or return;
1830 1909
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1833 1912
1834 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 1914 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 1917 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1839 } 1921 }
1840 } 1922 }
1841 1923
1842 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1843 # now do the right thing for maps 1927 # now do the right thing for maps
1844 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 1930 unless $self->difficulty;
1847 Coro::cede; 1931 cf::cede_to_tick;
1848 1932
1849 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 1934 $self->decay_objects;
1851 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1852 $self->update_buttons; 1936 $self->update_buttons;
1853 Coro::cede; 1937 cf::cede_to_tick;
1854 $self->set_darkness_map; 1938 $self->set_darkness_map;
1855 Coro::cede; 1939 cf::cede_to_tick;
1856 $self->activate; 1940 $self->activate;
1857 } 1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1858 1945
1859 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 1947 }
1861 1948
1862 $self->post_load; 1949 $self->post_load;
… …
1873 1960
1874 $self 1961 $self
1875} 1962}
1876 1963
1877# 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
1878sub load_diag { 1965sub load_neighbours {
1879 my ($map) = @_; 1966 my ($map) = @_;
1880 1967
1881 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1882 1969
1883 for (0 .. 3) { 1970 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1885 or next; 1972 or next;
1886 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1887 or next; 1974 or next;
1888 $neigh->load; 1975 $neigh->load;
1889 1976
1977 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 1980 }
1893 1981
1894 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1896 or next; 1985 or next;
1897 $neigh->load; 1986 $neigh->load;
1898 } 1987 }
1899} 1988}
1900 1989
… …
1905} 1994}
1906 1995
1907sub do_load_sync { 1996sub do_load_sync {
1908 my ($map) = @_; 1997 my ($map) = @_;
1909 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1910 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1911} 2003}
1912 2004
1913our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1915 2007
1916sub find_async { 2008sub find_async {
1917 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1918 2010
1919 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1920 2012
1921 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 2015 }
1924 2016
1925 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1926 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1927 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2022 if (my $map = find $k) {
1930 $map->load; 2023 $map->load if $v;
1931 } 2024 }
1932 2025
1933 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1934 } 2027 }
1935 } 2028 }
1936 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1937 }; 2030 };
1938 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
1941} 2034}
1942 2035
1943sub save { 2036sub save {
1944 my ($self) = @_; 2037 my ($self) = @_;
1945 2038
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2040
1948 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1949 2042
1950 return unless $self->dirty; 2043 return unless $self->dirty;
1951 2044
… …
1974 my ($self) = @_; 2067 my ($self) = @_;
1975 2068
1976 # save first because save cedes 2069 # save first because save cedes
1977 $self->save; 2070 $self->save;
1978 2071
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2073
1981 return if $self->players; 2074 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1984 2077
2078 $self->in_memory (cf::MAP_SWAPPED);
2079
2080 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2082 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2083}
1988 2084
1989sub reset_at { 2085sub reset_at {
1990 my ($self) = @_; 2086 my ($self) = @_;
1991 2087
… …
2023 if $uniq; 2119 if $uniq;
2024 } 2120 }
2025 2121
2026 delete $cf::MAP{$self->path}; 2122 delete $cf::MAP{$self->path};
2027 2123
2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2126 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2127
2032 $self->unlink_save; 2128 $self->unlink_save;
2033 $self->destroy; 2129 $self->destroy;
2034} 2130}
2035 2131
2036my $nuke_counter = "aaaa"; 2132my $nuke_counter = "aaaa";
2037 2133
2038sub nuke { 2134sub nuke {
2039 my ($self) = @_; 2135 my ($self) = @_;
2040 2136
2137 {
2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139
2041 delete $cf::MAP{$self->path}; 2140 delete $cf::MAP{$self->path};
2042 2141
2043 $self->unlink_save; 2142 $self->unlink_save;
2044 2143
2045 bless $self, "cf::map"; 2144 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2145 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2146 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2147 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2148 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2149
2051 $cf::MAP{$self->path} = $self; 2150 $cf::MAP{$self->path} = $self;
2151 }
2052 2152
2053 $self->reset; # polite request, might not happen 2153 $self->reset; # polite request, might not happen
2054} 2154}
2055 2155
2056=item $maps = cf::map::tmp_maps 2156=item $maps = cf::map::tmp_maps
… …
2132 2232
2133sub inv_recursive { 2233sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2234 inv_recursive_ inv $_[0]
2135} 2235}
2136 2236
2237=item $ref = $ob->ref
2238
2239creates and returns a persistent reference to an objetc that can be stored as a string.
2240
2241=item $ob = cf::object::deref ($refstring)
2242
2243returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2244even if the object actually exists. May block.
2245
2246=cut
2247
2248sub deref {
2249 my ($ref) = @_;
2250
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return;
2258 $pl->ob->uuid eq $uuid
2259 or return;
2260
2261 $pl->ob
2262 } else {
2263 warn "$ref: cannot resolve object reference\n";
2264 undef
2265 }
2266}
2267
2137package cf; 2268package cf;
2138 2269
2139=back 2270=back
2140 2271
2141=head3 cf::object::player 2272=head3 cf::object::player
… …
2163 2294
2164 } else { 2295 } else {
2165 my $pl = $self->contr; 2296 my $pl = $self->contr;
2166 2297
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2298 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2299 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2301
2176 } else { 2302 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2303 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2304 $self->message ($msg, $flags);
2179 } 2305 }
2180 } 2306 }
2307}
2308
2309=item $object->send_msg ($channel, $msg, $color, [extra...])
2310
2311=cut
2312
2313sub cf::object::send_msg {
2314 my $pl = shift->contr
2315 or return;
2316 $pl->send_msg (@_);
2181} 2317}
2182 2318
2183=item $player_object->may ("access") 2319=item $player_object->may ("access")
2184 2320
2185Returns wether the given player is authorized to access resource "access" 2321Returns wether the given player is authorized to access resource "access"
… …
2264 # use -1 or undef as default coordinates, not 0, 0 2400 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2401 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2402 if $x <=0 && $y <= 0;
2267 2403
2268 $map->load; 2404 $map->load;
2269 $map->load_diag; 2405 $map->load_neighbours;
2270 2406
2271 return unless $self->contr->active; 2407 return unless $self->contr->active;
2272 $self->activate_recursive; 2408 $self->activate_recursive;
2273 2409
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2581the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2582the message unless the client supports the msg packet.
2447 2583
2448=cut 2584=cut
2449 2585
2586our %CHANNEL = (
2587 "c/identify" => {
2588 id => "identify",
2589 title => "Identify",
2590 reply => undef,
2591 tooltip => "Items recently identified",
2592 },
2593 "c/examine" => {
2594 id => "examine",
2595 title => "Examine",
2596 reply => undef,
2597 tooltip => "Signs and other items you examined",
2598 },
2599);
2600
2450sub cf::client::send_msg { 2601sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2602 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2603
2453 $msg = $self->pl->expand_cfpod ($msg); 2604 $msg = $self->pl->expand_cfpod ($msg);
2454 2605
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2606 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607
2608 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2456 2610
2457 if (ref $channel) { 2611 if (ref $channel) {
2458 # send meta info to client, if not yet sent 2612 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2613 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2614 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2615 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg;
2462 } 2617 }
2463 2618
2464 $channel = $channel->{id}; 2619 $channel = $channel->{id};
2465 } 2620 }
2466 2621
2467 return unless @extra || length $msg; 2622 return unless @extra || length $msg;
2468 2623
2469 if ($self->can_msg) { 2624 if ($self->can_msg) {
2625 # default colour, mask it out
2626 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2627 if $color & cf::NDI_DEF;
2628
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2629 $self->send_packet ("msg " . $self->{json_coder}->encode (
2630 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2631 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2632 if ($color >= 0) {
2633 # replace some tags by gcfclient-compatible ones
2634 for ($msg) {
2635 1 while
2636 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2637 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2638 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2639 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2640 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2641 }
2642
2643 $color &= cf::NDI_COLOR_MASK;
2644
2645 utf8::encode $msg;
2646
2483 if (0 && $msg =~ /\[/) { 2647 if (0 && $msg =~ /\[/) {
2648 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2649 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2650 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2651 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2652 $self->send_packet ("drawinfo $color $msg")
2488 } 2653 }
2489 } 2654 }
2490 } 2655 }
2491} 2656}
2492 2657
2493=item $client->ext_event ($type, %msg) 2658=item $client->ext_msg ($type, @msg)
2494 2659
2495Sends an ext event to the client. 2660Sends an ext event to the client.
2496 2661
2497=cut 2662=cut
2498 2663
2499sub cf::client::ext_event($$%) { 2664sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2665 my ($self, $type, @msg) = @_;
2501 2666
2502 return unless $self->extcmd; 2667 if ($self->extcmd == 2) {
2503 2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2669 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2670 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2671 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2672 }
2673}
2674
2675=item $client->ext_reply ($msgid, @msg)
2676
2677Sends an ext reply to the client.
2678
2679=cut
2680
2681sub cf::client::ext_reply($$@) {
2682 my ($self, $id, @msg) = @_;
2683
2684 if ($self->extcmd == 2) {
2685 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2686 } elsif ($self->extcmd == 1) {
2687 #TODO: version 1, remove
2688 unshift @msg, msgtype => "reply", msgid => $id;
2689 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2690 }
2506} 2691}
2507 2692
2508=item $success = $client->query ($flags, "text", \&cb) 2693=item $success = $client->query ($flags, "text", \&cb)
2509 2694
2510Queues a query to the client, calling the given callback with 2695Queues a query to the client, calling the given callback with
… …
2565 my ($ns, $buf) = @_; 2750 my ($ns, $buf) = @_;
2566 2751
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2752 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2753
2569 if (ref $msg) { 2754 if (ref $msg) {
2755 my ($type, $reply, @payload) =
2756 "ARRAY" eq ref $msg
2757 ? @$msg
2758 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2759
2760 my @reply;
2761
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2762 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2763 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2764 }
2765
2766 $ns->ext_reply ($reply, @reply)
2767 if $reply;
2768
2576 } else { 2769 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2770 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2771 }
2579 2772
2580 cf::override; 2773 cf::override;
… …
2627our $safe = new Safe "safe"; 2820our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2821our $safe_hole = new Safe::Hole;
2629 2822
2630$SIG{FPE} = 'IGNORE'; 2823$SIG{FPE} = 'IGNORE';
2631 2824
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2825$safe->permit_only (Opcode::opset qw(
2826 :base_core :base_mem :base_orig :base_math
2827 grepstart grepwhile mapstart mapwhile
2828 sort time
2829));
2633 2830
2634# here we export the classes and methods available to script code 2831# here we export the classes and methods available to script code
2635 2832
2636=pod 2833=pod
2637 2834
2638The following functions and methods are available within a safe environment: 2835The following functions and methods are available within a safe environment:
2639 2836
2640 cf::object 2837 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 2838 contr pay_amount pay_player map x y force_find force_add
2642 insert remove 2839 insert remove name archname title slaying race decrease_ob_nr
2643 2840
2644 cf::object::player 2841 cf::object::player
2645 player 2842 player
2646 2843
2647 cf::player 2844 cf::player
… …
2652 2849
2653=cut 2850=cut
2654 2851
2655for ( 2852for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race
2657 insert remove)], 2855 decrease_ob_nr)],
2658 ["cf::object::player" => qw(player)], 2856 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2857 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2858 ["cf::map" => qw(trigger)],
2661) { 2859) {
2662 no strict 'refs'; 2860 no strict 'refs';
… …
2738# the server's init and main functions 2936# the server's init and main functions
2739 2937
2740sub load_facedata($) { 2938sub load_facedata($) {
2741 my ($path) = @_; 2939 my ($path) = @_;
2742 2940
2941 # HACK to clear player env face cache, we need some signal framework
2942 # for this (global event?)
2943 %ext::player_env::MUSIC_FACE_CACHE = ();
2944
2945 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2946
2743 warn "loading facedata from $path\n"; 2947 warn "loading facedata from $path\n";
2744 2948
2745 my $facedata; 2949 my $facedata;
2746 0 < aio_load $path, $facedata 2950 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 2951 or die "$path: $!";
2748 2952
2749 $facedata = Coro::Storable::thaw $facedata; 2953 $facedata = Coro::Storable::thaw $facedata;
2750 2954
2751 $facedata->{version} == 2 2955 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 2956 or cf::cleanup "$path: version mismatch, cannot proceed.";
2957
2958 # patch in the exptable
2959 $facedata->{resource}{"res/exp_table"} = {
2960 type => FT_RSRC,
2961 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2962 };
2963 cf::cede_to_tick;
2753 2964
2754 { 2965 {
2755 my $faces = $facedata->{faceinfo}; 2966 my $faces = $facedata->{faceinfo};
2756 2967
2757 while (my ($face, $info) = each %$faces) { 2968 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2969 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 2970 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 2971 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 2974
2764 cf::cede_to_tick; 2975 cf::cede_to_tick;
2765 } 2976 }
2766 2977
2767 while (my ($face, $info) = each %$faces) { 2978 while (my ($face, $info) = each %$faces) {
… …
2792 3003
2793 { 3004 {
2794 # TODO: for gcfclient pleasure, we should give resources 3005 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3006 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3007 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 3008
3009 my $soundconf = delete $res->{"res/sound.conf"};
2798 3010
2799 while (my ($name, $info) = each %$res) { 3011 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3012 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data;
2807 3014
2808 if ($name =~ /\.jpg$/) { 3015 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3016 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3017
3018 my $meta = $enc->encode ({
3019 name => $name,
3020 %{ $info->{meta} || {} },
3021 });
3022
3023 $data = pack "(w/a*)*", $meta, $info->{data};
2811 } else { 3024 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3025 $data = $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3026 }
2818 3027
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3029 cf::face::set_type $idx, $info->{type};
3030
2819 cf::cede_to_tick; 3031 cf::cede_to_tick;
2820 } 3032 }
3033
3034 if ($soundconf) {
3035 $soundconf = $enc->decode (delete $soundconf->{data});
3036
3037 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3038 my $sound = $soundconf->{compat}[$_]
3039 or next;
3040
3041 my $face = cf::face::find "sound/$sound->[1]";
3042 cf::sound::set $sound->[0] => $face;
3043 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3044 }
3045
3046 while (my ($k, $v) = each %{$soundconf->{event}}) {
3047 my $face = cf::face::find "sound/$v";
3048 cf::sound::set $k => $face;
3049 }
3050 }
2821 } 3051 }
2822 3052
2823 1 3053 1
2824} 3054}
2825 3055
3056register_exticmd fx_want => sub {
3057 my ($ns, $want) = @_;
3058
3059 while (my ($k, $v) = each %$want) {
3060 $ns->fx_want ($k, $v);
3061 }
3062};
3063
2826sub reload_regions { 3064sub reload_regions {
3065 # HACK to clear player env face cache, we need some signal framework
3066 # for this (global event?)
3067 %ext::player_env::MUSIC_FACE_CACHE = ();
3068
2827 load_resource_file "$MAPDIR/regions" 3069 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3070 or die "unable to load regions file\n";
2829 3071
2830 for (cf::region::list) { 3072 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3073 $_->{match} = qr/$_->{match}/
… …
2867 3109
2868sub init { 3110sub init {
2869 reload_resources; 3111 reload_resources;
2870} 3112}
2871 3113
2872sub cfg_load { 3114sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3115 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3116 or return;
2875 3117
2876 local $/; 3118 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3119 *CFG = YAML::Syck::Load <$fh>;
… …
2897 (async { 3139 (async {
2898 Event::one_event; 3140 Event::one_event;
2899 })->prio (Coro::PRIO_MAX); 3141 })->prio (Coro::PRIO_MAX);
2900 }; 3142 };
2901 3143
2902 cfg_load; 3144 reload_config;
2903 db_init; 3145 db_init;
2904 load_extensions; 3146 load_extensions;
2905 3147
2906 $TICK_WATCHER->start; 3148 $TICK_WATCHER->start;
2907 Event::loop; 3149 Event::loop;
… …
3100 warn "reloading cf.pm"; 3342 warn "reloading cf.pm";
3101 require cf; 3343 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3345
3104 warn "loading config and database again"; 3346 warn "loading config and database again";
3105 cf::cfg_load; 3347 cf::reload_config;
3106 3348
3107 warn "loading extensions"; 3349 warn "loading extensions";
3108 cf::load_extensions; 3350 cf::load_extensions;
3109 3351
3110 warn "reattaching attachments to objects/players"; 3352 warn "reattaching attachments to objects/players";
… …
3203 or die; 3445 or die;
3204 3446
3205 $map->width (50); 3447 $map->width (50);
3206 $map->height (50); 3448 $map->height (50);
3207 $map->alloc; 3449 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1); 3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3209 my $t = Event::time - $t; 3451 my $t = Event::time - $t;
3210 3452
3211 #next unless $t < 0.0013;#d# 3453 #next unless $t < 0.0013;#d#
3212 if ($t < $min) { 3454 if ($t < $min) {
3213 $min = $t; 3455 $min = $t;

Diff Legend

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