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.286 by root, Sun Jun 24 04:27:20 2007 UTC vs.
Revision 1.350 by root, Sat Sep 1 08:03:45 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
… …
1372 # replace G<male|female> tags 1477 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1478 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1 1479 $self->gender ? $2 : $1
1375 }ge 1480 }ge
1376 # replace H<hint text> 1481 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 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;
1378 1489
1379 # create single paragraphs (very hackish) 1490 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1491 s/(?<=\S)\n(?=\w)/ /g;
1381 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
1382 $_ 1499 $_
1383} 1500}
1384 1501
1502sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode}
1505}
1506
1385=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1386 1508
1387Sends an ext reply to the player. 1509Sends an ext reply to the player.
1388 1510
1389=cut 1511=cut
1390 1512
1391sub ext_reply($$%) { 1513sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1393 1515
1394 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1517}
1398 1518
1399=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1400 1520
1401Sends an ext event to the client. 1521Sends an ext event to the client.
1402 1522
1403=cut 1523=cut
1404 1524
1405sub ext_event($$%) { 1525sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1407 1527
1408 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1409} 1529}
1410 1530
1411=head3 cf::region 1531=head3 cf::region
1412 1532
1413=over 4 1533=over 4
… …
1426 my ($path) = @_; 1546 my ($path) = @_;
1427 1547
1428 my ($match, $specificity); 1548 my ($match, $specificity);
1429 1549
1430 for my $region (list) { 1550 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1434 } 1554 }
1435 } 1555 }
1436 1556
… …
1556 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1557 return $self; 1677 return $self;
1558 } 1678 }
1559 } 1679 }
1560 1680
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1682 ()
1563} 1683}
1564 1684
1565sub init { 1685sub init {
1566 my ($self) = @_; 1686 my ($self) = @_;
… …
1732 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1733 1853
1734 my $path = $self->{path}; 1854 my $path = $self->{path};
1735 1855
1736 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1737 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1738 1859
1739 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1740 1861
1741 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1742 1863
1743 $self->alloc; 1864 $self->alloc;
1744 1865
1745 $self->pre_load; 1866 $self->pre_load;
1746 Coro::cede; 1867 cf::cede_to_tick;
1747 1868
1748 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1749 or return; 1870 or return;
1750 1871
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1757 $self->clear_unique_items; 1878 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1759 } 1880 }
1760 } 1881 }
1761 1882
1762 Coro::cede; 1883 cf::cede_to_tick;
1763 # now do the right thing for maps 1884 # now do the right thing for maps
1764 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 1887 unless $self->difficulty;
1767 Coro::cede; 1888 cf::cede_to_tick;
1768 1889
1769 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 1891 $self->decay_objects;
1771 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1772 $self->update_buttons; 1893 $self->update_buttons;
1773 Coro::cede; 1894 cf::cede_to_tick;
1774 $self->set_darkness_map; 1895 $self->set_darkness_map;
1775 Coro::cede; 1896 cf::cede_to_tick;
1776 $self->activate; 1897 $self->activate;
1777 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1778 1902
1779 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1780 } 1904 }
1781 1905
1782 $self->post_load; 1906 $self->post_load;
… …
1793 1917
1794 $self 1918 $self
1795} 1919}
1796 1920
1797# 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
1798sub load_diag { 1922sub load_neighbours {
1799 my ($map) = @_; 1923 my ($map) = @_;
1800 1924
1801 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1802 1926
1803 for (0 .. 3) { 1927 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1805 or next; 1929 or next;
1806 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1807 or next; 1931 or next;
1808 $neigh->load; 1932 $neigh->load;
1809 1933
1934 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 1937 }
1813 1938
1814 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1816 or next; 1942 or next;
1817 $neigh->load; 1943 $neigh->load;
1818 } 1944 }
1819} 1945}
1820 1946
… …
1825} 1951}
1826 1952
1827sub do_load_sync { 1953sub do_load_sync {
1828 my ($map) = @_; 1954 my ($map) = @_;
1829 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1830 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1831} 1960}
1832 1961
1833our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1835 1964
1836sub find_async { 1965sub find_async {
1837 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1838 1967
1839 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1840 1969
1841 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843 } 1972 }
1844 1973
1845 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1846 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1847 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 1979 if (my $map = find $k) {
1850 or next;
1851 $map->load; 1980 $map->load if $v;
1981 }
1852 1982
1853 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1854 } 1984 }
1855 } 1985 }
1856 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1857 }; 1987 };
1858 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1861} 1991}
1862 1992
1863sub save { 1993sub save {
1864 my ($self) = @_; 1994 my ($self) = @_;
1865 1995
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 1997
1868 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1869 1999
1870 return unless $self->dirty; 2000 return unless $self->dirty;
1871 2001
… …
1894 my ($self) = @_; 2024 my ($self) = @_;
1895 2025
1896 # save first because save cedes 2026 # save first because save cedes
1897 $self->save; 2027 $self->save;
1898 2028
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2030
1901 return if $self->players; 2031 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1903 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1904 2034
… …
1956my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
1957 2087
1958sub nuke { 2088sub nuke {
1959 my ($self) = @_; 2089 my ($self) = @_;
1960 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
1961 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
1962 2095
1963 $self->unlink_save;
1964
1965 bless $self, "cf::map"; 2096 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2101
2102 $self->unlink_save;
2103
1971 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
1972 2106
1973 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
1974} 2108}
1975 2109
1976=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2083 2217
2084 } else { 2218 } else {
2085 my $pl = $self->contr; 2219 my $pl = $self->contr;
2086 2220
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2221 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2222 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2223 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2224
2096 } else { 2225 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2226 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2099 } 2228 }
2100 } 2229 }
2230}
2231
2232=item $object->send_msg ($channel, $msg, $color, [extra...])
2233
2234=cut
2235
2236sub cf::object::send_msg {
2237 my $pl = shift->contr
2238 or return;
2239 $pl->send_msg (@_);
2101} 2240}
2102 2241
2103=item $player_object->may ("access") 2242=item $player_object->may ("access")
2104 2243
2105Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
… …
2184 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2187 2326
2188 $map->load; 2327 $map->load;
2189 $map->load_diag; 2328 $map->load_neighbours;
2190 2329
2191 return unless $self->contr->active; 2330 return unless $self->contr->active;
2192 $self->activate_recursive; 2331 $self->activate_recursive;
2193 2332
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2334 $self->enter_map ($map, $x, $y);
2196} 2335}
2197 2336
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2337=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2338
2200Moves the player to the given map-path and coordinates by first freezing 2339Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2340her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2341that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2342the new (success) or old (failed) map position. In either case, $done will
2343be called at the end of this process.
2204 2344
2205=cut 2345=cut
2206 2346
2207our $GOTOGEN; 2347our $GOTOGEN;
2208 2348
2209sub cf::object::player::goto { 2349sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2350 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2351
2212 # do generation counting so two concurrent goto's will be executed in-order 2352 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2354
2215 $self->enter_link; 2355 $self->enter_link;
… …
2235 2375
2236 if ($gen == $self->{_goto_generation}) { 2376 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2377 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2378 $self->leave_link ($map, $x, $y);
2239 } 2379 }
2380
2381 $done->() if $done;
2240 })->prio (1); 2382 })->prio (1);
2241} 2383}
2242 2384
2243=item $player_object->enter_exit ($exit_object) 2385=item $player_object->enter_exit ($exit_object)
2244 2386
… …
2313 my $hp = $exit->stats->hp; 2455 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2456 my $sp = $exit->stats->sp;
2315 2457
2316 $self->enter_link; 2458 $self->enter_link;
2317 2459
2460 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED);
2463
2318 (async { 2464 (async {
2319 $self->deactivate_recursive; # just to be sure 2465 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2466 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2467 $self->goto ($slaying, $hp, $sp);
2322 2468
… …
2349 2495
2350 utf8::encode $text; 2496 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2497 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2498}
2353 2499
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2500=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2501
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2502Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2503client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2504the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2360 2506
2361=cut 2507=cut
2362 2508
2509our %CHANNEL = (
2510 "c/identify" => {
2511 id => "identify",
2512 title => "Identify",
2513 reply => undef,
2514 tooltip => "Items recently identified",
2515 },
2516);
2517
2363sub cf::client::send_msg { 2518sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2519 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2520
2366 $msg = $self->pl->expand_cfpod ($msg); 2521 $msg = $self->pl->expand_cfpod ($msg);
2367 2522
2523 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524
2525 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2527
2528 if (ref $channel) {
2529 # send meta info to client, if not yet sent
2530 unless (exists $self->{channel}{$channel->{id}}) {
2531 $self->{channel}{$channel->{id}} = $channel;
2532 $self->ext_msg (channel_info => $channel);
2533 }
2534
2535 $channel = $channel->{id};
2536 }
2537
2538 return unless @extra || length $msg;
2539
2368 if ($self->can_msg) { 2540 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2541 # default colour, mask it out
2542 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2543 if $color & cf::NDI_DEF;
2544
2545 $self->send_packet ("msg " . $self->{json_coder}->encode (
2546 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370 } else { 2547 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2548 if ($color >= 0) {
2549 # replace some tags by gcfclient-compatible ones
2550 for ($msg) {
2551 1 while
2552 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2553 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2554 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2555 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2556 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2557 }
2558
2559 $color &= cf::NDI_COLOR_MASK;
2560
2561 utf8::encode $msg;
2562
2382 if (0 && $msg =~ /\[/) { 2563 if (0 && $msg =~ /\[/) {
2564 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2565 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2566 } else {
2385 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2567 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2568 $self->send_packet ("drawinfo $color $msg")
2387 } 2569 }
2388 } 2570 }
2389 } 2571 }
2390} 2572}
2391 2573
2392=item $client->ext_event ($type, %msg) 2574=item $client->ext_msg ($type, @msg)
2393 2575
2394Sends an exti event to the client. 2576Sends an ext event to the client.
2395 2577
2396=cut 2578=cut
2397 2579
2398sub cf::client::ext_event($$%) { 2580sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 2581 my ($self, $type, @msg) = @_;
2400 2582
2583 if ($self->extcmd == 2) {
2584 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2585 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 2586 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 }
2589}
2590
2591=item $client->ext_reply ($msgid, @msg)
2592
2593Sends an ext reply to the client.
2594
2595=cut
2596
2597sub cf::client::ext_reply($$@) {
2598 my ($self, $id, @msg) = @_;
2599
2600 if ($self->extcmd == 2) {
2601 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2602 } elsif ($self->extcmd == 1) {
2603 #TODO: version 1, remove
2604 unshift @msg, msgtype => "reply", msgid => $id;
2605 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2606 }
2403} 2607}
2404 2608
2405=item $success = $client->query ($flags, "text", \&cb) 2609=item $success = $client->query ($flags, "text", \&cb)
2406 2610
2407Queues a query to the client, calling the given callback with 2611Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2612the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2613C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2614
2411Queries can fail, so check the return code. Or don't, as queries will become 2615Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2616become reliable at some point in the future.
2413 2617
2414=cut 2618=cut
2415 2619
2416sub cf::client::query { 2620sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2621 my ($self, $flags, $text, $cb) = @_;
… …
2425 utf8::encode $text; 2629 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2630 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2631
2428 $self->send_packet ($self->{query_queue}[0][0]) 2632 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2633 if @{ $self->{query_queue} } == 1;
2634
2635 1
2430} 2636}
2431 2637
2432cf::client->attach ( 2638cf::client->attach (
2639 on_connect => sub {
2640 my ($ns) = @_;
2641
2642 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2643 },
2433 on_reply => sub { 2644 on_reply => sub {
2434 my ($ns, $msg) = @_; 2645 my ($ns, $msg) = @_;
2435 2646
2436 # this weird shuffling is so that direct followup queries 2647 # this weird shuffling is so that direct followup queries
2437 # get handled first 2648 # get handled first
… …
2449 } else { 2660 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2661 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2662 }
2452 } 2663 }
2453 }, 2664 },
2665 on_exticmd => sub {
2666 my ($ns, $buf) = @_;
2667
2668 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2669
2670 if (ref $msg) {
2671 my ($type, $reply, @payload) =
2672 "ARRAY" eq ref $msg
2673 ? @$msg
2674 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2675
2676 my @reply;
2677
2678 if (my $cb = $EXTICMD{$type}) {
2679 @reply = $cb->($ns, @payload);
2680 }
2681
2682 $ns->ext_reply ($reply, @reply)
2683 if $reply;
2684
2685 } else {
2686 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2687 }
2688
2689 cf::override;
2690 },
2454); 2691);
2455 2692
2456=item $client->async (\&cb) 2693=item $client->async (\&cb)
2457 2694
2458Create a new coroutine, running the specified callback. The coroutine will 2695Create a new coroutine, running the specified callback. The coroutine will
… …
2499our $safe = new Safe "safe"; 2736our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 2737our $safe_hole = new Safe::Hole;
2501 2738
2502$SIG{FPE} = 'IGNORE'; 2739$SIG{FPE} = 'IGNORE';
2503 2740
2504$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2741$safe->permit_only (Opcode::opset qw(
2742 :base_core :base_mem :base_orig :base_math
2743 grepstart grepwhile mapstart mapwhile
2744 sort time
2745));
2505 2746
2506# here we export the classes and methods available to script code 2747# here we export the classes and methods available to script code
2507 2748
2508=pod 2749=pod
2509 2750
2510The following functions and methods are available within a safe environment: 2751The following functions and methods are available within a safe environment:
2511 2752
2512 cf::object contr pay_amount pay_player map 2753 cf::object
2754 contr pay_amount pay_player map x y force_find force_add
2755 insert remove name archname title slaying race decrease_ob_nr
2756
2513 cf::object::player player 2757 cf::object::player
2514 cf::player peaceful 2758 player
2515 cf::map trigger 2759
2760 cf::player
2761 peaceful
2762
2763 cf::map
2764 trigger
2516 2765
2517=cut 2766=cut
2518 2767
2519for ( 2768for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 2769 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2770 insert remove inv name archname title slaying race
2771 decrease_ob_nr)],
2521 ["cf::object::player" => qw(player)], 2772 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 2773 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 2774 ["cf::map" => qw(trigger)],
2524) { 2775) {
2525 no strict 'refs'; 2776 no strict 'refs';
… …
2601# the server's init and main functions 2852# the server's init and main functions
2602 2853
2603sub load_facedata($) { 2854sub load_facedata($) {
2604 my ($path) = @_; 2855 my ($path) = @_;
2605 2856
2857 # HACK to clear player env face cache, we need some signal framework
2858 # for this (global event?)
2859 %ext::player_env::MUSIC_FACE_CACHE = ();
2860
2861 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2862
2606 warn "loading facedata from $path\n"; 2863 warn "loading facedata from $path\n";
2607 2864
2608 my $facedata; 2865 my $facedata;
2609 0 < aio_load $path, $facedata 2866 0 < aio_load $path, $facedata
2610 or die "$path: $!"; 2867 or die "$path: $!";
… …
2612 $facedata = Coro::Storable::thaw $facedata; 2869 $facedata = Coro::Storable::thaw $facedata;
2613 2870
2614 $facedata->{version} == 2 2871 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 2872 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 2873
2874 # patch in the exptable
2875 $facedata->{resource}{"res/exp_table"} = {
2876 type => FT_RSRC,
2877 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2878 };
2879 cf::cede_to_tick;
2880
2617 { 2881 {
2618 my $faces = $facedata->{faceinfo}; 2882 my $faces = $facedata->{faceinfo};
2619 2883
2620 while (my ($face, $info) = each %$faces) { 2884 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2885 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2886 cf::face::set_visibility $idx, $info->{visibility};
2887 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2888 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2889 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625 Coro::cede; 2890
2891 cf::cede_to_tick;
2626 } 2892 }
2627 2893
2628 while (my ($face, $info) = each %$faces) { 2894 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 2895 next unless $info->{smooth};
2630 my $idx = cf::face::find $face 2896 my $idx = cf::face::find $face
2631 or next; 2897 or next;
2632 if (my $smooth = cf::face::find $info->{smooth}) { 2898 if (my $smooth = cf::face::find $info->{smooth}) {
2899 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2900 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 2901 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2902 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 2903 }
2637 Coro::cede; 2904
2905 cf::cede_to_tick;
2638 } 2906 }
2639 } 2907 }
2640 2908
2641 { 2909 {
2642 my $anims = $facedata->{animinfo}; 2910 my $anims = $facedata->{animinfo};
2643 2911
2644 while (my ($anim, $info) = each %$anims) { 2912 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2913 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 2914 cf::cede_to_tick;
2647 } 2915 }
2648 2916
2649 cf::anim::invalidate_all; # d'oh 2917 cf::anim::invalidate_all; # d'oh
2650 } 2918 }
2651 2919
2920 {
2921 # TODO: for gcfclient pleasure, we should give resources
2922 # that gcfclient doesn't grok a >10000 face index.
2923 my $res = $facedata->{resource};
2924
2925 my $soundconf = delete $res->{"res/sound.conf"};
2926
2927 while (my ($name, $info) = each %$res) {
2928 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2929 my $data;
2930
2931 if ($info->{type} & 1) {
2932 # prepend meta info
2933
2934 my $meta = $enc->encode ({
2935 name => $name,
2936 %{ $info->{meta} || {} },
2937 });
2938
2939 $data = pack "(w/a*)*", $meta, $info->{data};
2940 } else {
2941 $data = $info->{data};
2942 }
2943
2944 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2945 cf::face::set_type $idx, $info->{type};
2946
2947 cf::cede_to_tick;
2948 }
2949
2950 if ($soundconf) {
2951 $soundconf = $enc->decode (delete $soundconf->{data});
2952
2953 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2954 my $sound = $soundconf->{compat}[$_]
2955 or next;
2956
2957 my $face = cf::face::find "sound/$sound->[1]";
2958 cf::sound::set $sound->[0] => $face;
2959 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2960 }
2961
2962 while (my ($k, $v) = each %{$soundconf->{event}}) {
2963 my $face = cf::face::find "sound/$v";
2964 cf::sound::set $k => $face;
2965 }
2966 }
2967 }
2968
2652 1 2969 1
2653} 2970}
2654 2971
2972register_exticmd fx_want => sub {
2973 my ($ns, $want) = @_;
2974
2975 while (my ($k, $v) = each %$want) {
2976 $ns->fx_want ($k, $v);
2977 }
2978};
2979
2655sub reload_regions { 2980sub reload_regions {
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2656 load_resource_file "$MAPDIR/regions" 2985 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 2986 or die "unable to load regions file\n";
2987
2988 for (cf::region::list) {
2989 $_->{match} = qr/$_->{match}/
2990 if exists $_->{match};
2991 }
2658} 2992}
2659 2993
2660sub reload_facedata { 2994sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 2995 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 2996 or die "unable to load facedata\n";
2663} 2997}
2664 2998
2665sub reload_archetypes { 2999sub reload_archetypes {
3000 load_resource_file "$DATADIR/archetypes"
3001 or die "unable to load archetypes\n";
3002 #d# NEED to laod twice to resolve forward references
3003 # this really needs to be done in an extra post-pass
3004 # (which needs to be synchronous, so solve it differently)
2666 load_resource_file "$DATADIR/archetypes" 3005 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n"; 3006 or die "unable to load archetypes\n";
2668} 3007}
2669 3008
2670sub reload_treasures { 3009sub reload_treasures {
… …
2686 3025
2687sub init { 3026sub init {
2688 reload_resources; 3027 reload_resources;
2689} 3028}
2690 3029
2691sub cfg_load { 3030sub reload_config {
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3031 open my $fh, "<:utf8", "$CONFDIR/config"
2693 or return; 3032 or return;
2694 3033
2695 local $/; 3034 local $/;
2696 *CFG = YAML::Syck::Load <$fh>; 3035 *CFG = YAML::Syck::Load <$fh>;
… …
2716 (async { 3055 (async {
2717 Event::one_event; 3056 Event::one_event;
2718 })->prio (Coro::PRIO_MAX); 3057 })->prio (Coro::PRIO_MAX);
2719 }; 3058 };
2720 3059
2721 cfg_load; 3060 reload_config;
2722 db_init; 3061 db_init;
2723 load_extensions; 3062 load_extensions;
2724 3063
2725 $TICK_WATCHER->start; 3064 $TICK_WATCHER->start;
2726 Event::loop; 3065 Event::loop;
… …
2864 %EXT_CORO = (); 3203 %EXT_CORO = ();
2865 3204
2866 warn "removing commands"; 3205 warn "removing commands";
2867 %COMMAND = (); 3206 %COMMAND = ();
2868 3207
2869 warn "removing ext commands"; 3208 warn "removing ext/exti commands";
2870 %EXTCMD = (); 3209 %EXTCMD = ();
3210 %EXTICMD = ();
2871 3211
2872 warn "unloading/nuking all extensions"; 3212 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3213 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3214 warn "... unloading $pkg";
2875 3215
… …
2918 warn "reloading cf.pm"; 3258 warn "reloading cf.pm";
2919 require cf; 3259 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3260 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921 3261
2922 warn "loading config and database again"; 3262 warn "loading config and database again";
2923 cf::cfg_load; 3263 cf::reload_config;
2924 3264
2925 warn "loading extensions"; 3265 warn "loading extensions";
2926 cf::load_extensions; 3266 cf::load_extensions;
2927 3267
2928 warn "reattaching attachments to objects/players"; 3268 warn "reattaching attachments to objects/players";

Diff Legend

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