ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.360 by root, Sun Sep 9 06:25:46 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";
… …
918 948
919=cut 949=cut
920 950
921############################################################################# 951#############################################################################
922# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
923 964
924sub reattach { 965sub reattach {
925 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 967 my ($obj) = @_;
927 968
… …
971 }, 1012 },
972); 1013);
973 1014
974sub object_freezer_save { 1015sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
976 1019
977 sync_job { 1020 sync_job {
978 if (length $$rdata) { 1021 if (length $$rdata) {
979 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
1004 } 1047 }
1005 } else { 1048 } else {
1006 aio_unlink $filename; 1049 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1008 } 1051 }
1009 } 1052 };
1053
1054 undef $guard;
1010} 1055}
1011 1056
1012sub object_freezer_as_string { 1057sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1014 1059
… …
1019 1064
1020sub object_thawer_load { 1065sub object_thawer_load {
1021 my ($filename) = @_; 1066 my ($filename) = @_;
1022 1067
1023 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1024 1071
1025 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1026 or return; 1073 or return;
1027 1074
1028 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1077 or return;
1078
1079 undef $guard;
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1032 } 1081 }
1033 1082
1034 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1036 return ($data, $av); 1086 ($data, $av)
1037} 1087}
1038 1088
1039=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1040 1090
1041=over 4 1091=over 4
… …
1114 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
1115 1165
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1167
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1124 } else { 1183 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1185 }
1127 1186
1128 cf::override; 1187 cf::override;
… …
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1325
1267 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1268 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;
1269 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1270 } 1335 }
1271 } 1336 }
1272} 1337}
1273 1338
… …
1283 1348
1284 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1286 1351
1287 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1288 Coro::cede; 1353 cf::cede_to_tick;
1289} 1354}
1290 1355
1291sub new($) { 1356sub new($) {
1292 my ($login) = @_; 1357 my ($login) = @_;
1293 1358
… …
1297 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1298 1363
1299 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1300 1365
1301 $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 (@_);
1302} 1377}
1303 1378
1304=item $pl->quit_character 1379=item $pl->quit_character
1305 1380
1306Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
… …
1361 or return []; 1436 or return [];
1362 1437
1363 my @logins; 1438 my @logins;
1364 1439
1365 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") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1369 1449
1370 utf8::decode $login; 1450 utf8::decode $login;
1371 push @logins, $login; 1451 push @logins, $login;
1372 } 1452 }
1373 1453
… …
1411sub expand_cfpod { 1491sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1413 1493
1414 # escape & and < 1494 # escape & and <
1415 s/&/&amp;/g; 1495 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1417 1497
1418 # 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
1419 1499
1420 1 while 1500 1 while
1421 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1425 # replace G<male|female> tags 1506 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1428 }ge 1509 }ge
1429 # replace H<hint text> 1510 # replace H<hint text>
… …
1450sub hintmode { 1531sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1533 $_[0]{hintmode}
1453} 1534}
1454 1535
1455=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1456 1537
1457Sends an ext reply to the player. 1538Sends an ext reply to the player.
1458 1539
1459=cut 1540=cut
1460 1541
1461sub ext_reply($$%) { 1542sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1463 1544
1464 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1546}
1467 1547
1468=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1469 1549
1470Sends an ext event to the client. 1550Sends an ext event to the client.
1471 1551
1472=cut 1552=cut
1473 1553
1474sub ext_event($$%) { 1554sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1476 1556
1477 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1478} 1558}
1479 1559
1480=head3 cf::region 1560=head3 cf::region
1481 1561
1482=over 4 1562=over 4
… …
1698 1778
1699sub load_header_from($) { 1779sub load_header_from($) {
1700 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1701 1781
1702 utf8::encode $path; 1782 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 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;
1708 1791
1709 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1710 1793
1711 1 1794 1
1712} 1795}
… …
1766sub find { 1849sub find {
1767 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1768 1851
1769 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1770 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1772 1856
1773 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1774 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
1775 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1776 or return; 1862 or return;
1777 1863
1778 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1779 1865
… …
1781 or return; 1867 or return;
1782 1868
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1786 $map->reset; 1874 $map->reset;
1787 undef $guard;
1788 return find $path; 1875 return find $path;
1789 } 1876 }
1790 1877
1791 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1792 } 1879 }
… …
1801 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1802 1889
1803 my $path = $self->{path}; 1890 my $path = $self->{path};
1804 1891
1805 { 1892 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1807 1894
1895 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 1897
1810 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1811 1899
1812 $self->alloc; 1900 $self->alloc;
1813 1901
1814 $self->pre_load; 1902 $self->pre_load;
1815 Coro::cede; 1903 cf::cede_to_tick;
1816 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1818 or return; 1908 or return;
1819 1909
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1822 1912
1823 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 1914 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 1917 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1828 } 1921 }
1829 } 1922 }
1830 1923
1831 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1832 # now do the right thing for maps 1927 # now do the right thing for maps
1833 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 1930 unless $self->difficulty;
1836 Coro::cede; 1931 cf::cede_to_tick;
1837 1932
1838 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 1934 $self->decay_objects;
1840 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1841 $self->update_buttons; 1936 $self->update_buttons;
1842 Coro::cede; 1937 cf::cede_to_tick;
1843 $self->set_darkness_map; 1938 $self->set_darkness_map;
1844 Coro::cede; 1939 cf::cede_to_tick;
1845 $self->activate; 1940 $self->activate;
1846 } 1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1847 1945
1848 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 1947 }
1850 1948
1851 $self->post_load; 1949 $self->post_load;
… …
1862 1960
1863 $self 1961 $self
1864} 1962}
1865 1963
1866# 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
1867sub load_diag { 1965sub load_neighbours {
1868 my ($map) = @_; 1966 my ($map) = @_;
1869 1967
1870 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1871 1969
1872 for (0 .. 3) { 1970 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1874 or next; 1972 or next;
1875 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1876 or next; 1974 or next;
1877 $neigh->load; 1975 $neigh->load;
1878 1976
1977 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 1980 }
1882 1981
1883 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1885 or next; 1985 or next;
1886 $neigh->load; 1986 $neigh->load;
1887 } 1987 }
1888} 1988}
1889 1989
… …
1894} 1994}
1895 1995
1896sub do_load_sync { 1996sub do_load_sync {
1897 my ($map) = @_; 1997 my ($map) = @_;
1898 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1899 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1900} 2003}
1901 2004
1902our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1904 2007
1905sub find_async { 2008sub find_async {
1906 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1907 2010
1908 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1909 2012
1910 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 2015 }
1913 2016
1914 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1915 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1916 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2022 if (my $map = find $k) {
1919 $map->load; 2023 $map->load if $v;
1920 } 2024 }
1921 2025
1922 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1923 } 2027 }
1924 } 2028 }
1925 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1926 }; 2030 };
1927 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
1930} 2034}
1931 2035
1932sub save { 2036sub save {
1933 my ($self) = @_; 2037 my ($self) = @_;
1934 2038
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2040
1937 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1938 2042
1939 return unless $self->dirty; 2043 return unless $self->dirty;
1940 2044
… …
1963 my ($self) = @_; 2067 my ($self) = @_;
1964 2068
1965 # save first because save cedes 2069 # save first because save cedes
1966 $self->save; 2070 $self->save;
1967 2071
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2073
1970 return if $self->players; 2074 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1973 2077
2078 $self->in_memory (cf::MAP_SWAPPED);
2079
2080 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2082 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2083}
1977 2084
1978sub reset_at { 2085sub reset_at {
1979 my ($self) = @_; 2086 my ($self) = @_;
1980 2087
… …
2012 if $uniq; 2119 if $uniq;
2013 } 2120 }
2014 2121
2015 delete $cf::MAP{$self->path}; 2122 delete $cf::MAP{$self->path};
2016 2123
2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2126 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2127
2021 $self->unlink_save; 2128 $self->unlink_save;
2022 $self->destroy; 2129 $self->destroy;
2023} 2130}
2024 2131
2025my $nuke_counter = "aaaa"; 2132my $nuke_counter = "aaaa";
2026 2133
2027sub nuke { 2134sub nuke {
2028 my ($self) = @_; 2135 my ($self) = @_;
2029 2136
2137 {
2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139
2030 delete $cf::MAP{$self->path}; 2140 delete $cf::MAP{$self->path};
2031 2141
2032 $self->unlink_save; 2142 $self->unlink_save;
2033 2143
2034 bless $self, "cf::map"; 2144 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2145 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2146 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2147 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2148 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2149
2040 $cf::MAP{$self->path} = $self; 2150 $cf::MAP{$self->path} = $self;
2151 }
2041 2152
2042 $self->reset; # polite request, might not happen 2153 $self->reset; # polite request, might not happen
2043} 2154}
2044 2155
2045=item $maps = cf::map::tmp_maps 2156=item $maps = cf::map::tmp_maps
… …
2121 2232
2122sub inv_recursive { 2233sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2234 inv_recursive_ inv $_[0]
2124} 2235}
2125 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
2126package cf; 2268package cf;
2127 2269
2128=back 2270=back
2129 2271
2130=head3 cf::object::player 2272=head3 cf::object::player
… …
2152 2294
2153 } else { 2295 } else {
2154 my $pl = $self->contr; 2296 my $pl = $self->contr;
2155 2297
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2298 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2299 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2301
2165 } else { 2302 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2303 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2304 $self->message ($msg, $flags);
2168 } 2305 }
2169 } 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 (@_);
2170} 2317}
2171 2318
2172=item $player_object->may ("access") 2319=item $player_object->may ("access")
2173 2320
2174Returns wether the given player is authorized to access resource "access" 2321Returns wether the given player is authorized to access resource "access"
… …
2253 # use -1 or undef as default coordinates, not 0, 0 2400 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2401 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2402 if $x <=0 && $y <= 0;
2256 2403
2257 $map->load; 2404 $map->load;
2258 $map->load_diag; 2405 $map->load_neighbours;
2259 2406
2260 return unless $self->contr->active; 2407 return unless $self->contr->active;
2261 $self->activate_recursive; 2408 $self->activate_recursive;
2262 2409
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2581the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2582the message unless the client supports the msg packet.
2436 2583
2437=cut 2584=cut
2438 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
2439sub cf::client::send_msg { 2601sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2602 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2603
2442 $msg = $self->pl->expand_cfpod ($msg); 2604 $msg = $self->pl->expand_cfpod ($msg);
2443 2605
2444 return unless @extra || length $msg;
2445
2446 $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};
2447 2610
2448 if (ref $channel) { 2611 if (ref $channel) {
2449 # send meta info to client, if not yet sent 2612 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2613 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2614 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2615 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg;
2453 } 2617 }
2454 2618
2455 $channel = $channel->{id}; 2619 $channel = $channel->{id};
2456 } 2620 }
2457 2621
2622 return unless @extra || length $msg;
2623
2458 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
2459 $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]));
2460 } else { 2631 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 if ($color >= 0) { 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
2472 if (0 && $msg =~ /\[/) { 2647 if (0 && $msg =~ /\[/) {
2648 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2649 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2650 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2651 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2652 $self->send_packet ("drawinfo $color $msg")
2477 } 2653 }
2478 } 2654 }
2479 } 2655 }
2480} 2656}
2481 2657
2482=item $client->ext_event ($type, %msg) 2658=item $client->ext_msg ($type, @msg)
2483 2659
2484Sends an ext event to the client. 2660Sends an ext event to the client.
2485 2661
2486=cut 2662=cut
2487 2663
2488sub cf::client::ext_event($$%) { 2664sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2665 my ($self, $type, @msg) = @_;
2490 2666
2491 return unless $self->extcmd; 2667 if ($self->extcmd == 2) {
2492 2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2669 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2670 push @msg, msgtype => "event_$type";
2494 $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 }
2495} 2691}
2496 2692
2497=item $success = $client->query ($flags, "text", \&cb) 2693=item $success = $client->query ($flags, "text", \&cb)
2498 2694
2499Queues a query to the client, calling the given callback with 2695Queues a query to the client, calling the given callback with
… …
2554 my ($ns, $buf) = @_; 2750 my ($ns, $buf) = @_;
2555 2751
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2752 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2753
2558 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
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2762 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2763 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2764 }
2765
2766 $ns->ext_reply ($reply, @reply)
2767 if $reply;
2768
2565 } else { 2769 } else {
2566 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";
2567 } 2771 }
2568 2772
2569 cf::override; 2773 cf::override;
… …
2616our $safe = new Safe "safe"; 2820our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 2821our $safe_hole = new Safe::Hole;
2618 2822
2619$SIG{FPE} = 'IGNORE'; 2823$SIG{FPE} = 'IGNORE';
2620 2824
2621$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));
2622 2830
2623# here we export the classes and methods available to script code 2831# here we export the classes and methods available to script code
2624 2832
2625=pod 2833=pod
2626 2834
2627The following functions and methods are available within a safe environment: 2835The following functions and methods are available within a safe environment:
2628 2836
2629 cf::object 2837 cf::object
2630 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
2631 insert remove 2839 insert remove name archname title slaying race decrease_ob_nr
2632 2840
2633 cf::object::player 2841 cf::object::player
2634 player 2842 player
2635 2843
2636 cf::player 2844 cf::player
… …
2641 2849
2642=cut 2850=cut
2643 2851
2644for ( 2852for (
2645 ["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
2646 insert remove)], 2855 decrease_ob_nr)],
2647 ["cf::object::player" => qw(player)], 2856 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 2857 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 2858 ["cf::map" => qw(trigger)],
2650) { 2859) {
2651 no strict 'refs'; 2860 no strict 'refs';
… …
2727# the server's init and main functions 2936# the server's init and main functions
2728 2937
2729sub load_facedata($) { 2938sub load_facedata($) {
2730 my ($path) = @_; 2939 my ($path) = @_;
2731 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
2732 warn "loading facedata from $path\n"; 2947 warn "loading facedata from $path\n";
2733 2948
2734 my $facedata; 2949 my $facedata;
2735 0 < aio_load $path, $facedata 2950 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 2951 or die "$path: $!";
2737 2952
2738 $facedata = Coro::Storable::thaw $facedata; 2953 $facedata = Coro::Storable::thaw $facedata;
2739 2954
2740 $facedata->{version} == 2 2955 $facedata->{version} == 2
2741 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;
2742 2964
2743 { 2965 {
2744 my $faces = $facedata->{faceinfo}; 2966 my $faces = $facedata->{faceinfo};
2745 2967
2746 while (my ($face, $info) = each %$faces) { 2968 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2969 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2748 cf::face::set_visibility $idx, $info->{visibility}; 2970 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 2971 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 2974
2753 cf::cede_to_tick; 2975 cf::cede_to_tick;
2754 } 2976 }
2755 2977
2756 while (my ($face, $info) = each %$faces) { 2978 while (my ($face, $info) = each %$faces) {
… …
2781 3003
2782 { 3004 {
2783 # TODO: for gcfclient pleasure, we should give resources 3005 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 3006 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3007 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical; 3008
3009 my $soundconf = delete $res->{"res/sound.conf"};
2787 3010
2788 while (my ($name, $info) = each %$res) { 3011 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3012 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data;
2796 3014
2797 if ($name =~ /\.jpg$/) { 3015 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3016 # prepend meta info
2799 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};
2800 } else { 3024 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3025 $data = $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3026 }
2807 3027
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3029 cf::face::set_type $idx, $info->{type};
3030
2808 cf::cede_to_tick; 3031 cf::cede_to_tick;
2809 } 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 }
2810 } 3051 }
2811 3052
2812 1 3053 1
2813} 3054}
2814 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
2815sub 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
2816 load_resource_file "$MAPDIR/regions" 3069 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3070 or die "unable to load regions file\n";
2818 3071
2819 for (cf::region::list) { 3072 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3073 $_->{match} = qr/$_->{match}/
… …
2856 3109
2857sub init { 3110sub init {
2858 reload_resources; 3111 reload_resources;
2859} 3112}
2860 3113
2861sub cfg_load { 3114sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3115 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3116 or return;
2864 3117
2865 local $/; 3118 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3119 *CFG = YAML::Syck::Load <$fh>;
… …
2886 (async { 3139 (async {
2887 Event::one_event; 3140 Event::one_event;
2888 })->prio (Coro::PRIO_MAX); 3141 })->prio (Coro::PRIO_MAX);
2889 }; 3142 };
2890 3143
2891 cfg_load; 3144 reload_config;
2892 db_init; 3145 db_init;
2893 load_extensions; 3146 load_extensions;
2894 3147
2895 $TICK_WATCHER->start; 3148 $TICK_WATCHER->start;
2896 Event::loop; 3149 Event::loop;
… …
3089 warn "reloading cf.pm"; 3342 warn "reloading cf.pm";
3090 require cf; 3343 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3345
3093 warn "loading config and database again"; 3346 warn "loading config and database again";
3094 cf::cfg_load; 3347 cf::reload_config;
3095 3348
3096 warn "loading extensions"; 3349 warn "loading extensions";
3097 cf::load_extensions; 3350 cf::load_extensions;
3098 3351
3099 warn "reattaching attachments to objects/players"; 3352 warn "reattaching attachments to objects/players";
… …
3192 or die; 3445 or die;
3193 3446
3194 $map->width (50); 3447 $map->width (50);
3195 $map->height (50); 3448 $map->height (50);
3196 $map->alloc; 3449 $map->alloc;
3197 $map->_load_objects ("/tmp/x.map", 1); 3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3198 my $t = Event::time - $t; 3451 my $t = Event::time - $t;
3199 3452
3200 #next unless $t < 0.0013;#d# 3453 #next unless $t < 0.0013;#d#
3201 if ($t < $min) { 3454 if ($t < $min) {
3202 $min = $t; 3455 $min = $t;

Diff Legend

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