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.352 by root, Sun Sep 2 04:57:14 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/(?<![BIUGHT])</&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 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507
1352=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1353 1509
1354Sends an ext reply to the player. 1510Sends an ext reply to the player.
1355 1511
1356=cut 1512=cut
1357 1513
1358sub ext_reply($$%) { 1514sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1360 1516
1361 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1518}
1365 1519
1366=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1367 1521
1368Sends an ext event to the client. 1522Sends an ext event to the client.
1369 1523
1370=cut 1524=cut
1371 1525
1372sub ext_event($$%) { 1526sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1374 1528
1375 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1376} 1530}
1377 1531
1378=head3 cf::region 1532=head3 cf::region
1379 1533
1380=over 4 1534=over 4
… …
1393 my ($path) = @_; 1547 my ($path) = @_;
1394 1548
1395 my ($match, $specificity); 1549 my ($match, $specificity);
1396 1550
1397 for my $region (list) { 1551 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1552 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1553 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1554 if $region->specificity > $specificity;
1401 } 1555 }
1402 } 1556 }
1403 1557
… …
1523 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1524 return $self; 1678 return $self;
1525 } 1679 }
1526 } 1680 }
1527 1681
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1683 ()
1530} 1684}
1531 1685
1532sub init { 1686sub init {
1533 my ($self) = @_; 1687 my ($self) = @_;
… …
1699 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1700 1854
1701 my $path = $self->{path}; 1855 my $path = $self->{path};
1702 1856
1703 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1704 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1705 1860
1706 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1707 1862
1708 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1709 1864
1710 $self->alloc; 1865 $self->alloc;
1711 1866
1712 $self->pre_load; 1867 $self->pre_load;
1713 Coro::cede; 1868 cf::cede_to_tick;
1714 1869
1715 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1716 or return; 1871 or return;
1717 1872
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1724 $self->clear_unique_items; 1879 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1726 } 1881 }
1727 } 1882 }
1728 1883
1729 Coro::cede; 1884 cf::cede_to_tick;
1730 # now do the right thing for maps 1885 # now do the right thing for maps
1731 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 1888 unless $self->difficulty;
1734 Coro::cede; 1889 cf::cede_to_tick;
1735 1890
1736 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 1892 $self->decay_objects;
1738 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1739 $self->update_buttons; 1894 $self->update_buttons;
1740 Coro::cede; 1895 cf::cede_to_tick;
1741 $self->set_darkness_map; 1896 $self->set_darkness_map;
1742 Coro::cede; 1897 cf::cede_to_tick;
1743 $self->activate; 1898 $self->activate;
1744 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1745 1903
1746 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1747 } 1905 }
1748 1906
1749 $self->post_load; 1907 $self->post_load;
… …
1760 1918
1761 $self 1919 $self
1762} 1920}
1763 1921
1764# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1765sub load_diag { 1923sub load_neighbours {
1766 my ($map) = @_; 1924 my ($map) = @_;
1767 1925
1768 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1769 1927
1770 for (0 .. 3) { 1928 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1772 or next; 1930 or next;
1773 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1774 or next; 1932 or next;
1775 $neigh->load; 1933 $neigh->load;
1776 1934
1935 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 1938 }
1780 1939
1781 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1783 or next; 1943 or next;
1784 $neigh->load; 1944 $neigh->load;
1785 } 1945 }
1786} 1946}
1787 1947
… …
1792} 1952}
1793 1953
1794sub do_load_sync { 1954sub do_load_sync {
1795 my ($map) = @_; 1955 my ($map) = @_;
1796 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1797 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1798} 1961}
1799 1962
1800our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1802 1965
1803sub find_async { 1966sub find_async {
1804 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1805 1968
1806 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1807 1970
1808 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810 } 1973 }
1811 1974
1812 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1813 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1814 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 1980 if (my $map = find $k) {
1817 or next;
1818 $map->load; 1981 $map->load if $v;
1982 }
1819 1983
1820 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1821 } 1985 }
1822 } 1986 }
1823 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1824 }; 1988 };
1825 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1828} 1992}
1829 1993
1830sub save { 1994sub save {
1831 my ($self) = @_; 1995 my ($self) = @_;
1832 1996
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 1998
1835 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1836 2000
1837 return unless $self->dirty; 2001 return unless $self->dirty;
1838 2002
… …
1861 my ($self) = @_; 2025 my ($self) = @_;
1862 2026
1863 # save first because save cedes 2027 # save first because save cedes
1864 $self->save; 2028 $self->save;
1865 2029
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2031
1868 return if $self->players; 2032 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1870 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1871 2035
… …
1923my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1924 2088
1925sub nuke { 2089sub nuke {
1926 my ($self) = @_; 2090 my ($self) = @_;
1927 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
1928 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
1929 2096
1930 $self->unlink_save; 2097 $self->unlink_save;
1931 2098
1932 bless $self, "cf::map"; 2099 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2104
1938 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
1939 2107
1940 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
1941} 2109}
1942 2110
1943=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2050 2218
2051 } else { 2219 } else {
2052 my $pl = $self->contr; 2220 my $pl = $self->contr;
2053 2221
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2223 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2225
2060 } else { 2226 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2063 } 2229 }
2064 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
2065} 2241}
2066 2242
2067=item $player_object->may ("access") 2243=item $player_object->may ("access")
2068 2244
2069Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
2148 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2151 2327
2152 $map->load; 2328 $map->load;
2153 $map->load_diag; 2329 $map->load_neighbours;
2154 2330
2155 return unless $self->contr->active; 2331 return unless $self->contr->active;
2156 $self->activate_recursive; 2332 $self->activate_recursive;
2157 2333
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
2160} 2336}
2161 2337
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2339
2164Moves the player to the given map-path and coordinates by first freezing 2340Moves the player to the given map-path and coordinates by first freezing
2165her, loading and preparing them map, calling the provided $check callback 2341her, loading and preparing them map, calling the provided $check callback
2166that has to return the map if sucecssful, and then unfreezes the player on 2342that has to return the map if sucecssful, and then unfreezes the player on
2167the new (success) or old (failed) map position. 2343the new (success) or old (failed) map position. In either case, $done will
2344be called at the end of this process.
2168 2345
2169=cut 2346=cut
2170 2347
2171our $GOTOGEN; 2348our $GOTOGEN;
2172 2349
2173sub cf::object::player::goto { 2350sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2352
2176 # do generation counting so two concurrent goto's will be executed in-order 2353 # do generation counting so two concurrent goto's will be executed in-order
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2355
2179 $self->enter_link; 2356 $self->enter_link;
… …
2199 2376
2200 if ($gen == $self->{_goto_generation}) { 2377 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2378 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2203 } 2380 }
2381
2382 $done->() if $done;
2204 })->prio (1); 2383 })->prio (1);
2205} 2384}
2206 2385
2207=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
2208 2387
… …
2277 my $hp = $exit->stats->hp; 2456 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp; 2457 my $sp = $exit->stats->sp;
2279 2458
2280 $self->enter_link; 2459 $self->enter_link;
2281 2460
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
2464
2282 (async { 2465 (async {
2283 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
2284 unless (eval { 2467 unless (eval {
2285 $self->goto ($slaying, $hp, $sp); 2468 $self->goto ($slaying, $hp, $sp);
2286 2469
… …
2313 2496
2314 utf8::encode $text; 2497 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 2499}
2317 2500
2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2502
2503Send a drawinfo or msg packet to the client, formatting the msg for the
2504client if neccessary. C<$type> should be a string identifying the type of
2505the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet.
2507
2508=cut
2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2525sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_;
2527
2528 $msg = $self->pl->expand_cfpod ($msg);
2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel);
2540 }
2541
2542 $channel = $channel->{id};
2543 }
2544
2545 return unless @extra || length $msg;
2546
2547 if ($self->can_msg) {
2548 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF;
2551
2552 $self->send_packet ("msg " . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2554 } else {
2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565
2566 $color &= cf::NDI_COLOR_MASK;
2567
2568 utf8::encode $msg;
2569
2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2573 } else {
2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2575 $self->send_packet ("drawinfo $color $msg")
2576 }
2577 }
2578 }
2579}
2580
2318=item $client->ext_event ($type, %msg) 2581=item $client->ext_msg ($type, @msg)
2319 2582
2320Sends an exti event to the client. 2583Sends an ext event to the client.
2321 2584
2322=cut 2585=cut
2323 2586
2324sub cf::client::ext_event($$%) { 2587sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2588 my ($self, $type, @msg) = @_;
2326 2589
2590 if ($self->extcmd == 2) {
2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2593 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 }
2596}
2597
2598=item $client->ext_reply ($msgid, @msg)
2599
2600Sends an ext reply to the client.
2601
2602=cut
2603
2604sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_;
2606
2607 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id;
2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2613 }
2329} 2614}
2330 2615
2331=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
2332 2617
2333Queues a query to the client, calling the given callback with 2618Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2619the 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>. 2620C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2621
2337Queries can fail, so check the return code. Or don't, as queries will become 2622Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2623become reliable at some point in the future.
2339 2624
2340=cut 2625=cut
2341 2626
2342sub cf::client::query { 2627sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2628 my ($self, $flags, $text, $cb) = @_;
… …
2351 utf8::encode $text; 2636 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2637 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2638
2354 $self->send_packet ($self->{query_queue}[0][0]) 2639 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2640 if @{ $self->{query_queue} } == 1;
2641
2642 1
2356} 2643}
2357 2644
2358cf::client->attach ( 2645cf::client->attach (
2646 on_connect => sub {
2647 my ($ns) = @_;
2648
2649 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2650 },
2359 on_reply => sub { 2651 on_reply => sub {
2360 my ($ns, $msg) = @_; 2652 my ($ns, $msg) = @_;
2361 2653
2362 # this weird shuffling is so that direct followup queries 2654 # this weird shuffling is so that direct followup queries
2363 # get handled first 2655 # get handled first
… …
2375 } else { 2667 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2668 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2669 }
2378 } 2670 }
2379 }, 2671 },
2672 on_exticmd => sub {
2673 my ($ns, $buf) = @_;
2674
2675 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2676
2677 if (ref $msg) {
2678 my ($type, $reply, @payload) =
2679 "ARRAY" eq ref $msg
2680 ? @$msg
2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2682
2683 my @reply;
2684
2685 if (my $cb = $EXTICMD{$type}) {
2686 @reply = $cb->($ns, @payload);
2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2692 } else {
2693 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2694 }
2695
2696 cf::override;
2697 },
2380); 2698);
2381 2699
2382=item $client->async (\&cb) 2700=item $client->async (\&cb)
2383 2701
2384Create a new coroutine, running the specified callback. The coroutine will 2702Create a new coroutine, running the specified callback. The coroutine will
… …
2425our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
2427 2745
2428$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
2429 2747
2430$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2748$safe->permit_only (Opcode::opset qw(
2749 :base_core :base_mem :base_orig :base_math
2750 grepstart grepwhile mapstart mapwhile
2751 sort time
2752));
2431 2753
2432# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
2433 2755
2434=pod 2756=pod
2435 2757
2436The following functions and methods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2437 2759
2438 cf::object contr pay_amount pay_player map 2760 cf::object
2761 contr pay_amount pay_player map x y force_find force_add
2762 insert remove name archname title slaying race decrease_ob_nr
2763
2439 cf::object::player player 2764 cf::object::player
2440 cf::player peaceful 2765 player
2441 cf::map trigger 2766
2767 cf::player
2768 peaceful
2769
2770 cf::map
2771 trigger
2442 2772
2443=cut 2773=cut
2444 2774
2445for ( 2775for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race
2778 decrease_ob_nr)],
2447 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2450) { 2782) {
2451 no strict 'refs'; 2783 no strict 'refs';
… …
2527# the server's init and main functions 2859# the server's init and main functions
2528 2860
2529sub load_facedata($) { 2861sub load_facedata($) {
2530 my ($path) = @_; 2862 my ($path) = @_;
2531 2863
2864 # HACK to clear player env face cache, we need some signal framework
2865 # for this (global event?)
2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2867
2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2869
2532 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2533 2871
2534 my $facedata; 2872 my $facedata;
2535 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 2874 or die "$path: $!";
… …
2538 $facedata = Coro::Storable::thaw $facedata; 2876 $facedata = Coro::Storable::thaw $facedata;
2539 2877
2540 $facedata->{version} == 2 2878 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 2879 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 2880
2881 # patch in the exptable
2882 $facedata->{resource}{"res/exp_table"} = {
2883 type => FT_RSRC,
2884 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2885 };
2886 cf::cede_to_tick;
2887
2543 { 2888 {
2544 my $faces = $facedata->{faceinfo}; 2889 my $faces = $facedata->{faceinfo};
2545 2890
2546 while (my ($face, $info) = each %$faces) { 2891 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2893 cf::face::set_visibility $idx, $info->{visibility};
2894 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 2897
2898 cf::cede_to_tick;
2552 } 2899 }
2553 2900
2554 while (my ($face, $info) = each %$faces) { 2901 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 2902 next unless $info->{smooth};
2556 my $idx = cf::face::find $face 2903 my $idx = cf::face::find $face
2557 or next; 2904 or next;
2558 if (my $smooth = cf::face::find $info->{smooth}) { 2905 if (my $smooth = cf::face::find $info->{smooth}) {
2906 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2907 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 2908 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2909 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 2910 }
2563 Coro::cede; 2911
2912 cf::cede_to_tick;
2564 } 2913 }
2565 } 2914 }
2566 2915
2567 { 2916 {
2568 my $anims = $facedata->{animinfo}; 2917 my $anims = $facedata->{animinfo};
2569 2918
2570 while (my ($anim, $info) = each %$anims) { 2919 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2920 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 2921 cf::cede_to_tick;
2573 } 2922 }
2574 2923
2575 cf::anim::invalidate_all; # d'oh 2924 cf::anim::invalidate_all; # d'oh
2576 } 2925 }
2577 2926
2927 {
2928 # TODO: for gcfclient pleasure, we should give resources
2929 # that gcfclient doesn't grok a >10000 face index.
2930 my $res = $facedata->{resource};
2931
2932 my $soundconf = delete $res->{"res/sound.conf"};
2933
2934 while (my ($name, $info) = each %$res) {
2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2937
2938 if ($info->{type} & 1) {
2939 # prepend meta info
2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2946 $data = pack "(w/a*)*", $meta, $info->{data};
2947 } else {
2948 $data = $info->{data};
2949 }
2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2954 cf::cede_to_tick;
2955 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2974 }
2975
2578 1 2976 1
2579} 2977}
2580 2978
2979register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_;
2981
2982 while (my ($k, $v) = each %$want) {
2983 $ns->fx_want ($k, $v);
2984 }
2985};
2986
2581sub reload_regions { 2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2582 load_resource_file "$MAPDIR/regions" 2992 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 2993 or die "unable to load regions file\n";
2994
2995 for (cf::region::list) {
2996 $_->{match} = qr/$_->{match}/
2997 if exists $_->{match};
2998 }
2584} 2999}
2585 3000
2586sub reload_facedata { 3001sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3002 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3003 or die "unable to load facedata\n";
2589} 3004}
2590 3005
2591sub reload_archetypes { 3006sub reload_archetypes {
3007 load_resource_file "$DATADIR/archetypes"
3008 or die "unable to load archetypes\n";
3009 #d# NEED to laod twice to resolve forward references
3010 # this really needs to be done in an extra post-pass
3011 # (which needs to be synchronous, so solve it differently)
2592 load_resource_file "$DATADIR/archetypes" 3012 load_resource_file "$DATADIR/archetypes"
2593 or die "unable to load archetypes\n"; 3013 or die "unable to load archetypes\n";
2594} 3014}
2595 3015
2596sub reload_treasures { 3016sub reload_treasures {
… …
2612 3032
2613sub init { 3033sub init {
2614 reload_resources; 3034 reload_resources;
2615} 3035}
2616 3036
2617sub cfg_load { 3037sub reload_config {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3039 or return;
2620 3040
2621 local $/; 3041 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
… …
2642 (async { 3062 (async {
2643 Event::one_event; 3063 Event::one_event;
2644 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
2645 }; 3065 };
2646 3066
2647 cfg_load; 3067 reload_config;
2648 db_init; 3068 db_init;
2649 load_extensions; 3069 load_extensions;
2650 3070
2651 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
2652 Event::loop; 3072 Event::loop;
… …
2790 %EXT_CORO = (); 3210 %EXT_CORO = ();
2791 3211
2792 warn "removing commands"; 3212 warn "removing commands";
2793 %COMMAND = (); 3213 %COMMAND = ();
2794 3214
2795 warn "removing ext commands"; 3215 warn "removing ext/exti commands";
2796 %EXTCMD = (); 3216 %EXTCMD = ();
3217 %EXTICMD = ();
2797 3218
2798 warn "unloading/nuking all extensions"; 3219 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) { 3220 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg"; 3221 warn "... unloading $pkg";
2801 3222
… …
2844 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
2845 require cf; 3266 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3268
2848 warn "loading config and database again"; 3269 warn "loading config and database again";
2849 cf::cfg_load; 3270 cf::reload_config;
2850 3271
2851 warn "loading extensions"; 3272 warn "loading extensions";
2852 cf::load_extensions; 3273 cf::load_extensions;
2853 3274
2854 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";

Diff Legend

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