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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.346 by root, Tue Aug 28 19:38:40 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
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
… …
163=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
164 168
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
168 178
169=back 179=back
170 180
171=cut 181=cut
172 182
… …
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 247 $d
238 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
239} 249}
240 250
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
244 252
245Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
246 254
247=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
248 256
249Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
250 265
251=item cf::lock_wait $string 266=item cf::lock_wait $string
252 267
253Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
254 269
… …
306 my $guard = Coro::guard { 321 my $guard = Coro::guard {
307 $TICK_WATCHER->start; 322 $TICK_WATCHER->start;
308 }; 323 };
309 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
310 $guard 325 $guard
326}
327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
311} 382}
312 383
313=item cf::async { BLOCK } 384=item cf::async { BLOCK }
314 385
315Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
… …
405=cut 476=cut
406 477
407sub fork_call(&@) { 478sub fork_call(&@) {
408 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
409 480
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
413 or die "pipe: $!";
414 484
415 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 486 reset_signals;
428 local $SIG{__WARN__}; 487 &$cb
429 local $SIG{__DIE__}; 488 }, @args;
430 eval {
431 close $fh1;
432 489
433 my @res = eval { $cb->(@args) }; 490 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 491}
441 492
442=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
443 494
444Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
524 if (1) { 575 if (1) {
525 $md5 = 576 $md5 =
526 join "\x00", 577 join "\x00",
527 $processversion, 578 $processversion,
528 map { 579 map {
529 Coro::cede; 580 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 582 } 0.. $#$src;
532 583
533 584
534 my $dbmd5 = db_get cache => "$id/md5"; 585 my $dbmd5 = db_get cache => "$id/md5";
… …
840 "; 891 ";
841 die if $@; 892 die if $@;
842} 893}
843 894
844our $override; 895our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 897
847sub override { 898sub override {
848 $override = 1; 899 $override = 1;
849 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
850} 901}
851 902
852sub do_invoke { 903sub do_invoke {
853 my $event = shift; 904 my $event = shift;
854 my $callbacks = shift; 905 my $callbacks = shift;
855 906
856 @invoke_results = (); 907 @INVOKE_RESULTS = ();
857 908
858 local $override; 909 local $override;
859 910
860 for (@$callbacks) { 911 for (@$callbacks) {
861 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
878 929
879Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
880 931
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 935
885=back 936=back
886 937
887=cut 938=cut
888 939
889############################################################################# 940#############################################################################
890# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
891 953
892sub reattach { 954sub reattach {
893 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 956 my ($obj) = @_;
895 957
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1092}
1031 1093
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1095
1034Register a callback fro execution when the client sends an extcmd packet. 1096Register a callback for execution when the client sends an (synchronous)
1097extcmd packet. Ext commands will be processed in the order they are
1098received by the server, like other user commands. The first argument is
1099the logged-in player. Ext commands can only be processed after a player
1100has logged in successfully.
1035 1101
1036If the callback returns something, it is sent back as if reply was being 1102If the callback returns something, it is sent back as if reply was being
1037called. 1103called.
1038 1104
1105=item cf::register_exticmd $name => \&callback($ns,$packet);
1106
1107Register a callback for execution when the client sends an (asynchronous)
1108exticmd packet. Exti commands are processed by the server as soon as they
1109are received, i.e. out of order w.r.t. other commands. The first argument
1110is a client socket. Exti commands can be received anytime, even before
1111log-in.
1112
1113If the callback returns something, it is sent back as if reply was being
1114called.
1115
1039=cut 1116=cut
1040 1117
1041sub register_extcmd { 1118sub register_extcmd {
1042 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
1043 1120
1044 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
1045} 1128}
1046 1129
1047cf::player->attach ( 1130cf::player->attach (
1048 on_command => sub { 1131 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1141 cf::override;
1059 }, 1142 },
1060 on_extcmd => sub { 1143 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1062 1145
1063 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1147
1065 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1154 my @reply;
1155
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1071 } else { 1163 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1165 }
1074 1166
1075 cf::override; 1167 cf::override;
… …
1230 1322
1231 aio_mkdir playerdir $pl, 0770; 1323 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1324 $pl->{last_save} = $cf::RUNTIME;
1233 1325
1234 $pl->save_pl ($path); 1326 $pl->save_pl ($path);
1235 Coro::cede; 1327 cf::cede_to_tick;
1236} 1328}
1237 1329
1238sub new($) { 1330sub new($) {
1239 my ($login) = @_; 1331 my ($login) = @_;
1240 1332
… …
1244 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1245 1337
1246 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1247 1339
1248 $self 1340 $self
1341}
1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1249} 1351}
1250 1352
1251=item $pl->quit_character 1353=item $pl->quit_character
1252 1354
1253Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1347 } 1449 }
1348 1450
1349 \@paths 1451 \@paths
1350} 1452}
1351 1453
1454=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1455
1456Expand crossfire pod fragments into protocol xml.
1457
1458=cut
1459
1460sub expand_cfpod {
1461 ((my $self), (local $_)) = @_;
1462
1463 # escape & and <
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466
1467 # this is buggy, it needs to properly take care of nested <'s
1468
1469 1 while
1470 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/
1474 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1
1477 }ge
1478 # replace H<hint text>
1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1486
1487 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497}
1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503
1352=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1353 1505
1354Sends an ext reply to the player. 1506Sends an ext reply to the player.
1355 1507
1356=cut 1508=cut
1357 1509
1358sub ext_reply($$%) { 1510sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1360 1512
1361 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1514}
1365 1515
1366=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1367 1517
1368Sends an ext event to the client. 1518Sends an ext event to the client.
1369 1519
1370=cut 1520=cut
1371 1521
1372sub ext_event($$%) { 1522sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1374 1524
1375 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1376} 1526}
1377 1527
1378=head3 cf::region 1528=head3 cf::region
1379 1529
1380=over 4 1530=over 4
… …
1393 my ($path) = @_; 1543 my ($path) = @_;
1394 1544
1395 my ($match, $specificity); 1545 my ($match, $specificity);
1396 1546
1397 for my $region (list) { 1547 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1401 } 1551 }
1402 } 1552 }
1403 1553
… …
1523 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1524 return $self; 1674 return $self;
1525 } 1675 }
1526 } 1676 }
1527 1677
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1679 ()
1530} 1680}
1531 1681
1532sub init { 1682sub init {
1533 my ($self) = @_; 1683 my ($self) = @_;
… …
1699 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1700 1850
1701 my $path = $self->{path}; 1851 my $path = $self->{path};
1702 1852
1703 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1704 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1705 1856
1706 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1707 1858
1708 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1709 1860
1710 $self->alloc; 1861 $self->alloc;
1711 1862
1712 $self->pre_load; 1863 $self->pre_load;
1713 Coro::cede; 1864 cf::cede_to_tick;
1714 1865
1715 $self->_load_objects ($self->{load_path}, 1) 1866 $self->_load_objects ($self->{load_path}, 1)
1716 or return; 1867 or return;
1717 1868
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1724 $self->clear_unique_items; 1875 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 1876 $self->_load_objects ($uniq, 0);
1726 } 1877 }
1727 } 1878 }
1728 1879
1729 Coro::cede; 1880 cf::cede_to_tick;
1730 # now do the right thing for maps 1881 # now do the right thing for maps
1731 $self->link_multipart_objects; 1882 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 1883 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 1884 unless $self->difficulty;
1734 Coro::cede; 1885 cf::cede_to_tick;
1735 1886
1736 unless ($self->{deny_activate}) { 1887 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 1888 $self->decay_objects;
1738 $self->fix_auto_apply; 1889 $self->fix_auto_apply;
1739 $self->update_buttons; 1890 $self->update_buttons;
1740 Coro::cede; 1891 cf::cede_to_tick;
1741 $self->set_darkness_map; 1892 $self->set_darkness_map;
1742 Coro::cede; 1893 cf::cede_to_tick;
1743 $self->activate; 1894 $self->activate;
1744 } 1895 }
1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1745 1899
1746 $self->in_memory (cf::MAP_IN_MEMORY); 1900 $self->in_memory (cf::MAP_IN_MEMORY);
1747 } 1901 }
1748 1902
1749 $self->post_load; 1903 $self->post_load;
… …
1760 1914
1761 $self 1915 $self
1762} 1916}
1763 1917
1764# find and load all maps in the 3x3 area around a map 1918# find and load all maps in the 3x3 area around a map
1765sub load_diag { 1919sub load_neighbours {
1766 my ($map) = @_; 1920 my ($map) = @_;
1767 1921
1768 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1769 1923
1770 for (0 .. 3) { 1924 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1772 or next; 1926 or next;
1773 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1774 or next; 1928 or next;
1775 $neigh->load; 1929 $neigh->load;
1776 1930
1931 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 1934 }
1780 1935
1781 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1783 or next; 1939 or next;
1784 $neigh->load; 1940 $neigh->load;
1785 } 1941 }
1786} 1942}
1787 1943
… …
1792} 1948}
1793 1949
1794sub do_load_sync { 1950sub do_load_sync {
1795 my ($map) = @_; 1951 my ($map) = @_;
1796 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1797 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1798} 1957}
1799 1958
1800our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1802 1961
1803sub find_async { 1962sub find_async {
1804 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1805 1964
1806 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1807 1966
1808 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810 } 1969 }
1811 1970
1812 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1813 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1814 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 1976 if (my $map = find $k) {
1817 or next;
1818 $map->load; 1977 $map->load if $v;
1978 }
1819 1979
1820 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1821 } 1981 }
1822 } 1982 }
1823 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1824 }; 1984 };
1825 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
… …
1828} 1988}
1829 1989
1830sub save { 1990sub save {
1831 my ($self) = @_; 1991 my ($self) = @_;
1832 1992
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 1994
1835 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1836 1996
1837 return unless $self->dirty; 1997 return unless $self->dirty;
1838 1998
… …
1861 my ($self) = @_; 2021 my ($self) = @_;
1862 2022
1863 # save first because save cedes 2023 # save first because save cedes
1864 $self->save; 2024 $self->save;
1865 2025
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2027
1868 return if $self->players; 2028 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
1870 return if $self->{deny_save}; 2030 return if $self->{deny_save};
1871 2031
… …
2050 2210
2051 } else { 2211 } else {
2052 my $pl = $self->contr; 2212 my $pl = $self->contr;
2053 2213
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2214 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2215 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2216 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2217
2060 } else { 2218 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2219 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2063 } 2221 }
2064 } 2222 }
2223}
2224
2225=item $object->send_msg ($channel, $msg, $color, [extra...])
2226
2227=cut
2228
2229sub cf::object::send_msg {
2230 my $pl = shift->contr
2231 or return;
2232 $pl->send_msg (@_);
2065} 2233}
2066 2234
2067=item $player_object->may ("access") 2235=item $player_object->may ("access")
2068 2236
2069Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
… …
2148 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
2151 2319
2152 $map->load; 2320 $map->load;
2153 $map->load_diag; 2321 $map->load_neighbours;
2154 2322
2155 return unless $self->contr->active; 2323 return unless $self->contr->active;
2156 $self->activate_recursive; 2324 $self->activate_recursive;
2157 2325
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2327 $self->enter_map ($map, $x, $y);
2160} 2328}
2161 2329
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2330=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2331
2164Moves the player to the given map-path and coordinates by first freezing 2332Moves the player to the given map-path and coordinates by first freezing
2165her, loading and preparing them map, calling the provided $check callback 2333her, loading and preparing them map, calling the provided $check callback
2166that has to return the map if sucecssful, and then unfreezes the player on 2334that has to return the map if sucecssful, and then unfreezes the player on
2167the new (success) or old (failed) map position. 2335the new (success) or old (failed) map position. In either case, $done will
2336be called at the end of this process.
2168 2337
2169=cut 2338=cut
2170 2339
2171our $GOTOGEN; 2340our $GOTOGEN;
2172 2341
2173sub cf::object::player::goto { 2342sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2343 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2344
2176 # do generation counting so two concurrent goto's will be executed in-order 2345 # do generation counting so two concurrent goto's will be executed in-order
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2346 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2347
2179 $self->enter_link; 2348 $self->enter_link;
… …
2199 2368
2200 if ($gen == $self->{_goto_generation}) { 2369 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2370 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2371 $self->leave_link ($map, $x, $y);
2203 } 2372 }
2373
2374 $done->() if $done;
2204 })->prio (1); 2375 })->prio (1);
2205} 2376}
2206 2377
2207=item $player_object->enter_exit ($exit_object) 2378=item $player_object->enter_exit ($exit_object)
2208 2379
… …
2277 my $hp = $exit->stats->hp; 2448 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp; 2449 my $sp = $exit->stats->sp;
2279 2450
2280 $self->enter_link; 2451 $self->enter_link;
2281 2452
2453 # if exit is damned, update players death & WoR home-position
2454 $self->contr->savebed ($slaying, $hp, $sp)
2455 if $exit->flag (FLAG_DAMNED);
2456
2282 (async { 2457 (async {
2283 $self->deactivate_recursive; # just to be sure 2458 $self->deactivate_recursive; # just to be sure
2284 unless (eval { 2459 unless (eval {
2285 $self->goto ($slaying, $hp, $sp); 2460 $self->goto ($slaying, $hp, $sp);
2286 2461
… …
2313 2488
2314 utf8::encode $text; 2489 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2490 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 2491}
2317 2492
2493=item $client->send_msg ($channel, $msg, $color, [extra...])
2494
2495Send a drawinfo or msg packet to the client, formatting the msg for the
2496client if neccessary. C<$type> should be a string identifying the type of
2497the message, with C<log> being the default. If C<$color> is negative, suppress
2498the message unless the client supports the msg packet.
2499
2500=cut
2501
2502sub cf::client::send_msg {
2503 my ($self, $channel, $msg, $color, @extra) = @_;
2504
2505 $msg = $self->pl->expand_cfpod ($msg);
2506
2507 $color &= cf::NDI_CLIENT_MASK; # just in case...
2508
2509 if (ref $channel) {
2510 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel);
2514 }
2515
2516 $channel = $channel->{id};
2517 }
2518
2519 return unless @extra || length $msg;
2520
2521 if ($self->can_msg) {
2522 # default colour, mask it out
2523 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2524 if $color & cf::NDI_DEF;
2525
2526 $self->send_packet ("msg " . $self->{json_coder}->encode (
2527 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2528 } else {
2529 if ($color >= 0) {
2530 # replace some tags by gcfclient-compatible ones
2531 for ($msg) {
2532 1 while
2533 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2534 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2535 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2536 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2537 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2538 }
2539
2540 $color &= cf::NDI_COLOR_MASK;
2541
2542 utf8::encode $msg;
2543
2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg")
2550 }
2551 }
2552 }
2553}
2554
2318=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2319 2556
2320Sends an exti event to the client. 2557Sends an ext event to the client.
2321 2558
2322=cut 2559=cut
2323 2560
2324sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2326 2563
2564 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2571
2572=item $client->ext_reply ($msgid, @msg)
2573
2574Sends an ext reply to the client.
2575
2576=cut
2577
2578sub cf::client::ext_reply($$@) {
2579 my ($self, $id, @msg) = @_;
2580
2581 if ($self->extcmd == 2) {
2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2583 } elsif ($self->extcmd == 1) {
2584 #TODO: version 1, remove
2585 unshift @msg, msgtype => "reply", msgid => $id;
2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2587 }
2329} 2588}
2330 2589
2331=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
2332 2591
2333Queues a query to the client, calling the given callback with 2592Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2593the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2594C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2595
2337Queries can fail, so check the return code. Or don't, as queries will become 2596Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2597become reliable at some point in the future.
2339 2598
2340=cut 2599=cut
2341 2600
2342sub cf::client::query { 2601sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2602 my ($self, $flags, $text, $cb) = @_;
… …
2351 utf8::encode $text; 2610 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2611 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2612
2354 $self->send_packet ($self->{query_queue}[0][0]) 2613 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2614 if @{ $self->{query_queue} } == 1;
2615
2616 1
2356} 2617}
2357 2618
2358cf::client->attach ( 2619cf::client->attach (
2620 on_connect => sub {
2621 my ($ns) = @_;
2622
2623 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2624 },
2359 on_reply => sub { 2625 on_reply => sub {
2360 my ($ns, $msg) = @_; 2626 my ($ns, $msg) = @_;
2361 2627
2362 # this weird shuffling is so that direct followup queries 2628 # this weird shuffling is so that direct followup queries
2363 # get handled first 2629 # get handled first
… …
2375 } else { 2641 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2642 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2643 }
2378 } 2644 }
2379 }, 2645 },
2646 on_exticmd => sub {
2647 my ($ns, $buf) = @_;
2648
2649 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2650
2651 if (ref $msg) {
2652 my ($type, $reply, @payload) =
2653 "ARRAY" eq ref $msg
2654 ? @$msg
2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2656
2657 my @reply;
2658
2659 if (my $cb = $EXTICMD{$type}) {
2660 @reply = $cb->($ns, @payload);
2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2666 } else {
2667 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2668 }
2669
2670 cf::override;
2671 },
2380); 2672);
2381 2673
2382=item $client->async (\&cb) 2674=item $client->async (\&cb)
2383 2675
2384Create a new coroutine, running the specified callback. The coroutine will 2676Create a new coroutine, running the specified callback. The coroutine will
… …
2425our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2427 2719
2428$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2429 2721
2430$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2722$safe->permit_only (Opcode::opset qw(
2723 :base_core :base_mem :base_orig :base_math
2724 grepstart grepwhile mapstart mapwhile
2725 sort time
2726));
2431 2727
2432# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2433 2729
2434=pod 2730=pod
2435 2731
2436The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2437 2733
2438 cf::object contr pay_amount pay_player map 2734 cf::object
2735 contr pay_amount pay_player map x y force_find force_add
2736 insert remove name archname title slaying race decrease_ob_nr
2737
2439 cf::object::player player 2738 cf::object::player
2440 cf::player peaceful 2739 player
2441 cf::map trigger 2740
2741 cf::player
2742 peaceful
2743
2744 cf::map
2745 trigger
2442 2746
2443=cut 2747=cut
2444 2748
2445for ( 2749for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 2750 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2751 insert remove inv name archname title slaying race
2752 decrease_ob_nr)],
2447 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2450) { 2756) {
2451 no strict 'refs'; 2757 no strict 'refs';
… …
2527# the server's init and main functions 2833# the server's init and main functions
2528 2834
2529sub load_facedata($) { 2835sub load_facedata($) {
2530 my ($path) = @_; 2836 my ($path) = @_;
2531 2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839
2532 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2533 2841
2534 my $facedata; 2842 my $facedata;
2535 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 2844 or die "$path: $!";
… …
2538 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2539 2847
2540 $facedata->{version} == 2 2848 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2857
2543 { 2858 {
2544 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2545 2860
2546 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 2867
2868 cf::cede_to_tick;
2552 } 2869 }
2553 2870
2554 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 2872 next unless $info->{smooth};
2556 my $idx = cf::face::find $face 2873 my $idx = cf::face::find $face
2557 or next; 2874 or next;
2558 if (my $smooth = cf::face::find $info->{smooth}) { 2875 if (my $smooth = cf::face::find $info->{smooth}) {
2876 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 2878 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2879 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 2880 }
2563 Coro::cede; 2881
2882 cf::cede_to_tick;
2564 } 2883 }
2565 } 2884 }
2566 2885
2567 { 2886 {
2568 my $anims = $facedata->{animinfo}; 2887 my $anims = $facedata->{animinfo};
2569 2888
2570 while (my ($anim, $info) = each %$anims) { 2889 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2890 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 2891 cf::cede_to_tick;
2573 } 2892 }
2574 2893
2575 cf::anim::invalidate_all; # d'oh 2894 cf::anim::invalidate_all; # d'oh
2576 } 2895 }
2577 2896
2897 {
2898 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource};
2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2907
2908 if ($info->{type} & 1) {
2909 # prepend meta info
2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2917 } else {
2918 $data = $info->{data};
2919 }
2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick;
2925 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2944 }
2945
2578 1 2946 1
2579} 2947}
2948
2949register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_;
2951
2952 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v);
2954 }
2955};
2580 2956
2581sub reload_regions { 2957sub reload_regions {
2582 load_resource_file "$MAPDIR/regions" 2958 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 2959 or die "unable to load regions file\n";
2960
2961 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/
2963 if exists $_->{match};
2964 }
2584} 2965}
2585 2966
2586sub reload_facedata { 2967sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 2968 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 2969 or die "unable to load facedata\n";
2589} 2970}
2590 2971
2591sub reload_archetypes { 2972sub reload_archetypes {
2973 load_resource_file "$DATADIR/archetypes"
2974 or die "unable to load archetypes\n";
2975 #d# NEED to laod twice to resolve forward references
2976 # this really needs to be done in an extra post-pass
2977 # (which needs to be synchronous, so solve it differently)
2592 load_resource_file "$DATADIR/archetypes" 2978 load_resource_file "$DATADIR/archetypes"
2593 or die "unable to load archetypes\n"; 2979 or die "unable to load archetypes\n";
2594} 2980}
2595 2981
2596sub reload_treasures { 2982sub reload_treasures {
… …
2612 2998
2613sub init { 2999sub init {
2614 reload_resources; 3000 reload_resources;
2615} 3001}
2616 3002
2617sub cfg_load { 3003sub reload_config {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3005 or return;
2620 3006
2621 local $/; 3007 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
… …
2642 (async { 3028 (async {
2643 Event::one_event; 3029 Event::one_event;
2644 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
2645 }; 3031 };
2646 3032
2647 cfg_load; 3033 reload_config;
2648 db_init; 3034 db_init;
2649 load_extensions; 3035 load_extensions;
2650 3036
2651 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
2652 Event::loop; 3038 Event::loop;
… …
2790 %EXT_CORO = (); 3176 %EXT_CORO = ();
2791 3177
2792 warn "removing commands"; 3178 warn "removing commands";
2793 %COMMAND = (); 3179 %COMMAND = ();
2794 3180
2795 warn "removing ext commands"; 3181 warn "removing ext/exti commands";
2796 %EXTCMD = (); 3182 %EXTCMD = ();
3183 %EXTICMD = ();
2797 3184
2798 warn "unloading/nuking all extensions"; 3185 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) { 3186 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg"; 3187 warn "... unloading $pkg";
2801 3188
… …
2844 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
2845 require cf; 3232 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3234
2848 warn "loading config and database again"; 3235 warn "loading config and database again";
2849 cf::cfg_load; 3236 cf::reload_config;
2850 3237
2851 warn "loading extensions"; 3238 warn "loading extensions";
2852 cf::load_extensions; 3239 cf::load_extensions;
2853 3240
2854 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

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