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.290 by root, Mon Jul 2 03:15:30 2007 UTC vs.
Revision 1.301 by root, Tue Jul 10 07:01:51 2007 UTC

409Coro::Storable. May, of course, block. Note that the executed sub may 409Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 410never block itself or use any form of Event handling.
411 411
412=cut 412=cut
413 413
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
414sub fork_call(&@) { 423sub fork_call(&@) {
415 my ($cb, @args) = @_; 424 my ($cb, @args) = @_;
416 425
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
418# or die "socketpair: $!"; 427# or die "socketpair: $!";
421 430
422 if (my $pid = fork) { 431 if (my $pid = fork) {
423 close $fh2; 432 close $fh2;
424 433
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
426 $res = Coro::Storable::thaw $res; 436 $res = Coro::Storable::thaw $res;
427 437
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429 439
430 die $$res unless "ARRAY" eq ref $res; 440 Carp::confess $$res unless "ARRAY" eq ref $res;
431 441
432 return wantarray ? @$res : $res->[-1]; 442 return wantarray ? @$res : $res->[-1];
433 } else { 443 } else {
434 reset_signals; 444 reset_signals;
435 local $SIG{__WARN__}; 445 local $SIG{__WARN__};
436 local $SIG{__DIE__}; 446 local $SIG{__DIE__};
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452
437 eval { 453 eval {
438 close $fh1; 454 close $fh1;
439 455
440 my @res = eval { $cb->(@args) }; 456 my @res = eval { $cb->(@args) };
457
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
442 }; 460 };
443 461
444 warn $@ if $@; 462 warn $@ if $@;
445 _exit 0; 463 _exit 0;
446 } 464 }
1400 # replace G<male|female> tags 1418 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1419 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1420 $self->gender ? $2 : $1
1403 }ge 1421 }ge
1404 # replace H<hint text> 1422 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1423 || s{H<([^\>]*)>}
1424 {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "")
1428 [$self->{hintmode}]
1429 }ge;
1406 1430
1407 # create single paragraphs (very hackish) 1431 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g; 1432 s/(?<=\S)\n(?=\w)/ /g;
1409 1433
1434 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines
1439
1410 $_ 1440 $_
1441}
1442
1443sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode}
1411} 1446}
1412 1447
1413=item $player->ext_reply ($msgid, %msg) 1448=item $player->ext_reply ($msgid, %msg)
1414 1449
1415Sends an ext reply to the player. 1450Sends an ext reply to the player.
2340 my $hp = $exit->stats->hp; 2375 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp; 2376 my $sp = $exit->stats->sp;
2342 2377
2343 $self->enter_link; 2378 $self->enter_link;
2344 2379
2380 # if exit is damned, update players death & WoR home-position
2381 $self->contr->savebed ($slaying, $hp, $sp)
2382 if $exit->flag (FLAG_DAMNED);
2383
2345 (async { 2384 (async {
2346 $self->deactivate_recursive; # just to be sure 2385 $self->deactivate_recursive; # just to be sure
2347 unless (eval { 2386 unless (eval {
2348 $self->goto ($slaying, $hp, $sp); 2387 $self->goto ($slaying, $hp, $sp);
2349 2388
2389 2428
2390sub cf::client::send_msg { 2429sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2430 my ($self, $color, $type, $msg, @extra) = @_;
2392 2431
2393 $msg = $self->pl->expand_cfpod ($msg); 2432 $msg = $self->pl->expand_cfpod ($msg);
2433
2434 return unless @extra || length $msg;
2394 2435
2395 if ($self->can_msg) { 2436 if ($self->can_msg) {
2396 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2397 } else { 2438 } else {
2398 # replace some tags by gcfclient-compatible ones 2439 # replace some tags by gcfclient-compatible ones
2559 2600
2560=pod 2601=pod
2561 2602
2562The following functions and methods are available within a safe environment: 2603The following functions and methods are available within a safe environment:
2563 2604
2564 cf::object contr pay_amount pay_player map 2605 cf::object
2606 contr pay_amount pay_player map x y force_find force_add
2607 insert remove
2608
2565 cf::object::player player 2609 cf::object::player
2566 cf::player peaceful 2610 player
2567 cf::map trigger 2611
2612 cf::player
2613 peaceful
2614
2615 cf::map
2616 trigger
2568 2617
2569=cut 2618=cut
2570 2619
2571for ( 2620for (
2572 ["cf::object" => qw(contr pay_amount pay_player map)], 2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2622 insert remove)],
2573 ["cf::object::player" => qw(player)], 2623 ["cf::object::player" => qw(player)],
2574 ["cf::player" => qw(peaceful)], 2624 ["cf::player" => qw(peaceful)],
2575 ["cf::map" => qw(trigger)], 2625 ["cf::map" => qw(trigger)],
2576) { 2626) {
2577 no strict 'refs'; 2627 no strict 'refs';

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines