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.321 by root, Thu Jul 26 21:44:43 2007 UTC vs.
Revision 1.362 by root, Mon Sep 10 12:44:06 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
… …
186 $msg .= "\n" 187 $msg .= "\n"
187 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
188 189
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 191
191 utf8::encode $msg;
192 LOG llevError, $msg; 192 LOG llevError, $msg;
193 }; 193 };
194} 194}
195 195
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
271Wait until the given lock is available and then acquires it and returns 271Wait 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, 272a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 273for example when the coroutine gets canceled), the lock is automatically
274returned. 274returned.
275 275
276Locks are *not* recursive, locking from the same coro twice results in a
277deadlocked coro.
278
276Lock names should begin with a unique identifier (for example, cf::map::find 279Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 280uses map_find and cf::map::load uses map_load).
278 281
279=item $locked = cf::lock_active $string 282=item $locked = cf::lock_active $string
280 283
281Return true if the lock is currently active, i.e. somebody has locked it. 284Return true if the lock is currently active, i.e. somebody has locked it.
282 285
283=cut 286=cut
284 287
285our %LOCK; 288our %LOCK;
289our %LOCKER;#d#
286 290
287sub lock_wait($) { 291sub lock_wait($) {
288 my ($key) = @_; 292 my ($key) = @_;
293
294 if ($LOCKER{$key} == $Coro::current) {#d#
295 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
296 return;#d#
297 }#d#
289 298
290 # wait for lock, if any 299 # wait for lock, if any
291 while ($LOCK{$key}) { 300 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 301 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 302 Coro::schedule;
… …
299 308
300 # wait, to be sure we are not locked 309 # wait, to be sure we are not locked
301 lock_wait $key; 310 lock_wait $key;
302 311
303 $LOCK{$key} = []; 312 $LOCK{$key} = [];
313 $LOCKER{$key} = $Coro::current;#d#
304 314
305 Coro::guard { 315 Coro::guard {
316 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 317 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 318 $_->ready for @{ delete $LOCK{$key} };
308 } 319 }
309} 320}
310 321
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 483Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 484never block itself or use any form of Event handling.
474 485
475=cut 486=cut
476 487
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 488sub fork_call(&@) {
487 my ($cb, @args) = @_; 489 my ($cb, @args) = @_;
488 490
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 491 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 492 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 493 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 494
494 if (my $pid = fork) { 495 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 496 reset_signals;
508 local $SIG{__WARN__}; 497 &$cb
509 local $SIG{__DIE__}; 498 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 499
516 eval { 500 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 501}
529 502
530=item $value = cf::db_get $family => $key 503=item $value = cf::db_get $family => $key
531 504
532Returns a single value from the environment database. 505Returns a single value from the environment database.
… …
612 if (1) { 585 if (1) {
613 $md5 = 586 $md5 =
614 join "\x00", 587 join "\x00",
615 $processversion, 588 $processversion,
616 map { 589 map {
617 Coro::cede; 590 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 591 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 592 } 0.. $#$src;
620 593
621 594
622 my $dbmd5 = db_get cache => "$id/md5"; 595 my $dbmd5 = db_get cache => "$id/md5";
… …
1039); 1012);
1040 1013
1041sub object_freezer_save { 1014sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1015 my ($filename, $rdata, $objs) = @_;
1043 1016
1017 my $guard = cf::lock_acquire "io";
1018
1044 sync_job { 1019 sync_job {
1045 if (length $$rdata) { 1020 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1023 $decname, length $$rdata, scalar @$objs;
1048 1024
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1026 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1028 aio_fsync $fh if $cf::USE_FSYNC;
… …
1071 } 1047 }
1072 } else { 1048 } else {
1073 aio_unlink $filename; 1049 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1075 } 1051 }
1076 } 1052 };
1053
1054 undef $guard;
1077} 1055}
1078 1056
1079sub object_freezer_as_string { 1057sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1081 1059
… …
1086 1064
1087sub object_thawer_load { 1065sub object_thawer_load {
1088 my ($filename) = @_; 1066 my ($filename) = @_;
1089 1067
1090 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1091 1071
1092 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1093 or return; 1073 or return;
1094 1074
1095 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1077 or return;
1078
1079 undef $guard;
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1081 }
1100 1082
1083 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1084 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1085 $decname, length $data, scalar @{$av || []};
1086
1103 return ($data, $av); 1087 ($data, $av)
1104} 1088}
1105 1089
1106=head2 COMMAND CALLBACKS 1090=head2 COMMAND CALLBACKS
1107 1091
1108=over 4 1092=over 4
… …
1186 my ($type, $reply, @payload) = 1170 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1171 "ARRAY" eq ref $msg
1188 ? @$msg 1172 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1173 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1174
1175 my @reply;
1176
1191 if (my $cb = $EXTCMD{$type}) { 1177 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1178 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1179 }
1180
1181 $pl->ext_reply ($reply, @reply)
1182 if $reply;
1183
1197 } else { 1184 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1185 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1186 }
1200 1187
1201 cf::override; 1188 cf::override;
… …
1291 1278
1292=head3 cf::player 1279=head3 cf::player
1293 1280
1294=over 4 1281=over 4
1295 1282
1283=item cf::player::num_playing
1284
1285Returns the official number of playing players, as per the Crossfire metaserver rules.
1286
1287=cut
1288
1289sub num_playing {
1290 scalar grep
1291 $_->ob->map
1292 && !$_->hidden
1293 && !$_->ob->flag (cf::FLAG_WIZ),
1294 cf::player::list
1295}
1296
1296=item cf::player::find $login 1297=item cf::player::find $login
1297 1298
1298Returns the given player object, loading it if necessary (might block). 1299Returns the given player object, loading it if necessary (might block).
1299 1300
1300=cut 1301=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1336 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1337 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1338 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1339 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1340
1340 my $pl = load_pl path $login 1341 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1342 or return;
1343
1344 $f->next;
1345 my $pl = cf::player::load_pl $f
1346 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1349 $cf::PLAYER{$login} = $pl
1343 } 1350 }
1344 } 1351 }
1345} 1352}
1346 1353
… …
1356 1363
1357 aio_mkdir playerdir $pl, 0770; 1364 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1365 $pl->{last_save} = $cf::RUNTIME;
1359 1366
1360 $pl->save_pl ($path); 1367 $pl->save_pl ($path);
1361 Coro::cede; 1368 cf::cede_to_tick;
1362} 1369}
1363 1370
1364sub new($) { 1371sub new($) {
1365 my ($login) = @_; 1372 my ($login) = @_;
1366 1373
… …
1370 $self->{deny_save} = 1; 1377 $self->{deny_save} = 1;
1371 1378
1372 $cf::PLAYER{$login} = $self; 1379 $cf::PLAYER{$login} = $self;
1373 1380
1374 $self 1381 $self
1382}
1383
1384=item $player->send_msg ($channel, $msg, $color, [extra...])
1385
1386=cut
1387
1388sub send_msg {
1389 my $ns = shift->ns
1390 or return;
1391 $ns->send_msg (@_);
1375} 1392}
1376 1393
1377=item $pl->quit_character 1394=item $pl->quit_character
1378 1395
1379Nukes the player without looking back. If logged in, the connection will 1396Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1451 or return [];
1435 1452
1436 my @logins; 1453 my @logins;
1437 1454
1438 for my $login (@$dirs) { 1455 for my $login (@$dirs) {
1456 my $path = path $login;
1457
1458 # a .pst is a dead give-away for a valid player
1459 unless (-e "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1460 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1461 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1462 $buf !~ /^password -------------$/m or next; # official not-valid tag
1463 }
1442 1464
1443 utf8::decode $login; 1465 utf8::decode $login;
1444 push @logins, $login; 1466 push @logins, $login;
1445 } 1467 }
1446 1468
… …
1484sub expand_cfpod { 1506sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1507 ((my $self), (local $_)) = @_;
1486 1508
1487 # escape & and < 1509 # escape & and <
1488 s/&/&amp;/g; 1510 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1511 s/(?<![BIUGHT])</&lt;/g;
1490 1512
1491 # this is buggy, it needs to properly take care of nested <'s 1513 # this is buggy, it needs to properly take care of nested <'s
1492 1514
1493 1 while 1515 1 while
1494 # replace B<>, I<>, U<> etc. 1516 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1517 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1518 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1519 || s/U<([^\>]*)>/<u>$1<\/u>/
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1521 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1522 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1523 $self->gender ? $2 : $1
1501 }ge 1524 }ge
1502 # replace H<hint text> 1525 # replace H<hint text>
… …
1532=cut 1555=cut
1533 1556
1534sub ext_reply($$@) { 1557sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1558 my ($self, $id, @msg) = @_;
1536 1559
1537 if ($self->ns->extcmd == 2) { 1560 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1561}
1545 1562
1546=item $player->ext_msg ($type, @msg) 1563=item $player->ext_msg ($type, @msg)
1547 1564
1548Sends an ext event to the client. 1565Sends an ext event to the client.
… …
1776 1793
1777sub load_header_from($) { 1794sub load_header_from($) {
1778 my ($self, $path) = @_; 1795 my ($self, $path) = @_;
1779 1796
1780 utf8::encode $path; 1797 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1798 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1799 or return;
1800
1801 $self->_load_header ($f)
1802 or return;
1803
1804 local $MAP_LOADING{$self->{path}} = $self;
1805 $f->resolve_delayed_derefs;
1786 1806
1787 $self->{load_path} = $path; 1807 $self->{load_path} = $path;
1788 1808
1789 1 1809 1
1790} 1810}
… …
1844sub find { 1864sub find {
1845 my ($path, $origin) = @_; 1865 my ($path, $origin) = @_;
1846 1866
1847 $path = normalise $path, $origin && $origin->path; 1867 $path = normalise $path, $origin && $origin->path;
1848 1868
1869 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1870 cf::lock_wait "map_find:$path";
1850 1871
1851 $cf::MAP{$path} || do { 1872 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 1873 my $guard1 = cf::lock_acquire "map_find:$path";
1874 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1875
1853 my $map = new_from_path cf::map $path 1876 my $map = new_from_path cf::map $path
1854 or return; 1877 or return;
1855 1878
1856 $map->{last_save} = $cf::RUNTIME; 1879 $map->{last_save} = $cf::RUNTIME;
1857 1880
… …
1859 or return; 1882 or return;
1860 1883
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1884 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1885 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1886 #$cf::WAIT_FOR_TICK->wait;
1887 undef $guard1;
1888 undef $guard2;
1864 $map->reset; 1889 $map->reset;
1865 undef $guard;
1866 return find $path; 1890 return find $path;
1867 } 1891 }
1868 1892
1869 $cf::MAP{$path} = $map 1893 $cf::MAP{$path} = $map
1870 } 1894 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1903 local $self->{deny_reset} = 1; # loading can take a long time
1880 1904
1881 my $path = $self->{path}; 1905 my $path = $self->{path};
1882 1906
1883 { 1907 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1908 my $guard = cf::lock_acquire "map_data:$path";
1885 1909
1910 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1911 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1912
1888 $self->in_memory (cf::MAP_LOADING); 1913 $self->in_memory (cf::MAP_LOADING);
1889 1914
1890 $self->alloc; 1915 $self->alloc;
1891 1916
1892 $self->pre_load; 1917 $self->pre_load;
1893 Coro::cede; 1918 cf::cede_to_tick;
1894 1919
1920 my $f = new_from_file cf::object::thawer $self->{load_path};
1921 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 1922 $self->_load_objects ($f)
1896 or return; 1923 or return;
1897 1924
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1925 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 1926 if delete $self->{load_original};
1900 1927
1901 if (my $uniq = $self->uniq_path) { 1928 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 1929 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 1930 unless (aio_stat $uniq) {
1931 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 1932 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1933 $self->_load_objects ($f);
1934 $f->resolve_delayed_derefs;
1935 }
1906 } 1936 }
1907 } 1937 }
1908 1938
1909 Coro::cede; 1939 $f->resolve_delayed_derefs;
1940
1941 cf::cede_to_tick;
1910 # now do the right thing for maps 1942 # now do the right thing for maps
1911 $self->link_multipart_objects; 1943 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1944 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1945 unless $self->difficulty;
1914 Coro::cede; 1946 cf::cede_to_tick;
1915 1947
1916 unless ($self->{deny_activate}) { 1948 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1949 $self->decay_objects;
1918 $self->fix_auto_apply; 1950 $self->fix_auto_apply;
1919 $self->update_buttons; 1951 $self->update_buttons;
1920 Coro::cede; 1952 cf::cede_to_tick;
1921 $self->set_darkness_map; 1953 $self->set_darkness_map;
1922 Coro::cede; 1954 cf::cede_to_tick;
1923 $self->activate; 1955 $self->activate;
1924 } 1956 }
1957
1958 $self->{last_save} = $cf::RUNTIME;
1959 $self->last_access ($cf::RUNTIME);
1925 1960
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1961 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1962 }
1928 1963
1929 $self->post_load; 1964 $self->post_load;
… …
1940 1975
1941 $self 1976 $self
1942} 1977}
1943 1978
1944# find and load all maps in the 3x3 area around a map 1979# find and load all maps in the 3x3 area around a map
1945sub load_diag { 1980sub load_neighbours {
1946 my ($map) = @_; 1981 my ($map) = @_;
1947 1982
1948 my @diag; # diagonal neighbours 1983 my @neigh; # diagonal neighbours
1949 1984
1950 for (0 .. 3) { 1985 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1986 my $neigh = $map->tile_path ($_)
1952 or next; 1987 or next;
1953 $neigh = find $neigh, $map 1988 $neigh = find $neigh, $map
1954 or next; 1989 or next;
1955 $neigh->load; 1990 $neigh->load;
1956 1991
1992 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1993 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1994 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1995 }
1960 1996
1961 for (@diag) { 1997 for (grep defined $_->[0], @neigh) {
1998 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1999 my $neigh = find $path, $origin
1963 or next; 2000 or next;
1964 $neigh->load; 2001 $neigh->load;
1965 } 2002 }
1966} 2003}
1967 2004
… …
1972} 2009}
1973 2010
1974sub do_load_sync { 2011sub do_load_sync {
1975 my ($map) = @_; 2012 my ($map) = @_;
1976 2013
2014 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2015 if $Coro::current == $Coro::main;
2016
1977 cf::sync_job { $map->load }; 2017 cf::sync_job { $map->load };
1978} 2018}
1979 2019
1980our %MAP_PREFETCH; 2020our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2021our $MAP_PREFETCHER = undef;
1982 2022
1983sub find_async { 2023sub find_async {
1984 my ($path, $origin) = @_; 2024 my ($path, $origin, $load) = @_;
1985 2025
1986 $path = normalise $path, $origin && $origin->{path}; 2026 $path = normalise $path, $origin && $origin->{path};
1987 2027
1988 if (my $map = $cf::MAP{$path}) { 2028 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2029 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 2030 }
1991 2031
1992 undef $MAP_PREFETCH{$path}; 2032 $MAP_PREFETCH{$path} |= $load;
2033
1993 $MAP_PREFETCHER ||= cf::async { 2034 $MAP_PREFETCHER ||= cf::async {
1994 while (%MAP_PREFETCH) { 2035 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2036 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2037 if (my $map = find $k) {
1997 $map->load; 2038 $map->load if $v;
1998 } 2039 }
1999 2040
2000 delete $MAP_PREFETCH{$path}; 2041 delete $MAP_PREFETCH{$k};
2001 } 2042 }
2002 } 2043 }
2003 undef $MAP_PREFETCHER; 2044 undef $MAP_PREFETCHER;
2004 }; 2045 };
2005 $MAP_PREFETCHER->prio (6); 2046 $MAP_PREFETCHER->prio (6);
… …
2008} 2049}
2009 2050
2010sub save { 2051sub save {
2011 my ($self) = @_; 2052 my ($self) = @_;
2012 2053
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2054 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2055
2015 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
2016 2057
2017 return unless $self->dirty; 2058 return unless $self->dirty;
2018 2059
… …
2041 my ($self) = @_; 2082 my ($self) = @_;
2042 2083
2043 # save first because save cedes 2084 # save first because save cedes
2044 $self->save; 2085 $self->save;
2045 2086
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2087 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2088
2048 return if $self->players; 2089 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2090 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2091 return if $self->{deny_save};
2051 2092
2093 $self->in_memory (cf::MAP_SWAPPED);
2094
2095 $self->deactivate;
2096 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2097 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2098}
2055 2099
2056sub reset_at { 2100sub reset_at {
2057 my ($self) = @_; 2101 my ($self) = @_;
2058 2102
… …
2090 if $uniq; 2134 if $uniq;
2091 } 2135 }
2092 2136
2093 delete $cf::MAP{$self->path}; 2137 delete $cf::MAP{$self->path};
2094 2138
2139 $self->deactivate;
2140 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2141 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2142
2099 $self->unlink_save; 2143 $self->unlink_save;
2100 $self->destroy; 2144 $self->destroy;
2101} 2145}
2102 2146
2103my $nuke_counter = "aaaa"; 2147my $nuke_counter = "aaaa";
2104 2148
2105sub nuke { 2149sub nuke {
2106 my ($self) = @_; 2150 my ($self) = @_;
2107 2151
2152 {
2153 my $lock = cf::lock_acquire "map_data:$self->{path}";
2154
2108 delete $cf::MAP{$self->path}; 2155 delete $cf::MAP{$self->path};
2109 2156
2110 $self->unlink_save; 2157 $self->unlink_save;
2111 2158
2112 bless $self, "cf::map"; 2159 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2160 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2161 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2162 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2163 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2164
2118 $cf::MAP{$self->path} = $self; 2165 $cf::MAP{$self->path} = $self;
2166 }
2119 2167
2120 $self->reset; # polite request, might not happen 2168 $self->reset; # polite request, might not happen
2121} 2169}
2122 2170
2123=item $maps = cf::map::tmp_maps 2171=item $maps = cf::map::tmp_maps
… …
2199 2247
2200sub inv_recursive { 2248sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2249 inv_recursive_ inv $_[0]
2202} 2250}
2203 2251
2252=item $ref = $ob->ref
2253
2254creates and returns a persistent reference to an objetc that can be stored as a string.
2255
2256=item $ob = cf::object::deref ($refstring)
2257
2258returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2259even if the object actually exists. May block.
2260
2261=cut
2262
2263sub deref {
2264 my ($ref) = @_;
2265
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return;
2273 $pl->ob->uuid eq $uuid
2274 or return;
2275
2276 $pl->ob
2277 } else {
2278 warn "$ref: cannot resolve object reference\n";
2279 undef
2280 }
2281}
2282
2204package cf; 2283package cf;
2205 2284
2206=back 2285=back
2207 2286
2208=head3 cf::object::player 2287=head3 cf::object::player
… …
2240 $self->message ($msg, $flags); 2319 $self->message ($msg, $flags);
2241 } 2320 }
2242 } 2321 }
2243} 2322}
2244 2323
2324=item $object->send_msg ($channel, $msg, $color, [extra...])
2325
2326=cut
2327
2328sub cf::object::send_msg {
2329 my $pl = shift->contr
2330 or return;
2331 $pl->send_msg (@_);
2332}
2333
2245=item $player_object->may ("access") 2334=item $player_object->may ("access")
2246 2335
2247Returns wether the given player is authorized to access resource "access" 2336Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2337(e.g. "command_wizcast").
2249 2338
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2415 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2416 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2417 if $x <=0 && $y <= 0;
2329 2418
2330 $map->load; 2419 $map->load;
2331 $map->load_diag; 2420 $map->load_neighbours;
2332 2421
2333 return unless $self->contr->active; 2422 return unless $self->contr->active;
2334 $self->activate_recursive; 2423 $self->activate_recursive;
2335 2424
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2425 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2596the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2597the message unless the client supports the msg packet.
2509 2598
2510=cut 2599=cut
2511 2600
2601our %CHANNEL = (
2602 "c/identify" => {
2603 id => "identify",
2604 title => "Identify",
2605 reply => undef,
2606 tooltip => "Items recently identified",
2607 },
2608 "c/examine" => {
2609 id => "examine",
2610 title => "Examine",
2611 reply => undef,
2612 tooltip => "Signs and other items you examined",
2613 },
2614);
2615
2512sub cf::client::send_msg { 2616sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2617 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2618
2515 $msg = $self->pl->expand_cfpod ($msg); 2619 $msg = $self->pl->expand_cfpod ($msg);
2516 2620
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2621 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622
2623 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2518 2625
2519 if (ref $channel) { 2626 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2627 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2628 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2629 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2630 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg;
2524 } 2632 }
2525 2633
2526 $channel = $channel->{id}; 2634 $channel = $channel->{id};
2527 } 2635 }
2528 2636
2529 return unless @extra || length $msg; 2637 return unless @extra || length $msg;
2530 2638
2531 if ($self->can_msg) { 2639 if ($self->can_msg) {
2640 # default colour, mask it out
2641 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2642 if $color & cf::NDI_DEF;
2643
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2644 $self->send_packet ("msg " . $self->{json_coder}->encode (
2645 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2646 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2647 if ($color >= 0) {
2648 # replace some tags by gcfclient-compatible ones
2649 for ($msg) {
2650 1 while
2651 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2652 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2653 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2654 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2655 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2656 }
2657
2658 $color &= cf::NDI_COLOR_MASK;
2659
2660 utf8::encode $msg;
2661
2545 if (0 && $msg =~ /\[/) { 2662 if (0 && $msg =~ /\[/) {
2663 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2664 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2665 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2666 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2667 $self->send_packet ("drawinfo $color $msg")
2550 } 2668 }
2551 } 2669 }
… …
2559=cut 2677=cut
2560 2678
2561sub cf::client::ext_msg($$@) { 2679sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2680 my ($self, $type, @msg) = @_;
2563 2681
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2682 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2683 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2684 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2685 push @msg, msgtype => "event_$type";
2686 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2687 }
2688}
2689
2690=item $client->ext_reply ($msgid, @msg)
2691
2692Sends an ext reply to the client.
2693
2694=cut
2695
2696sub cf::client::ext_reply($$@) {
2697 my ($self, $id, @msg) = @_;
2698
2699 if ($self->extcmd == 2) {
2700 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2701 } elsif ($self->extcmd == 1) {
2702 #TODO: version 1, remove
2703 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2704 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2705 }
2572} 2706}
2573 2707
2574=item $success = $client->query ($flags, "text", \&cb) 2708=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 2770 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2771 "ARRAY" eq ref $msg
2638 ? @$msg 2772 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2773 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2774
2775 my @reply;
2776
2641 if (my $cb = $EXTICMD{$type}) { 2777 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2778 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2779 }
2780
2781 $ns->ext_reply ($reply, @reply)
2782 if $reply;
2783
2647 } else { 2784 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2785 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2786 }
2650 2787
2651 cf::override; 2788 cf::override;
… …
2698our $safe = new Safe "safe"; 2835our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2836our $safe_hole = new Safe::Hole;
2700 2837
2701$SIG{FPE} = 'IGNORE'; 2838$SIG{FPE} = 'IGNORE';
2702 2839
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2840$safe->permit_only (Opcode::opset qw(
2841 :base_core :base_mem :base_orig :base_math
2842 grepstart grepwhile mapstart mapwhile
2843 sort time
2844));
2704 2845
2705# here we export the classes and methods available to script code 2846# here we export the classes and methods available to script code
2706 2847
2707=pod 2848=pod
2708 2849
2709The following functions and methods are available within a safe environment: 2850The following functions and methods are available within a safe environment:
2710 2851
2711 cf::object 2852 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2853 contr pay_amount pay_player map x y force_find force_add
2713 insert remove 2854 insert remove name archname title slaying race decrease_ob_nr
2714 2855
2715 cf::object::player 2856 cf::object::player
2716 player 2857 player
2717 2858
2718 cf::player 2859 cf::player
… …
2723 2864
2724=cut 2865=cut
2725 2866
2726for ( 2867for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2869 insert remove inv name archname title slaying race
2728 insert remove)], 2870 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2871 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2872 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2873 ["cf::map" => qw(trigger)],
2732) { 2874) {
2733 no strict 'refs'; 2875 no strict 'refs';
… …
2809# the server's init and main functions 2951# the server's init and main functions
2810 2952
2811sub load_facedata($) { 2953sub load_facedata($) {
2812 my ($path) = @_; 2954 my ($path) = @_;
2813 2955
2956 # HACK to clear player env face cache, we need some signal framework
2957 # for this (global event?)
2958 %ext::player_env::MUSIC_FACE_CACHE = ();
2959
2960 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2961
2814 warn "loading facedata from $path\n"; 2962 warn "loading facedata from $path\n";
2815 2963
2816 my $facedata; 2964 my $facedata;
2817 0 < aio_load $path, $facedata 2965 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2966 or die "$path: $!";
2819 2967
2820 $facedata = Coro::Storable::thaw $facedata; 2968 $facedata = Coro::Storable::thaw $facedata;
2821 2969
2822 $facedata->{version} == 2 2970 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2971 or cf::cleanup "$path: version mismatch, cannot proceed.";
2972
2973 # patch in the exptable
2974 $facedata->{resource}{"res/exp_table"} = {
2975 type => FT_RSRC,
2976 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2977 };
2978 cf::cede_to_tick;
2824 2979
2825 { 2980 {
2826 my $faces = $facedata->{faceinfo}; 2981 my $faces = $facedata->{faceinfo};
2827 2982
2828 while (my ($face, $info) = each %$faces) { 2983 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2984 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2985 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2986 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2987 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2988 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2989
2835 cf::cede_to_tick; 2990 cf::cede_to_tick;
2836 } 2991 }
2837 2992
2838 while (my ($face, $info) = each %$faces) { 2993 while (my ($face, $info) = each %$faces) {
… …
2863 3018
2864 { 3019 {
2865 # TODO: for gcfclient pleasure, we should give resources 3020 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3021 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3022 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3023
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3024 my $soundconf = delete $res->{"res/sound.conf"};
2871 3025
2872 while (my ($name, $info) = each %$res) { 3026 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3027 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3028 my $data;
2879 3029
2880 if ($info->{type} & 1) { 3030 if ($info->{type} & 1) {
2881 # prepend meta info 3031 # prepend meta info
2882 3032
3033 my $meta = $enc->encode ({
3034 name => $name,
3035 %{ $info->{meta} || {} },
3036 });
3037
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3038 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else { 3039 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3040 $data = $info->{data};
2889 } 3041 }
2890 3042
3043 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3044 cf::face::set_type $idx, $info->{type};
2892 3045
2893 cf::cede_to_tick; 3046 cf::cede_to_tick;
2894 } 3047 }
2895 3048
… …
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3052 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_] 3053 my $sound = $soundconf->{compat}[$_]
2901 or next; 3054 or next;
2902 3055
2903 my $face = cf::face::find "sound/$sound->[1]"; 3056 my $face = cf::face::find "sound/$sound->[1]";
2904 warn "$sound->[0]: $face\n";#d#
2905
2906 cf::sound::set $sound->[0] => $face; 3057 cf::sound::set $sound->[0] => $face;
2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat 3058 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908 } 3059 }
2909 3060
3061 while (my ($k, $v) = each %{$soundconf->{event}}) {
3062 my $face = cf::face::find "sound/$v";
3063 cf::sound::set $k => $face;
2910 #TODO 3064 }
2911 } 3065 }
2912 } 3066 }
2913 3067
2914 1 3068 1
2915} 3069}
… …
2921 $ns->fx_want ($k, $v); 3075 $ns->fx_want ($k, $v);
2922 } 3076 }
2923}; 3077};
2924 3078
2925sub reload_regions { 3079sub reload_regions {
3080 # HACK to clear player env face cache, we need some signal framework
3081 # for this (global event?)
3082 %ext::player_env::MUSIC_FACE_CACHE = ();
3083
2926 load_resource_file "$MAPDIR/regions" 3084 load_resource_file "$MAPDIR/regions"
2927 or die "unable to load regions file\n"; 3085 or die "unable to load regions file\n";
2928 3086
2929 for (cf::region::list) { 3087 for (cf::region::list) {
2930 $_->{match} = qr/$_->{match}/ 3088 $_->{match} = qr/$_->{match}/
… …
2966 3124
2967sub init { 3125sub init {
2968 reload_resources; 3126 reload_resources;
2969} 3127}
2970 3128
2971sub cfg_load { 3129sub reload_config {
2972 open my $fh, "<:utf8", "$CONFDIR/config" 3130 open my $fh, "<:utf8", "$CONFDIR/config"
2973 or return; 3131 or return;
2974 3132
2975 local $/; 3133 local $/;
2976 *CFG = YAML::Syck::Load <$fh>; 3134 *CFG = YAML::Syck::Load <$fh>;
… …
2996 (async { 3154 (async {
2997 Event::one_event; 3155 Event::one_event;
2998 })->prio (Coro::PRIO_MAX); 3156 })->prio (Coro::PRIO_MAX);
2999 }; 3157 };
3000 3158
3001 cfg_load; 3159 reload_config;
3002 db_init; 3160 db_init;
3003 load_extensions; 3161 load_extensions;
3004 3162
3005 $TICK_WATCHER->start; 3163 $TICK_WATCHER->start;
3006 Event::loop; 3164 Event::loop;
… …
3199 warn "reloading cf.pm"; 3357 warn "reloading cf.pm";
3200 require cf; 3358 require cf;
3201 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3359 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3202 3360
3203 warn "loading config and database again"; 3361 warn "loading config and database again";
3204 cf::cfg_load; 3362 cf::reload_config;
3205 3363
3206 warn "loading extensions"; 3364 warn "loading extensions";
3207 cf::load_extensions; 3365 cf::load_extensions;
3208 3366
3209 warn "reattaching attachments to objects/players"; 3367 warn "reattaching attachments to objects/players";
… …
3302 or die; 3460 or die;
3303 3461
3304 $map->width (50); 3462 $map->width (50);
3305 $map->height (50); 3463 $map->height (50);
3306 $map->alloc; 3464 $map->alloc;
3307 $map->_load_objects ("/tmp/x.map", 1); 3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3308 my $t = Event::time - $t; 3466 my $t = Event::time - $t;
3309 3467
3310 #next unless $t < 0.0013;#d# 3468 #next unless $t < 0.0013;#d#
3311 if ($t < $min) { 3469 if ($t < $min) {
3312 $min = $t; 3470 $min = $t;

Diff Legend

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