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

Diff Legend

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