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.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
… …
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;
… …
1229 1277
1230=head3 cf::player 1278=head3 cf::player
1231 1279
1232=over 4 1280=over 4
1233 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
1234=item cf::player::find $login 1296=item cf::player::find $login
1235 1297
1236Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1237 1299
1238=cut 1300=cut
… …
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1339
1278 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1279 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;
1280 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1281 } 1349 }
1282 } 1350 }
1283} 1351}
1284 1352
… …
1294 1362
1295 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1297 1365
1298 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1299 Coro::cede; 1367 cf::cede_to_tick;
1300} 1368}
1301 1369
1302sub new($) { 1370sub new($) {
1303 my ($login) = @_; 1371 my ($login) = @_;
1304 1372
… …
1308 $self->{deny_save} = 1; 1376 $self->{deny_save} = 1;
1309 1377
1310 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1311 1379
1312 $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 (@_);
1313} 1391}
1314 1392
1315=item $pl->quit_character 1393=item $pl->quit_character
1316 1394
1317Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
… …
1372 or return []; 1450 or return [];
1373 1451
1374 my @logins; 1452 my @logins;
1375 1453
1376 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") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1380 1463
1381 utf8::decode $login; 1464 utf8::decode $login;
1382 push @logins, $login; 1465 push @logins, $login;
1383 } 1466 }
1384 1467
… …
1422sub expand_cfpod { 1505sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1506 ((my $self), (local $_)) = @_;
1424 1507
1425 # escape & and < 1508 # escape & and <
1426 s/&/&amp;/g; 1509 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g; 1510 s/(?<![BIUGHT])</&lt;/g;
1428 1511
1429 # 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
1430 1513
1431 1 while 1514 1 while
1432 # replace B<>, I<>, U<> etc. 1515 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1516 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1436 # replace G<male|female> tags 1520 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1521 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1 1522 $self->gender ? $2 : $1
1439 }ge 1523 }ge
1440 # replace H<hint text> 1524 # replace H<hint text>
… …
1461sub hintmode { 1545sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1547 $_[0]{hintmode}
1464} 1548}
1465 1549
1466=item $player->ext_reply ($msgid, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1467 1551
1468Sends an ext reply to the player. 1552Sends an ext reply to the player.
1469 1553
1470=cut 1554=cut
1471 1555
1472sub ext_reply($$%) { 1556sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1474 1558
1475 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1560}
1478 1561
1479=item $player->ext_event ($type, %msg) 1562=item $player->ext_msg ($type, @msg)
1480 1563
1481Sends an ext event to the client. 1564Sends an ext event to the client.
1482 1565
1483=cut 1566=cut
1484 1567
1485sub ext_event($$%) { 1568sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1569 my ($self, $type, @msg) = @_;
1487 1570
1488 $self->ns->ext_event ($type, %msg); 1571 $self->ns->ext_msg ($type, @msg);
1489} 1572}
1490 1573
1491=head3 cf::region 1574=head3 cf::region
1492 1575
1493=over 4 1576=over 4
… …
1709 1792
1710sub load_header_from($) { 1793sub load_header_from($) {
1711 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1712 1795
1713 utf8::encode $path; 1796 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 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;
1719 1805
1720 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1721 1807
1722 1 1808 1
1723} 1809}
… …
1777sub find { 1863sub find {
1778 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1779 1865
1780 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1781 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1783 1870
1784 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1785 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
1786 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1787 or return; 1876 or return;
1788 1877
1789 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1790 1879
… …
1792 or return; 1881 or return;
1793 1882
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1797 $map->reset; 1888 $map->reset;
1798 undef $guard;
1799 return find $path; 1889 return find $path;
1800 } 1890 }
1801 1891
1802 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1803 } 1893 }
… …
1812 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1813 1903
1814 my $path = $self->{path}; 1904 my $path = $self->{path};
1815 1905
1816 { 1906 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1818 1908
1909 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 1911
1821 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1822 1913
1823 $self->alloc; 1914 $self->alloc;
1824 1915
1825 $self->pre_load; 1916 $self->pre_load;
1826 Coro::cede; 1917 cf::cede_to_tick;
1827 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1829 or return; 1922 or return;
1830 1923
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1833 1926
1834 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 1928 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 1931 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1839 } 1935 }
1840 } 1936 }
1841 1937
1842 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1843 # now do the right thing for maps 1941 # now do the right thing for maps
1844 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 1944 unless $self->difficulty;
1847 Coro::cede; 1945 cf::cede_to_tick;
1848 1946
1849 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 1948 $self->decay_objects;
1851 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1852 $self->update_buttons; 1950 $self->update_buttons;
1853 Coro::cede; 1951 cf::cede_to_tick;
1854 $self->set_darkness_map; 1952 $self->set_darkness_map;
1855 Coro::cede; 1953 cf::cede_to_tick;
1856 $self->activate; 1954 $self->activate;
1857 } 1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1858 1959
1859 $self->in_memory (cf::MAP_IN_MEMORY); 1960 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 1961 }
1861 1962
1862 $self->post_load; 1963 $self->post_load;
… …
1873 1974
1874 $self 1975 $self
1875} 1976}
1876 1977
1877# 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
1878sub load_diag { 1979sub load_neighbours {
1879 my ($map) = @_; 1980 my ($map) = @_;
1880 1981
1881 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1882 1983
1883 for (0 .. 3) { 1984 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1885 or next; 1986 or next;
1886 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1887 or next; 1988 or next;
1888 $neigh->load; 1989 $neigh->load;
1889 1990
1991 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 1994 }
1893 1995
1894 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1896 or next; 1999 or next;
1897 $neigh->load; 2000 $neigh->load;
1898 } 2001 }
1899} 2002}
1900 2003
… …
1905} 2008}
1906 2009
1907sub do_load_sync { 2010sub do_load_sync {
1908 my ($map) = @_; 2011 my ($map) = @_;
1909 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1910 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1911} 2017}
1912 2018
1913our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1915 2021
1916sub find_async { 2022sub find_async {
1917 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1918 2024
1919 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1920 2026
1921 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 2029 }
1924 2030
1925 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1926 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1927 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2036 if (my $map = find $k) {
1930 $map->load; 2037 $map->load if $v;
1931 } 2038 }
1932 2039
1933 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1934 } 2041 }
1935 } 2042 }
1936 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1937 }; 2044 };
1938 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
… …
1941} 2048}
1942 2049
1943sub save { 2050sub save {
1944 my ($self) = @_; 2051 my ($self) = @_;
1945 2052
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2054
1948 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1949 2056
1950 return unless $self->dirty; 2057 return unless $self->dirty;
1951 2058
… …
1974 my ($self) = @_; 2081 my ($self) = @_;
1975 2082
1976 # save first because save cedes 2083 # save first because save cedes
1977 $self->save; 2084 $self->save;
1978 2085
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2087
1981 return if $self->players; 2088 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2090 return if $self->{deny_save};
1984 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2096 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2097}
1988 2098
1989sub reset_at { 2099sub reset_at {
1990 my ($self) = @_; 2100 my ($self) = @_;
1991 2101
… …
2023 if $uniq; 2133 if $uniq;
2024 } 2134 }
2025 2135
2026 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
2027 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2140 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2141
2032 $self->unlink_save; 2142 $self->unlink_save;
2033 $self->destroy; 2143 $self->destroy;
2034} 2144}
2035 2145
2036my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
2037 2147
2038sub nuke { 2148sub nuke {
2039 my ($self) = @_; 2149 my ($self) = @_;
2040 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
2041 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
2042 2155
2043 $self->unlink_save; 2156 $self->unlink_save;
2044 2157
2045 bless $self, "cf::map"; 2158 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2163
2051 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
2052 2166
2053 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2054} 2168}
2055 2169
2056=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
… …
2132 2246
2133sub inv_recursive { 2247sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2135} 2249}
2136 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
2137package cf; 2282package cf;
2138 2283
2139=back 2284=back
2140 2285
2141=head3 cf::object::player 2286=head3 cf::object::player
… …
2163 2308
2164 } else { 2309 } else {
2165 my $pl = $self->contr; 2310 my $pl = $self->contr;
2166 2311
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2313 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2314 $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 2315
2176 } else { 2316 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2179 } 2319 }
2180 } 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 (@_);
2181} 2331}
2182 2332
2183=item $player_object->may ("access") 2333=item $player_object->may ("access")
2184 2334
2185Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
… …
2264 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
2267 2417
2268 $map->load; 2418 $map->load;
2269 $map->load_diag; 2419 $map->load_neighbours;
2270 2420
2271 return unless $self->contr->active; 2421 return unless $self->contr->active;
2272 $self->activate_recursive; 2422 $self->activate_recursive;
2273 2423
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 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 2595the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2596the message unless the client supports the msg packet.
2447 2597
2448=cut 2598=cut
2449 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
2450sub cf::client::send_msg { 2615sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2616 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2617
2453 $msg = $self->pl->expand_cfpod ($msg); 2618 $msg = $self->pl->expand_cfpod ($msg);
2454 2619
2455 $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};
2456 2624
2457 if (ref $channel) { 2625 if (ref $channel) {
2458 # send meta info to client, if not yet sent 2626 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2627 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2628 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2462 } 2631 }
2463 2632
2464 $channel = $channel->{id}; 2633 $channel = $channel->{id};
2465 } 2634 }
2466 2635
2467 return unless @extra || length $msg; 2636 return unless @extra || length $msg;
2468 2637
2469 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
2470 $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]));
2471 } else { 2645 } 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) { 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
2483 if (0 && $msg =~ /\[/) { 2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2664 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2666 $self->send_packet ("drawinfo $color $msg")
2488 } 2667 }
2489 } 2668 }
2490 } 2669 }
2491} 2670}
2492 2671
2493=item $client->ext_event ($type, %msg) 2672=item $client->ext_msg ($type, @msg)
2494 2673
2495Sends an ext event to the client. 2674Sends an ext event to the client.
2496 2675
2497=cut 2676=cut
2498 2677
2499sub cf::client::ext_event($$%) { 2678sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2679 my ($self, $type, @msg) = @_;
2501 2680
2502 return unless $self->extcmd; 2681 if ($self->extcmd == 2) {
2503 2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2684 push @msg, msgtype => "event_$type";
2505 $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 }
2506} 2705}
2507 2706
2508=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
2509 2708
2510Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
… …
2565 my ($ns, $buf) = @_; 2764 my ($ns, $buf) = @_;
2566 2765
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2767
2569 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
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2776 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2777 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2576 } else { 2783 } else {
2577 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";
2578 } 2785 }
2579 2786
2580 cf::override; 2787 cf::override;
… …
2627our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2629 2836
2630$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2631 2838
2632$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));
2633 2844
2634# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2635 2846
2636=pod 2847=pod
2637 2848
2638The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2639 2850
2640 cf::object 2851 cf::object
2641 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
2642 insert remove 2853 insert remove name archname title slaying race decrease_ob_nr
2643 2854
2644 cf::object::player 2855 cf::object::player
2645 player 2856 player
2646 2857
2647 cf::player 2858 cf::player
… …
2652 2863
2653=cut 2864=cut
2654 2865
2655for ( 2866for (
2656 ["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
2657 insert remove)], 2869 decrease_ob_nr)],
2658 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2661) { 2873) {
2662 no strict 'refs'; 2874 no strict 'refs';
… …
2738# the server's init and main functions 2950# the server's init and main functions
2739 2951
2740sub load_facedata($) { 2952sub load_facedata($) {
2741 my ($path) = @_; 2953 my ($path) = @_;
2742 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
2743 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2744 2962
2745 my $facedata; 2963 my $facedata;
2746 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 2965 or die "$path: $!";
2748 2966
2749 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2750 2968
2751 $facedata->{version} == 2 2969 $facedata->{version} == 2
2752 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;
2753 2978
2754 { 2979 {
2755 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2756 2981
2757 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 2985 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 2988
2764 cf::cede_to_tick; 2989 cf::cede_to_tick;
2765 } 2990 }
2766 2991
2767 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
… …
2792 3017
2793 { 3018 {
2794 # TODO: for gcfclient pleasure, we should give resources 3019 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3020 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3021 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 3022
3023 my $soundconf = delete $res->{"res/sound.conf"};
2798 3024
2799 while (my ($name, $info) = each %$res) { 3025 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; 3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
2807 3028
2808 if ($name =~ /\.jpg$/) { 3029 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3030 # prepend meta info
2810 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};
2811 } else { 3038 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3039 $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 } 3040 }
2818 3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
2819 cf::cede_to_tick; 3045 cf::cede_to_tick;
2820 } 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 }
2821 } 3065 }
2822 3066
2823 1 3067 1
2824} 3068}
2825 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
2826sub 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
2827 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
2829 3085
2830 for (cf::region::list) { 3086 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3087 $_->{match} = qr/$_->{match}/
… …
2867 3123
2868sub init { 3124sub init {
2869 reload_resources; 3125 reload_resources;
2870} 3126}
2871 3127
2872sub cfg_load { 3128sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3130 or return;
2875 3131
2876 local $/; 3132 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
… …
2897 (async { 3153 (async {
2898 Event::one_event; 3154 Event::one_event;
2899 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2900 }; 3156 };
2901 3157
2902 cfg_load; 3158 reload_config;
2903 db_init; 3159 db_init;
2904 load_extensions; 3160 load_extensions;
2905 3161
2906 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2907 Event::loop; 3163 Event::loop;
… …
3100 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
3101 require cf; 3357 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3359
3104 warn "loading config and database again"; 3360 warn "loading config and database again";
3105 cf::cfg_load; 3361 cf::reload_config;
3106 3362
3107 warn "loading extensions"; 3363 warn "loading extensions";
3108 cf::load_extensions; 3364 cf::load_extensions;
3109 3365
3110 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
… …
3203 or die; 3459 or die;
3204 3460
3205 $map->width (50); 3461 $map->width (50);
3206 $map->height (50); 3462 $map->height (50);
3207 $map->alloc; 3463 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3209 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
3210 3466
3211 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
3212 if ($t < $min) { 3468 if ($t < $min) {
3213 $min = $t; 3469 $min = $t;

Diff Legend

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