… | |
… | |
10 | use Event; |
10 | use Event; |
11 | use Opcode; |
11 | use Opcode; |
12 | use Safe; |
12 | use Safe; |
13 | use Safe::Hole; |
13 | use Safe::Hole; |
14 | |
14 | |
15 | use Coro 3.61 (); |
15 | use Coro 3.64 (); |
16 | use Coro::State; |
16 | use Coro::State; |
17 | use Coro::Handle; |
17 | use Coro::Handle; |
18 | use Coro::Event; |
18 | use Coro::Event; |
19 | use Coro::Timer; |
19 | use Coro::Timer; |
20 | use Coro::Signal; |
20 | use Coro::Signal; |
21 | use Coro::Semaphore; |
21 | use Coro::Semaphore; |
22 | use Coro::AIO; |
22 | use Coro::AIO; |
23 | use Coro::Storable; |
23 | use Coro::Storable; |
|
|
24 | use Coro::Util (); |
24 | |
25 | |
|
|
26 | use JSON::XS (); |
25 | use BDB (); |
27 | use BDB (); |
26 | use Data::Dumper; |
28 | use Data::Dumper; |
27 | use Digest::MD5; |
29 | use Digest::MD5; |
28 | use Fcntl; |
30 | use Fcntl; |
29 | use YAML::Syck (); |
31 | use YAML::Syck (); |
30 | use IO::AIO 2.32 (); |
32 | use IO::AIO 2.32 (); |
31 | use Time::HiRes; |
33 | use Time::HiRes; |
32 | use Compress::LZF; |
34 | use Compress::LZF; |
|
|
35 | use 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 |
37 | Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator |
40 | Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator |
… | |
… | |
49 | our %COMMAND = (); |
52 | our %COMMAND = (); |
50 | our %COMMAND_TIME = (); |
53 | our %COMMAND_TIME = (); |
51 | |
54 | |
52 | our @EXTS = (); # list of extension package names |
55 | our @EXTS = (); # list of extension package names |
53 | our %EXTCMD = (); |
56 | our %EXTCMD = (); |
|
|
57 | our %EXTICMD = (); |
54 | our %EXT_CORO = (); # coroutines bound to extensions |
58 | our %EXT_CORO = (); # coroutines bound to extensions |
55 | our %EXT_MAP = (); # pluggable maps |
59 | our %EXT_MAP = (); # pluggable maps |
56 | |
60 | |
57 | our $RELOAD; # number of reloads so far |
61 | our $RELOAD; # number of reloads so far |
58 | our @EVENT; |
62 | our @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 | |
165 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
169 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
166 | returns directly I<after> the tick processing (and consequently, can only wake one process |
170 | returns directly I<after> the tick processing (and consequently, can only wake one process |
167 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
171 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
|
|
172 | |
|
|
173 | =item @cf::INVOKE_RESULTS |
|
|
174 | |
|
|
175 | This array contains the results of the last C<invoke ()> call. When |
|
|
176 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
|
|
177 | that 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 | |
241 | use 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 | |
245 | Converts a JSON string into the corresponding perl data structure. |
253 | Converts 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 | |
249 | Converts a perl data structure into its JSON representation. |
257 | Converts a perl data structure into its JSON representation. |
|
|
258 | |
|
|
259 | =cut |
|
|
260 | |
|
|
261 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
|
|
262 | |
|
|
263 | sub to_json ($) { $json_coder->encode ($_[0]) } |
|
|
264 | sub from_json ($) { $json_coder->decode ($_[0]) } |
250 | |
265 | |
251 | =item cf::lock_wait $string |
266 | =item cf::lock_wait $string |
252 | |
267 | |
253 | Wait until the given lock is available. See cf::lock_acquire. |
268 | Wait until the given lock is available. See cf::lock_acquire. |
254 | |
269 | |
… | |
… | |
256 | |
271 | |
257 | Wait until the given lock is available and then acquires it and returns |
272 | Wait until the given lock is available and then acquires it and returns |
258 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
259 | for example when the coroutine gets canceled), the lock is automatically |
274 | for example when the coroutine gets canceled), the lock is automatically |
260 | returned. |
275 | returned. |
|
|
276 | |
|
|
277 | Locks are *not* recursive, locking from the same coro twice results in a |
|
|
278 | deadlocked coro. |
261 | |
279 | |
262 | Lock names should begin with a unique identifier (for example, cf::map::find |
280 | Lock names should begin with a unique identifier (for example, cf::map::find |
263 | uses map_find and cf::map::load uses map_load). |
281 | uses 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 | |
|
|
333 | Allocate $time seconds of blocking CPU time at priority C<$priority>: |
|
|
334 | This call blocks and returns only when you have at least C<$time> seconds |
|
|
335 | of cpu time till the next tick. The slot is only valid till the next cede. |
|
|
336 | |
|
|
337 | The optional C<$name> can be used to identify the job to run. It might be |
|
|
338 | used for statistical purposes and should identify the same time-class. |
|
|
339 | |
|
|
340 | Useful for short background jobs. |
|
|
341 | |
|
|
342 | =cut |
|
|
343 | |
|
|
344 | our @SLOT_QUEUE; |
|
|
345 | our $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 | |
|
|
375 | sub 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 | |
315 | Currently the same as Coro::async_pool, meaning you cannot use |
389 | Currently the same as Coro::async_pool, meaning you cannot use |
… | |
… | |
405 | =cut |
479 | =cut |
406 | |
480 | |
407 | sub fork_call(&@) { |
481 | sub 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 (likely 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 | |
444 | Returns a single value from the environment database. |
498 | Returns 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 | |
844 | our $override; |
898 | our $override; |
845 | our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? |
899 | our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals? |
846 | |
900 | |
847 | sub override { |
901 | sub override { |
848 | $override = 1; |
902 | $override = 1; |
849 | @invoke_results = (); |
903 | @INVOKE_RESULTS = (@_); |
850 | } |
904 | } |
851 | |
905 | |
852 | sub do_invoke { |
906 | sub 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 | |
879 | Generate an object-specific event with the given arguments. |
933 | Generate an object-specific event with the given arguments. |
880 | |
934 | |
881 | This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be |
935 | This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be |
882 | removed in future versions), and there is no public API to access override |
936 | removed in future versions), and there is no public API to access override |
883 | results (if you must, access C<@cf::invoke_results> directly). |
937 | results (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 | |
|
|
947 | sub _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 | |
892 | sub reattach { |
957 | sub 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 | |
1034 | Register a callback fro execution when the client sends an extcmd packet. |
1099 | Register a callback for execution when the client sends an (synchronous) |
|
|
1100 | extcmd packet. Ext commands will be processed in the order they are |
|
|
1101 | received by the server, like other user commands. The first argument is |
|
|
1102 | the logged-in player. Ext commands can only be processed after a player |
|
|
1103 | has logged in successfully. |
1035 | |
1104 | |
1036 | If the callback returns something, it is sent back as if reply was being |
1105 | If the callback returns something, it is sent back as if reply was being |
1037 | called. |
1106 | called. |
1038 | |
1107 | |
|
|
1108 | =item cf::register_exticmd $name => \&callback($ns,$packet); |
|
|
1109 | |
|
|
1110 | Register a callback for execution when the client sends an (asynchronous) |
|
|
1111 | exticmd packet. Exti commands are processed by the server as soon as they |
|
|
1112 | are received, i.e. out of order w.r.t. other commands. The first argument |
|
|
1113 | is a client socket. Exti commands can be received anytime, even before |
|
|
1114 | log-in. |
|
|
1115 | |
|
|
1116 | If the callback returns something, it is sent back as if reply was being |
|
|
1117 | called. |
|
|
1118 | |
1039 | =cut |
1119 | =cut |
1040 | |
1120 | |
1041 | sub register_extcmd { |
1121 | sub register_extcmd { |
1042 | my ($name, $cb) = @_; |
1122 | my ($name, $cb) = @_; |
1043 | |
1123 | |
1044 | $EXTCMD{$name} = $cb; |
1124 | $EXTCMD{$name} = $cb; |
|
|
1125 | } |
|
|
1126 | |
|
|
1127 | sub register_exticmd { |
|
|
1128 | my ($name, $cb) = @_; |
|
|
1129 | |
|
|
1130 | $EXTICMD{$name} = $cb; |
1045 | } |
1131 | } |
1046 | |
1132 | |
1047 | cf::player->attach ( |
1133 | cf::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 | |
1238 | sub new($) { |
1333 | sub 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 | |
|
|
1350 | sub 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 | |
1253 | Nukes the player without looking back. If logged in, the connection will |
1358 | Nukes the player without looking back. If logged in, the connection will |
… | |
… | |
1308 | or return []; |
1413 | or return []; |
1309 | |
1414 | |
1310 | my @logins; |
1415 | my @logins; |
1311 | |
1416 | |
1312 | for my $login (@$dirs) { |
1417 | for my $login (@$dirs) { |
|
|
1418 | my $path = path $login; |
|
|
1419 | |
|
|
1420 | # a .pst is a dead give-away for a valid player |
|
|
1421 | unless (-e "$path.pst") { |
1313 | my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; |
1422 | my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; |
1314 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1423 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1315 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
1424 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
|
|
1425 | } |
1316 | |
1426 | |
1317 | utf8::decode $login; |
1427 | utf8::decode $login; |
1318 | push @logins, $login; |
1428 | push @logins, $login; |
1319 | } |
1429 | } |
1320 | |
1430 | |
… | |
… | |
1358 | sub expand_cfpod { |
1468 | sub expand_cfpod { |
1359 | ((my $self), (local $_)) = @_; |
1469 | ((my $self), (local $_)) = @_; |
1360 | |
1470 | |
1361 | # escape & and < |
1471 | # escape & and < |
1362 | s/&/&/g; |
1472 | s/&/&/g; |
1363 | s/(?<![BIUGH])</</g; |
1473 | s/(?<![BIUGHT])</</g; |
1364 | |
1474 | |
1365 | # this is buggy, it needs to properly take care of nested <'s |
1475 | # this is buggy, it needs to properly take care of nested <'s |
1366 | |
1476 | |
1367 | 1 while |
1477 | 1 while |
1368 | # replace B<>, I<>, U<> etc. |
1478 | # replace B<>, I<>, U<> etc. |
1369 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1479 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1370 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1480 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1371 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
1481 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
|
|
1482 | || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ |
1372 | # replace G<male|female> tags |
1483 | # replace G<male|female> tags |
1373 | || s{G<([^>|]*)\|([^>]*)>}{ |
1484 | || s{G<([^>|]*)\|([^>]*)>}{ |
1374 | $self->gender ? $2 : $1 |
1485 | $self->gender ? $2 : $1 |
1375 | }ge |
1486 | }ge |
1376 | # replace H<hint text> |
1487 | # replace H<hint text> |
1377 | || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; |
1488 | || s{H<([^\>]*)>} |
|
|
1489 | { |
|
|
1490 | ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", |
|
|
1491 | "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", |
|
|
1492 | "") |
|
|
1493 | [$self->{hintmode}] |
|
|
1494 | }ge; |
1378 | |
1495 | |
1379 | # create single paragraphs (very hackish) |
1496 | # create single paragraphs (very hackish) |
1380 | s/(?<=\S)\n(?=\w)/ /g; |
1497 | s/(?<=\S)\n(?=\w)/ /g; |
1381 | |
1498 | |
|
|
1499 | # compress some whitespace |
|
|
1500 | s/\s+\n/\n/g; # ws line-ends |
|
|
1501 | s/\n\n+/\n/g; # double lines |
|
|
1502 | s/^\n+//; # beginning lines |
|
|
1503 | s/\n+$//; # ending lines |
|
|
1504 | |
1382 | $_ |
1505 | $_ |
1383 | } |
1506 | } |
1384 | |
1507 | |
|
|
1508 | sub hintmode { |
|
|
1509 | $_[0]{hintmode} = $_[1] if @_ > 1; |
|
|
1510 | $_[0]{hintmode} |
|
|
1511 | } |
|
|
1512 | |
1385 | =item $player->ext_reply ($msgid, %msg) |
1513 | =item $player->ext_reply ($msgid, @msg) |
1386 | |
1514 | |
1387 | Sends an ext reply to the player. |
1515 | Sends an ext reply to the player. |
1388 | |
1516 | |
1389 | =cut |
1517 | =cut |
1390 | |
1518 | |
1391 | sub ext_reply($$%) { |
1519 | sub ext_reply($$@) { |
1392 | my ($self, $id, %msg) = @_; |
1520 | my ($self, $id, @msg) = @_; |
1393 | |
1521 | |
1394 | $msg{msgid} = $id; |
1522 | $self->ns->ext_reply ($id, @msg) |
1395 | |
|
|
1396 | $self->send ("ext " . cf::to_json \%msg); |
|
|
1397 | } |
1523 | } |
1398 | |
1524 | |
1399 | =item $player->ext_event ($type, %msg) |
1525 | =item $player->ext_msg ($type, @msg) |
1400 | |
1526 | |
1401 | Sends an ext event to the client. |
1527 | Sends an ext event to the client. |
1402 | |
1528 | |
1403 | =cut |
1529 | =cut |
1404 | |
1530 | |
1405 | sub ext_event($$%) { |
1531 | sub ext_msg($$@) { |
1406 | my ($self, $type, %msg) = @_; |
1532 | my ($self, $type, @msg) = @_; |
1407 | |
1533 | |
1408 | $self->ns->ext_event ($type, %msg); |
1534 | $self->ns->ext_msg ($type, @msg); |
1409 | } |
1535 | } |
1410 | |
1536 | |
1411 | =head3 cf::region |
1537 | =head3 cf::region |
1412 | |
1538 | |
1413 | =over 4 |
1539 | =over 4 |
… | |
… | |
1426 | my ($path) = @_; |
1552 | my ($path) = @_; |
1427 | |
1553 | |
1428 | my ($match, $specificity); |
1554 | my ($match, $specificity); |
1429 | |
1555 | |
1430 | for my $region (list) { |
1556 | for my $region (list) { |
1431 | if ($region->match && $path =~ $region->match) { |
1557 | if ($region->{match} && $path =~ $region->{match}) { |
1432 | ($match, $specificity) = ($region, $region->specificity) |
1558 | ($match, $specificity) = ($region, $region->specificity) |
1433 | if $region->specificity > $specificity; |
1559 | if $region->specificity > $specificity; |
1434 | } |
1560 | } |
1435 | } |
1561 | } |
1436 | |
1562 | |
… | |
… | |
1556 | $self->init; # pass $1 etc. |
1682 | $self->init; # pass $1 etc. |
1557 | return $self; |
1683 | return $self; |
1558 | } |
1684 | } |
1559 | } |
1685 | } |
1560 | |
1686 | |
1561 | Carp::carp "unable to resolve path '$path' (base '$base')."; |
1687 | Carp::cluck "unable to resolve path '$path' (base '$base')."; |
1562 | () |
1688 | () |
1563 | } |
1689 | } |
1564 | |
1690 | |
1565 | sub init { |
1691 | sub init { |
1566 | my ($self) = @_; |
1692 | my ($self) = @_; |
… | |
… | |
1732 | local $self->{deny_reset} = 1; # loading can take a long time |
1858 | local $self->{deny_reset} = 1; # loading can take a long time |
1733 | |
1859 | |
1734 | my $path = $self->{path}; |
1860 | my $path = $self->{path}; |
1735 | |
1861 | |
1736 | { |
1862 | { |
|
|
1863 | my $guard1 = cf::lock_acquire "map_data:$path"; |
1737 | my $guard = cf::lock_acquire "map_load:$path"; |
1864 | my $guard2 = cf::lock_acquire "map_load:$path"; |
1738 | |
1865 | |
1739 | return if $self->in_memory != cf::MAP_SWAPPED; |
1866 | return if $self->in_memory != cf::MAP_SWAPPED; |
1740 | |
1867 | |
1741 | $self->in_memory (cf::MAP_LOADING); |
1868 | $self->in_memory (cf::MAP_LOADING); |
1742 | |
1869 | |
1743 | $self->alloc; |
1870 | $self->alloc; |
1744 | |
1871 | |
1745 | $self->pre_load; |
1872 | $self->pre_load; |
1746 | Coro::cede; |
1873 | cf::cede_to_tick; |
1747 | |
1874 | |
1748 | $self->_load_objects ($self->{load_path}, 1) |
1875 | $self->_load_objects ($self->{load_path}, 1) |
1749 | or return; |
1876 | or return; |
1750 | |
1877 | |
1751 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1878 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
… | |
… | |
1757 | $self->clear_unique_items; |
1884 | $self->clear_unique_items; |
1758 | $self->_load_objects ($uniq, 0); |
1885 | $self->_load_objects ($uniq, 0); |
1759 | } |
1886 | } |
1760 | } |
1887 | } |
1761 | |
1888 | |
1762 | Coro::cede; |
1889 | cf::cede_to_tick; |
1763 | # now do the right thing for maps |
1890 | # now do the right thing for maps |
1764 | $self->link_multipart_objects; |
1891 | $self->link_multipart_objects; |
1765 | $self->difficulty ($self->estimate_difficulty) |
1892 | $self->difficulty ($self->estimate_difficulty) |
1766 | unless $self->difficulty; |
1893 | unless $self->difficulty; |
1767 | Coro::cede; |
1894 | cf::cede_to_tick; |
1768 | |
1895 | |
1769 | unless ($self->{deny_activate}) { |
1896 | unless ($self->{deny_activate}) { |
1770 | $self->decay_objects; |
1897 | $self->decay_objects; |
1771 | $self->fix_auto_apply; |
1898 | $self->fix_auto_apply; |
1772 | $self->update_buttons; |
1899 | $self->update_buttons; |
1773 | Coro::cede; |
1900 | cf::cede_to_tick; |
1774 | $self->set_darkness_map; |
1901 | $self->set_darkness_map; |
1775 | Coro::cede; |
1902 | cf::cede_to_tick; |
1776 | $self->activate; |
1903 | $self->activate; |
1777 | } |
1904 | } |
|
|
1905 | |
|
|
1906 | $self->{last_save} = $cf::RUNTIME; |
|
|
1907 | $self->last_access ($cf::RUNTIME); |
1778 | |
1908 | |
1779 | $self->in_memory (cf::MAP_IN_MEMORY); |
1909 | $self->in_memory (cf::MAP_IN_MEMORY); |
1780 | } |
1910 | } |
1781 | |
1911 | |
1782 | $self->post_load; |
1912 | $self->post_load; |
… | |
… | |
1793 | |
1923 | |
1794 | $self |
1924 | $self |
1795 | } |
1925 | } |
1796 | |
1926 | |
1797 | # find and load all maps in the 3x3 area around a map |
1927 | # find and load all maps in the 3x3 area around a map |
1798 | sub load_diag { |
1928 | sub load_neighbours { |
1799 | my ($map) = @_; |
1929 | my ($map) = @_; |
1800 | |
1930 | |
1801 | my @diag; # diagonal neighbours |
1931 | my @neigh; # diagonal neighbours |
1802 | |
1932 | |
1803 | for (0 .. 3) { |
1933 | for (0 .. 3) { |
1804 | my $neigh = $map->tile_path ($_) |
1934 | my $neigh = $map->tile_path ($_) |
1805 | or next; |
1935 | or next; |
1806 | $neigh = find $neigh, $map |
1936 | $neigh = find $neigh, $map |
1807 | or next; |
1937 | or next; |
1808 | $neigh->load; |
1938 | $neigh->load; |
1809 | |
1939 | |
|
|
1940 | push @neigh, |
1810 | push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], |
1941 | [$neigh->tile_path (($_ + 3) % 4), $neigh], |
1811 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
1942 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
1812 | } |
1943 | } |
1813 | |
1944 | |
1814 | for (@diag) { |
1945 | for (grep defined $_->[0], @neigh) { |
|
|
1946 | my ($path, $origin) = @$_; |
1815 | my $neigh = find @$_ |
1947 | my $neigh = find $path, $origin |
1816 | or next; |
1948 | or next; |
1817 | $neigh->load; |
1949 | $neigh->load; |
1818 | } |
1950 | } |
1819 | } |
1951 | } |
1820 | |
1952 | |
… | |
… | |
1825 | } |
1957 | } |
1826 | |
1958 | |
1827 | sub do_load_sync { |
1959 | sub do_load_sync { |
1828 | my ($map) = @_; |
1960 | my ($map) = @_; |
1829 | |
1961 | |
|
|
1962 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
1963 | if $Coro::current == $Coro::main; |
|
|
1964 | |
1830 | cf::sync_job { $map->load }; |
1965 | cf::sync_job { $map->load }; |
1831 | } |
1966 | } |
1832 | |
1967 | |
1833 | our %MAP_PREFETCH; |
1968 | our %MAP_PREFETCH; |
1834 | our $MAP_PREFETCHER = undef; |
1969 | our $MAP_PREFETCHER = undef; |
1835 | |
1970 | |
1836 | sub find_async { |
1971 | sub find_async { |
1837 | my ($path, $origin) = @_; |
1972 | my ($path, $origin, $load) = @_; |
1838 | |
1973 | |
1839 | $path = normalise $path, $origin && $origin->{path}; |
1974 | $path = normalise $path, $origin && $origin->{path}; |
1840 | |
1975 | |
1841 | if (my $map = $cf::MAP{$path}) { |
1976 | if (my $map = $cf::MAP{$path}) { |
1842 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1977 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1843 | } |
1978 | } |
1844 | |
1979 | |
1845 | undef $MAP_PREFETCH{$path}; |
1980 | $MAP_PREFETCH{$path} |= $load; |
|
|
1981 | |
1846 | $MAP_PREFETCHER ||= cf::async { |
1982 | $MAP_PREFETCHER ||= cf::async { |
1847 | while (%MAP_PREFETCH) { |
1983 | while (%MAP_PREFETCH) { |
1848 | for my $path (keys %MAP_PREFETCH) { |
1984 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1849 | my $map = find $path |
1985 | if (my $map = find $k) { |
1850 | or next; |
|
|
1851 | $map->load; |
1986 | $map->load if $v; |
|
|
1987 | } |
1852 | |
1988 | |
1853 | delete $MAP_PREFETCH{$path}; |
1989 | delete $MAP_PREFETCH{$k}; |
1854 | } |
1990 | } |
1855 | } |
1991 | } |
1856 | undef $MAP_PREFETCHER; |
1992 | undef $MAP_PREFETCHER; |
1857 | }; |
1993 | }; |
1858 | $MAP_PREFETCHER->prio (6); |
1994 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
1861 | } |
1997 | } |
1862 | |
1998 | |
1863 | sub save { |
1999 | sub save { |
1864 | my ($self) = @_; |
2000 | my ($self) = @_; |
1865 | |
2001 | |
1866 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2002 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1867 | |
2003 | |
1868 | $self->{last_save} = $cf::RUNTIME; |
2004 | $self->{last_save} = $cf::RUNTIME; |
1869 | |
2005 | |
1870 | return unless $self->dirty; |
2006 | return unless $self->dirty; |
1871 | |
2007 | |
… | |
… | |
1894 | my ($self) = @_; |
2030 | my ($self) = @_; |
1895 | |
2031 | |
1896 | # save first because save cedes |
2032 | # save first because save cedes |
1897 | $self->save; |
2033 | $self->save; |
1898 | |
2034 | |
1899 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2035 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1900 | |
2036 | |
1901 | return if $self->players; |
2037 | return if $self->players; |
1902 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2038 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
1903 | return if $self->{deny_save}; |
2039 | return if $self->{deny_save}; |
1904 | |
2040 | |
… | |
… | |
1956 | my $nuke_counter = "aaaa"; |
2092 | my $nuke_counter = "aaaa"; |
1957 | |
2093 | |
1958 | sub nuke { |
2094 | sub nuke { |
1959 | my ($self) = @_; |
2095 | my ($self) = @_; |
1960 | |
2096 | |
|
|
2097 | { |
|
|
2098 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
2099 | |
1961 | delete $cf::MAP{$self->path}; |
2100 | delete $cf::MAP{$self->path}; |
1962 | |
2101 | |
1963 | $self->unlink_save; |
2102 | $self->unlink_save; |
1964 | |
2103 | |
1965 | bless $self, "cf::map"; |
2104 | bless $self, "cf::map"; |
1966 | delete $self->{deny_reset}; |
2105 | delete $self->{deny_reset}; |
1967 | $self->{deny_save} = 1; |
2106 | $self->{deny_save} = 1; |
1968 | $self->reset_timeout (1); |
2107 | $self->reset_timeout (1); |
1969 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2108 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
1970 | |
2109 | |
1971 | $cf::MAP{$self->path} = $self; |
2110 | $cf::MAP{$self->path} = $self; |
|
|
2111 | } |
1972 | |
2112 | |
1973 | $self->reset; # polite request, might not happen |
2113 | $self->reset; # polite request, might not happen |
1974 | } |
2114 | } |
1975 | |
2115 | |
1976 | =item $maps = cf::map::tmp_maps |
2116 | =item $maps = cf::map::tmp_maps |
… | |
… | |
2083 | |
2223 | |
2084 | } else { |
2224 | } else { |
2085 | my $pl = $self->contr; |
2225 | my $pl = $self->contr; |
2086 | |
2226 | |
2087 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
2227 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
2088 | my $diag = $pl->{npc_dialog}; |
2228 | my $dialog = $pl->{npc_dialog}; |
2089 | $diag->{pl}->ext_reply ( |
2229 | $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 | |
2230 | |
2096 | } else { |
2231 | } else { |
2097 | $msg = $npc->name . " says: $msg" if $npc; |
2232 | $msg = $npc->name . " says: $msg" if $npc; |
2098 | $self->message ($msg, $flags); |
2233 | $self->message ($msg, $flags); |
2099 | } |
2234 | } |
2100 | } |
2235 | } |
|
|
2236 | } |
|
|
2237 | |
|
|
2238 | =item $object->send_msg ($channel, $msg, $color, [extra...]) |
|
|
2239 | |
|
|
2240 | =cut |
|
|
2241 | |
|
|
2242 | sub cf::object::send_msg { |
|
|
2243 | my $pl = shift->contr |
|
|
2244 | or return; |
|
|
2245 | $pl->send_msg (@_); |
2101 | } |
2246 | } |
2102 | |
2247 | |
2103 | =item $player_object->may ("access") |
2248 | =item $player_object->may ("access") |
2104 | |
2249 | |
2105 | Returns wether the given player is authorized to access resource "access" |
2250 | Returns wether the given player is authorized to access resource "access" |
… | |
… | |
2184 | # use -1 or undef as default coordinates, not 0, 0 |
2329 | # use -1 or undef as default coordinates, not 0, 0 |
2185 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2330 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2186 | if $x <=0 && $y <= 0; |
2331 | if $x <=0 && $y <= 0; |
2187 | |
2332 | |
2188 | $map->load; |
2333 | $map->load; |
2189 | $map->load_diag; |
2334 | $map->load_neighbours; |
2190 | |
2335 | |
2191 | return unless $self->contr->active; |
2336 | return unless $self->contr->active; |
2192 | $self->activate_recursive; |
2337 | $self->activate_recursive; |
2193 | |
2338 | |
2194 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2339 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2195 | $self->enter_map ($map, $x, $y); |
2340 | $self->enter_map ($map, $x, $y); |
2196 | } |
2341 | } |
2197 | |
2342 | |
2198 | =item $player_object->goto ($path, $x, $y[, $check->($map)]) |
2343 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
2199 | |
2344 | |
2200 | Moves the player to the given map-path and coordinates by first freezing |
2345 | Moves the player to the given map-path and coordinates by first freezing |
2201 | her, loading and preparing them map, calling the provided $check callback |
2346 | her, loading and preparing them map, calling the provided $check callback |
2202 | that has to return the map if sucecssful, and then unfreezes the player on |
2347 | that has to return the map if sucecssful, and then unfreezes the player on |
2203 | the new (success) or old (failed) map position. |
2348 | the new (success) or old (failed) map position. In either case, $done will |
|
|
2349 | be called at the end of this process. |
2204 | |
2350 | |
2205 | =cut |
2351 | =cut |
2206 | |
2352 | |
2207 | our $GOTOGEN; |
2353 | our $GOTOGEN; |
2208 | |
2354 | |
2209 | sub cf::object::player::goto { |
2355 | sub cf::object::player::goto { |
2210 | my ($self, $path, $x, $y, $check) = @_; |
2356 | my ($self, $path, $x, $y, $check, $done) = @_; |
2211 | |
2357 | |
2212 | # do generation counting so two concurrent goto's will be executed in-order |
2358 | # do generation counting so two concurrent goto's will be executed in-order |
2213 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2359 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2214 | |
2360 | |
2215 | $self->enter_link; |
2361 | $self->enter_link; |
… | |
… | |
2235 | |
2381 | |
2236 | if ($gen == $self->{_goto_generation}) { |
2382 | if ($gen == $self->{_goto_generation}) { |
2237 | delete $self->{_goto_generation}; |
2383 | delete $self->{_goto_generation}; |
2238 | $self->leave_link ($map, $x, $y); |
2384 | $self->leave_link ($map, $x, $y); |
2239 | } |
2385 | } |
|
|
2386 | |
|
|
2387 | $done->() if $done; |
2240 | })->prio (1); |
2388 | })->prio (1); |
2241 | } |
2389 | } |
2242 | |
2390 | |
2243 | =item $player_object->enter_exit ($exit_object) |
2391 | =item $player_object->enter_exit ($exit_object) |
2244 | |
2392 | |
… | |
… | |
2313 | my $hp = $exit->stats->hp; |
2461 | my $hp = $exit->stats->hp; |
2314 | my $sp = $exit->stats->sp; |
2462 | my $sp = $exit->stats->sp; |
2315 | |
2463 | |
2316 | $self->enter_link; |
2464 | $self->enter_link; |
2317 | |
2465 | |
|
|
2466 | # if exit is damned, update players death & WoR home-position |
|
|
2467 | $self->contr->savebed ($slaying, $hp, $sp) |
|
|
2468 | if $exit->flag (FLAG_DAMNED); |
|
|
2469 | |
2318 | (async { |
2470 | (async { |
2319 | $self->deactivate_recursive; # just to be sure |
2471 | $self->deactivate_recursive; # just to be sure |
2320 | unless (eval { |
2472 | unless (eval { |
2321 | $self->goto ($slaying, $hp, $sp); |
2473 | $self->goto ($slaying, $hp, $sp); |
2322 | |
2474 | |
… | |
… | |
2349 | |
2501 | |
2350 | utf8::encode $text; |
2502 | utf8::encode $text; |
2351 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
2503 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
2352 | } |
2504 | } |
2353 | |
2505 | |
2354 | =item $client->send_msg ($color, $type, $msg, [extra...]) |
2506 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
2355 | |
2507 | |
2356 | Send a drawinfo or msg packet to the client, formatting the msg for the |
2508 | Send a drawinfo or msg packet to the client, formatting the msg for the |
2357 | client if neccessary. C<$type> should be a string identifying the type of |
2509 | client if neccessary. C<$type> should be a string identifying the type of |
2358 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2510 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2359 | the message unless the client supports the msg packet. |
2511 | the message unless the client supports the msg packet. |
2360 | |
2512 | |
2361 | =cut |
2513 | =cut |
2362 | |
2514 | |
|
|
2515 | our %CHANNEL = ( |
|
|
2516 | "c/identify" => { |
|
|
2517 | id => "identify", |
|
|
2518 | title => "Identify", |
|
|
2519 | reply => undef, |
|
|
2520 | tooltip => "Items recently identified", |
|
|
2521 | }, |
|
|
2522 | "c/examine" => { |
|
|
2523 | id => "examine", |
|
|
2524 | title => "Examine", |
|
|
2525 | reply => undef, |
|
|
2526 | tooltip => "Signs and other items you examined", |
|
|
2527 | }, |
|
|
2528 | ); |
|
|
2529 | |
2363 | sub cf::client::send_msg { |
2530 | sub cf::client::send_msg { |
2364 | my ($self, $color, $type, $msg, @extra) = @_; |
2531 | my ($self, $channel, $msg, $color, @extra) = @_; |
2365 | |
2532 | |
2366 | $msg = $self->pl->expand_cfpod ($msg); |
2533 | $msg = $self->pl->expand_cfpod ($msg); |
2367 | |
2534 | |
|
|
2535 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
|
|
2536 | |
|
|
2537 | # check predefined channels, for the benefit of C |
|
|
2538 | $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; |
|
|
2539 | |
|
|
2540 | if (ref $channel) { |
|
|
2541 | # send meta info to client, if not yet sent |
|
|
2542 | unless (exists $self->{channel}{$channel->{id}}) { |
|
|
2543 | $self->{channel}{$channel->{id}} = $channel; |
|
|
2544 | $self->ext_msg (channel_info => $channel) |
|
|
2545 | if $self->can_msg; |
|
|
2546 | } |
|
|
2547 | |
|
|
2548 | $channel = $channel->{id}; |
|
|
2549 | } |
|
|
2550 | |
|
|
2551 | return unless @extra || length $msg; |
|
|
2552 | |
2368 | if ($self->can_msg) { |
2553 | if ($self->can_msg) { |
2369 | $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); |
2554 | # default colour, mask it out |
|
|
2555 | $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) |
|
|
2556 | if $color & cf::NDI_DEF; |
|
|
2557 | |
|
|
2558 | $self->send_packet ("msg " . $self->{json_coder}->encode ( |
|
|
2559 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); |
2370 | } else { |
2560 | } 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) { |
2561 | if ($color >= 0) { |
|
|
2562 | # replace some tags by gcfclient-compatible ones |
|
|
2563 | for ($msg) { |
|
|
2564 | 1 while |
|
|
2565 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
2566 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
2567 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
2568 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
2569 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; |
|
|
2570 | } |
|
|
2571 | |
|
|
2572 | $color &= cf::NDI_COLOR_MASK; |
|
|
2573 | |
|
|
2574 | utf8::encode $msg; |
|
|
2575 | |
2382 | if (0 && $msg =~ /\[/) { |
2576 | if (0 && $msg =~ /\[/) { |
|
|
2577 | # COMMAND/INFO |
2383 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
2578 | $self->send_packet ("drawextinfo $color 10 8 $msg") |
2384 | } else { |
2579 | } else { |
2385 | s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2580 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2386 | $self->send_packet ("drawinfo $color $msg") |
2581 | $self->send_packet ("drawinfo $color $msg") |
2387 | } |
2582 | } |
2388 | } |
2583 | } |
2389 | } |
2584 | } |
2390 | } |
2585 | } |
2391 | |
2586 | |
2392 | =item $client->ext_event ($type, %msg) |
2587 | =item $client->ext_msg ($type, @msg) |
2393 | |
2588 | |
2394 | Sends an exti event to the client. |
2589 | Sends an ext event to the client. |
2395 | |
2590 | |
2396 | =cut |
2591 | =cut |
2397 | |
2592 | |
2398 | sub cf::client::ext_event($$%) { |
2593 | sub cf::client::ext_msg($$@) { |
2399 | my ($self, $type, %msg) = @_; |
2594 | my ($self, $type, @msg) = @_; |
2400 | |
2595 | |
|
|
2596 | if ($self->extcmd == 2) { |
|
|
2597 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
|
|
2598 | } elsif ($self->extcmd == 1) { # TODO: remove |
2401 | $msg{msgtype} = "event_$type"; |
2599 | push @msg, msgtype => "event_$type"; |
2402 | $self->send_packet ("ext " . cf::to_json \%msg); |
2600 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2601 | } |
|
|
2602 | } |
|
|
2603 | |
|
|
2604 | =item $client->ext_reply ($msgid, @msg) |
|
|
2605 | |
|
|
2606 | Sends an ext reply to the client. |
|
|
2607 | |
|
|
2608 | =cut |
|
|
2609 | |
|
|
2610 | sub cf::client::ext_reply($$@) { |
|
|
2611 | my ($self, $id, @msg) = @_; |
|
|
2612 | |
|
|
2613 | if ($self->extcmd == 2) { |
|
|
2614 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2615 | } elsif ($self->extcmd == 1) { |
|
|
2616 | #TODO: version 1, remove |
|
|
2617 | unshift @msg, msgtype => "reply", msgid => $id; |
|
|
2618 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2619 | } |
2403 | } |
2620 | } |
2404 | |
2621 | |
2405 | =item $success = $client->query ($flags, "text", \&cb) |
2622 | =item $success = $client->query ($flags, "text", \&cb) |
2406 | |
2623 | |
2407 | Queues a query to the client, calling the given callback with |
2624 | Queues a query to the client, calling the given callback with |
2408 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
2625 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
2409 | C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. |
2626 | C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. |
2410 | |
2627 | |
2411 | Queries can fail, so check the return code. Or don't, as queries will become |
2628 | Queries can fail, so check the return code. Or don't, as queries will |
2412 | reliable at some point in the future. |
2629 | become reliable at some point in the future. |
2413 | |
2630 | |
2414 | =cut |
2631 | =cut |
2415 | |
2632 | |
2416 | sub cf::client::query { |
2633 | sub cf::client::query { |
2417 | my ($self, $flags, $text, $cb) = @_; |
2634 | my ($self, $flags, $text, $cb) = @_; |
… | |
… | |
2425 | utf8::encode $text; |
2642 | utf8::encode $text; |
2426 | push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; |
2643 | push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; |
2427 | |
2644 | |
2428 | $self->send_packet ($self->{query_queue}[0][0]) |
2645 | $self->send_packet ($self->{query_queue}[0][0]) |
2429 | if @{ $self->{query_queue} } == 1; |
2646 | if @{ $self->{query_queue} } == 1; |
|
|
2647 | |
|
|
2648 | 1 |
2430 | } |
2649 | } |
2431 | |
2650 | |
2432 | cf::client->attach ( |
2651 | cf::client->attach ( |
|
|
2652 | on_connect => sub { |
|
|
2653 | my ($ns) = @_; |
|
|
2654 | |
|
|
2655 | $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed; |
|
|
2656 | }, |
2433 | on_reply => sub { |
2657 | on_reply => sub { |
2434 | my ($ns, $msg) = @_; |
2658 | my ($ns, $msg) = @_; |
2435 | |
2659 | |
2436 | # this weird shuffling is so that direct followup queries |
2660 | # this weird shuffling is so that direct followup queries |
2437 | # get handled first |
2661 | # get handled first |
… | |
… | |
2449 | } else { |
2673 | } else { |
2450 | $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; |
2674 | $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; |
2451 | } |
2675 | } |
2452 | } |
2676 | } |
2453 | }, |
2677 | }, |
|
|
2678 | on_exticmd => sub { |
|
|
2679 | my ($ns, $buf) = @_; |
|
|
2680 | |
|
|
2681 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
|
|
2682 | |
|
|
2683 | if (ref $msg) { |
|
|
2684 | my ($type, $reply, @payload) = |
|
|
2685 | "ARRAY" eq ref $msg |
|
|
2686 | ? @$msg |
|
|
2687 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
|
|
2688 | |
|
|
2689 | my @reply; |
|
|
2690 | |
|
|
2691 | if (my $cb = $EXTICMD{$type}) { |
|
|
2692 | @reply = $cb->($ns, @payload); |
|
|
2693 | } |
|
|
2694 | |
|
|
2695 | $ns->ext_reply ($reply, @reply) |
|
|
2696 | if $reply; |
|
|
2697 | |
|
|
2698 | } else { |
|
|
2699 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
|
|
2700 | } |
|
|
2701 | |
|
|
2702 | cf::override; |
|
|
2703 | }, |
2454 | ); |
2704 | ); |
2455 | |
2705 | |
2456 | =item $client->async (\&cb) |
2706 | =item $client->async (\&cb) |
2457 | |
2707 | |
2458 | Create a new coroutine, running the specified callback. The coroutine will |
2708 | Create a new coroutine, running the specified callback. The coroutine will |
… | |
… | |
2499 | our $safe = new Safe "safe"; |
2749 | our $safe = new Safe "safe"; |
2500 | our $safe_hole = new Safe::Hole; |
2750 | our $safe_hole = new Safe::Hole; |
2501 | |
2751 | |
2502 | $SIG{FPE} = 'IGNORE'; |
2752 | $SIG{FPE} = 'IGNORE'; |
2503 | |
2753 | |
2504 | $safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); |
2754 | $safe->permit_only (Opcode::opset qw( |
|
|
2755 | :base_core :base_mem :base_orig :base_math |
|
|
2756 | grepstart grepwhile mapstart mapwhile |
|
|
2757 | sort time |
|
|
2758 | )); |
2505 | |
2759 | |
2506 | # here we export the classes and methods available to script code |
2760 | # here we export the classes and methods available to script code |
2507 | |
2761 | |
2508 | =pod |
2762 | =pod |
2509 | |
2763 | |
2510 | The following functions and methods are available within a safe environment: |
2764 | The following functions and methods are available within a safe environment: |
2511 | |
2765 | |
2512 | cf::object contr pay_amount pay_player map |
2766 | cf::object |
|
|
2767 | contr pay_amount pay_player map x y force_find force_add |
|
|
2768 | insert remove name archname title slaying race decrease_ob_nr |
|
|
2769 | |
2513 | cf::object::player player |
2770 | cf::object::player |
2514 | cf::player peaceful |
2771 | player |
2515 | cf::map trigger |
2772 | |
|
|
2773 | cf::player |
|
|
2774 | peaceful |
|
|
2775 | |
|
|
2776 | cf::map |
|
|
2777 | trigger |
2516 | |
2778 | |
2517 | =cut |
2779 | =cut |
2518 | |
2780 | |
2519 | for ( |
2781 | for ( |
2520 | ["cf::object" => qw(contr pay_amount pay_player map)], |
2782 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
|
|
2783 | insert remove inv name archname title slaying race |
|
|
2784 | decrease_ob_nr)], |
2521 | ["cf::object::player" => qw(player)], |
2785 | ["cf::object::player" => qw(player)], |
2522 | ["cf::player" => qw(peaceful)], |
2786 | ["cf::player" => qw(peaceful)], |
2523 | ["cf::map" => qw(trigger)], |
2787 | ["cf::map" => qw(trigger)], |
2524 | ) { |
2788 | ) { |
2525 | no strict 'refs'; |
2789 | no strict 'refs'; |
… | |
… | |
2601 | # the server's init and main functions |
2865 | # the server's init and main functions |
2602 | |
2866 | |
2603 | sub load_facedata($) { |
2867 | sub load_facedata($) { |
2604 | my ($path) = @_; |
2868 | my ($path) = @_; |
2605 | |
2869 | |
|
|
2870 | # HACK to clear player env face cache, we need some signal framework |
|
|
2871 | # for this (global event?) |
|
|
2872 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2873 | |
|
|
2874 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
|
|
2875 | |
2606 | warn "loading facedata from $path\n"; |
2876 | warn "loading facedata from $path\n"; |
2607 | |
2877 | |
2608 | my $facedata; |
2878 | my $facedata; |
2609 | 0 < aio_load $path, $facedata |
2879 | 0 < aio_load $path, $facedata |
2610 | or die "$path: $!"; |
2880 | or die "$path: $!"; |
… | |
… | |
2612 | $facedata = Coro::Storable::thaw $facedata; |
2882 | $facedata = Coro::Storable::thaw $facedata; |
2613 | |
2883 | |
2614 | $facedata->{version} == 2 |
2884 | $facedata->{version} == 2 |
2615 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2885 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2616 | |
2886 | |
|
|
2887 | # patch in the exptable |
|
|
2888 | $facedata->{resource}{"res/exp_table"} = { |
|
|
2889 | type => FT_RSRC, |
|
|
2890 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
|
|
2891 | }; |
|
|
2892 | cf::cede_to_tick; |
|
|
2893 | |
2617 | { |
2894 | { |
2618 | my $faces = $facedata->{faceinfo}; |
2895 | my $faces = $facedata->{faceinfo}; |
2619 | |
2896 | |
2620 | while (my ($face, $info) = each %$faces) { |
2897 | while (my ($face, $info) = each %$faces) { |
2621 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2898 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2622 | cf::face::set $idx, $info->{visibility}, $info->{magicmap}; |
2899 | cf::face::set_visibility $idx, $info->{visibility}; |
|
|
2900 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2623 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2901 | cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; |
2624 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2902 | cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; |
2625 | Coro::cede; |
2903 | |
|
|
2904 | cf::cede_to_tick; |
2626 | } |
2905 | } |
2627 | |
2906 | |
2628 | while (my ($face, $info) = each %$faces) { |
2907 | while (my ($face, $info) = each %$faces) { |
2629 | next unless $info->{smooth}; |
2908 | next unless $info->{smooth}; |
2630 | my $idx = cf::face::find $face |
2909 | my $idx = cf::face::find $face |
2631 | or next; |
2910 | or next; |
2632 | if (my $smooth = cf::face::find $info->{smooth}) { |
2911 | if (my $smooth = cf::face::find $info->{smooth}) { |
|
|
2912 | cf::face::set_smooth $idx, $smooth; |
2633 | cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; |
2913 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
2634 | } else { |
2914 | } else { |
2635 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2915 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2636 | } |
2916 | } |
2637 | Coro::cede; |
2917 | |
|
|
2918 | cf::cede_to_tick; |
2638 | } |
2919 | } |
2639 | } |
2920 | } |
2640 | |
2921 | |
2641 | { |
2922 | { |
2642 | my $anims = $facedata->{animinfo}; |
2923 | my $anims = $facedata->{animinfo}; |
2643 | |
2924 | |
2644 | while (my ($anim, $info) = each %$anims) { |
2925 | while (my ($anim, $info) = each %$anims) { |
2645 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
2926 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
2646 | Coro::cede; |
2927 | cf::cede_to_tick; |
2647 | } |
2928 | } |
2648 | |
2929 | |
2649 | cf::anim::invalidate_all; # d'oh |
2930 | cf::anim::invalidate_all; # d'oh |
2650 | } |
2931 | } |
2651 | |
2932 | |
|
|
2933 | { |
|
|
2934 | # TODO: for gcfclient pleasure, we should give resources |
|
|
2935 | # that gcfclient doesn't grok a >10000 face index. |
|
|
2936 | my $res = $facedata->{resource}; |
|
|
2937 | |
|
|
2938 | my $soundconf = delete $res->{"res/sound.conf"}; |
|
|
2939 | |
|
|
2940 | while (my ($name, $info) = each %$res) { |
|
|
2941 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
|
|
2942 | my $data; |
|
|
2943 | |
|
|
2944 | if ($info->{type} & 1) { |
|
|
2945 | # prepend meta info |
|
|
2946 | |
|
|
2947 | my $meta = $enc->encode ({ |
|
|
2948 | name => $name, |
|
|
2949 | %{ $info->{meta} || {} }, |
|
|
2950 | }); |
|
|
2951 | |
|
|
2952 | $data = pack "(w/a*)*", $meta, $info->{data}; |
|
|
2953 | } else { |
|
|
2954 | $data = $info->{data}; |
|
|
2955 | } |
|
|
2956 | |
|
|
2957 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
|
|
2958 | cf::face::set_type $idx, $info->{type}; |
|
|
2959 | |
|
|
2960 | cf::cede_to_tick; |
|
|
2961 | } |
|
|
2962 | |
|
|
2963 | if ($soundconf) { |
|
|
2964 | $soundconf = $enc->decode (delete $soundconf->{data}); |
|
|
2965 | |
|
|
2966 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
2967 | my $sound = $soundconf->{compat}[$_] |
|
|
2968 | or next; |
|
|
2969 | |
|
|
2970 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
2971 | cf::sound::set $sound->[0] => $face; |
|
|
2972 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
2973 | } |
|
|
2974 | |
|
|
2975 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
|
|
2976 | my $face = cf::face::find "sound/$v"; |
|
|
2977 | cf::sound::set $k => $face; |
|
|
2978 | } |
|
|
2979 | } |
|
|
2980 | } |
|
|
2981 | |
2652 | 1 |
2982 | 1 |
2653 | } |
2983 | } |
2654 | |
2984 | |
|
|
2985 | register_exticmd fx_want => sub { |
|
|
2986 | my ($ns, $want) = @_; |
|
|
2987 | |
|
|
2988 | while (my ($k, $v) = each %$want) { |
|
|
2989 | $ns->fx_want ($k, $v); |
|
|
2990 | } |
|
|
2991 | }; |
|
|
2992 | |
2655 | sub reload_regions { |
2993 | sub reload_regions { |
|
|
2994 | # HACK to clear player env face cache, we need some signal framework |
|
|
2995 | # for this (global event?) |
|
|
2996 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2997 | |
2656 | load_resource_file "$MAPDIR/regions" |
2998 | load_resource_file "$MAPDIR/regions" |
2657 | or die "unable to load regions file\n"; |
2999 | or die "unable to load regions file\n"; |
|
|
3000 | |
|
|
3001 | for (cf::region::list) { |
|
|
3002 | $_->{match} = qr/$_->{match}/ |
|
|
3003 | if exists $_->{match}; |
|
|
3004 | } |
2658 | } |
3005 | } |
2659 | |
3006 | |
2660 | sub reload_facedata { |
3007 | sub reload_facedata { |
2661 | load_facedata "$DATADIR/facedata" |
3008 | load_facedata "$DATADIR/facedata" |
2662 | or die "unable to load facedata\n"; |
3009 | or die "unable to load facedata\n"; |
2663 | } |
3010 | } |
2664 | |
3011 | |
2665 | sub reload_archetypes { |
3012 | sub reload_archetypes { |
|
|
3013 | load_resource_file "$DATADIR/archetypes" |
|
|
3014 | or die "unable to load archetypes\n"; |
|
|
3015 | #d# NEED to laod twice to resolve forward references |
|
|
3016 | # this really needs to be done in an extra post-pass |
|
|
3017 | # (which needs to be synchronous, so solve it differently) |
2666 | load_resource_file "$DATADIR/archetypes" |
3018 | load_resource_file "$DATADIR/archetypes" |
2667 | or die "unable to load archetypes\n"; |
3019 | or die "unable to load archetypes\n"; |
2668 | } |
3020 | } |
2669 | |
3021 | |
2670 | sub reload_treasures { |
3022 | sub reload_treasures { |
… | |
… | |
2686 | |
3038 | |
2687 | sub init { |
3039 | sub init { |
2688 | reload_resources; |
3040 | reload_resources; |
2689 | } |
3041 | } |
2690 | |
3042 | |
2691 | sub cfg_load { |
3043 | sub reload_config { |
2692 | open my $fh, "<:utf8", "$CONFDIR/config" |
3044 | open my $fh, "<:utf8", "$CONFDIR/config" |
2693 | or return; |
3045 | or return; |
2694 | |
3046 | |
2695 | local $/; |
3047 | local $/; |
2696 | *CFG = YAML::Syck::Load <$fh>; |
3048 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
2716 | (async { |
3068 | (async { |
2717 | Event::one_event; |
3069 | Event::one_event; |
2718 | })->prio (Coro::PRIO_MAX); |
3070 | })->prio (Coro::PRIO_MAX); |
2719 | }; |
3071 | }; |
2720 | |
3072 | |
2721 | cfg_load; |
3073 | reload_config; |
2722 | db_init; |
3074 | db_init; |
2723 | load_extensions; |
3075 | load_extensions; |
2724 | |
3076 | |
2725 | $TICK_WATCHER->start; |
3077 | $TICK_WATCHER->start; |
2726 | Event::loop; |
3078 | Event::loop; |
… | |
… | |
2864 | %EXT_CORO = (); |
3216 | %EXT_CORO = (); |
2865 | |
3217 | |
2866 | warn "removing commands"; |
3218 | warn "removing commands"; |
2867 | %COMMAND = (); |
3219 | %COMMAND = (); |
2868 | |
3220 | |
2869 | warn "removing ext commands"; |
3221 | warn "removing ext/exti commands"; |
2870 | %EXTCMD = (); |
3222 | %EXTCMD = (); |
|
|
3223 | %EXTICMD = (); |
2871 | |
3224 | |
2872 | warn "unloading/nuking all extensions"; |
3225 | warn "unloading/nuking all extensions"; |
2873 | for my $pkg (@EXTS) { |
3226 | for my $pkg (@EXTS) { |
2874 | warn "... unloading $pkg"; |
3227 | warn "... unloading $pkg"; |
2875 | |
3228 | |
… | |
… | |
2918 | warn "reloading cf.pm"; |
3271 | warn "reloading cf.pm"; |
2919 | require cf; |
3272 | require cf; |
2920 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3273 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
2921 | |
3274 | |
2922 | warn "loading config and database again"; |
3275 | warn "loading config and database again"; |
2923 | cf::cfg_load; |
3276 | cf::reload_config; |
2924 | |
3277 | |
2925 | warn "loading extensions"; |
3278 | warn "loading extensions"; |
2926 | cf::load_extensions; |
3279 | cf::load_extensions; |
2927 | |
3280 | |
2928 | warn "reattaching attachments to objects/players"; |
3281 | warn "reattaching attachments to objects/players"; |