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.321 by root, Thu Jul 26 21:44:43 2007 UTC vs.
Revision 1.333 by root, Sun Aug 19 09:14:50 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
25use JSON::XS 1.4 (); 26use JSON::XS 1.4 ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
474 475
475=cut 476=cut
476 477
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 478sub fork_call(&@) {
487 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
488 480
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
492 or die "pipe: $!";
493 484
494 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 486 reset_signals;
508 local $SIG{__WARN__}; 487 &$cb
509 local $SIG{__DIE__}; 488 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 489
516 eval { 490 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 491}
529 492
530=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
531 494
532Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
1370 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1371 1334
1372 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1373 1336
1374 $self 1337 $self
1338}
1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1375} 1348}
1376 1349
1377=item $pl->quit_character 1350=item $pl->quit_character
1378 1351
1379Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1921 $self->set_darkness_map; 1894 $self->set_darkness_map;
1922 Coro::cede; 1895 Coro::cede;
1923 $self->activate; 1896 $self->activate;
1924 } 1897 }
1925 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1903 }
1928 1904
1929 $self->post_load; 1905 $self->post_load;
1930} 1906}
… …
1940 1916
1941 $self 1917 $self
1942} 1918}
1943 1919
1944# find and load all maps in the 3x3 area around a map 1920# find and load all maps in the 3x3 area around a map
1945sub load_diag { 1921sub load_neighbours {
1946 my ($map) = @_; 1922 my ($map) = @_;
1947 1923
1948 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1949 1925
1950 for (0 .. 3) { 1926 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1952 or next; 1928 or next;
1953 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1954 or next; 1930 or next;
1955 $neigh->load; 1931 $neigh->load;
1956 1932
1933 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1936 }
1960 1937
1961 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1963 or next; 1941 or next;
1964 $neigh->load; 1942 $neigh->load;
1965 } 1943 }
1966} 1944}
1967 1945
… …
2240 $self->message ($msg, $flags); 2218 $self->message ($msg, $flags);
2241 } 2219 }
2242 } 2220 }
2243} 2221}
2244 2222
2223=item $object->send_msg ($channel, $msg, $color, [extra...])
2224
2225=cut
2226
2227sub cf::object::send_msg {
2228 my $pl = shift->contr
2229 or return;
2230 $pl->send_msg (@_);
2231}
2232
2245=item $player_object->may ("access") 2233=item $player_object->may ("access")
2246 2234
2247Returns wether the given player is authorized to access resource "access" 2235Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2236(e.g. "command_wizcast").
2249 2237
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
2329 2317
2330 $map->load; 2318 $map->load;
2331 $map->load_diag; 2319 $map->load_neighbours;
2332 2320
2333 return unless $self->contr->active; 2321 return unless $self->contr->active;
2334 $self->activate_recursive; 2322 $self->activate_recursive;
2335 2323
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2512sub cf::client::send_msg { 2500sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2501 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2502
2515 $msg = $self->pl->expand_cfpod ($msg); 2503 $msg = $self->pl->expand_cfpod ($msg);
2516 2504
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2505 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2506
2519 if (ref $channel) { 2507 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2508 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2509 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2510 $self->{channel}{$channel->{id}} = $channel;
… …
2527 } 2515 }
2528 2516
2529 return unless @extra || length $msg; 2517 return unless @extra || length $msg;
2530 2518
2531 if ($self->can_msg) { 2519 if ($self->can_msg) {
2520 # default colour, mask it out
2521 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2522 if $color & cf::NDI_DEF;
2523
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2524 $self->send_packet ("msg " . $self->{json_coder}->encode (
2525 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2526 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2527 if ($color >= 0) {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 $color &= cf::NDI_COLOR_MASK;
2539
2540 utf8::encode $msg;
2541
2545 if (0 && $msg =~ /\[/) { 2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2545 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2547 $self->send_packet ("drawinfo $color $msg")
2550 } 2548 }
2551 } 2549 }
… …
2698our $safe = new Safe "safe"; 2696our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2697our $safe_hole = new Safe::Hole;
2700 2698
2701$SIG{FPE} = 'IGNORE'; 2699$SIG{FPE} = 'IGNORE';
2702 2700
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2701$safe->permit_only (Opcode::opset qw(
2702 :base_core :base_mem :base_orig :base_math
2703 grepstart grepwhile mapstart mapwhile
2704 sort time
2705));
2704 2706
2705# here we export the classes and methods available to script code 2707# here we export the classes and methods available to script code
2706 2708
2707=pod 2709=pod
2708 2710
2709The following functions and methods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2710 2712
2711 cf::object 2713 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2714 contr pay_amount pay_player map x y force_find force_add
2713 insert remove 2715 insert remove name archname title slaying race
2714 2716
2715 cf::object::player 2717 cf::object::player
2716 player 2718 player
2717 2719
2718 cf::player 2720 cf::player
… …
2723 2725
2724=cut 2726=cut
2725 2727
2726for ( 2728for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove)], 2730 insert remove inv name archname title slaying race)],
2729 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2732) { 2734) {
2733 no strict 'refs'; 2735 no strict 'refs';
… …
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) { 2901 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_] 2902 my $sound = $soundconf->{compat}[$_]
2901 or next; 2903 or next;
2902 2904
2903 my $face = cf::face::find "sound/$sound->[1]"; 2905 my $face = cf::face::find "sound/$sound->[1]";
2904 warn "$sound->[0]: $face\n";#d#
2905
2906 cf::sound::set $sound->[0] => $face; 2906 cf::sound::set $sound->[0] => $face;
2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat 2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908 } 2908 }
2909 2909
2910 while (my ($k, $v) = each %{$soundconf->{event}}) {
2911 my $face = cf::face::find "sound/$v";
2912 cf::sound::set $k => $face;
2910 #TODO 2913 }
2911 } 2914 }
2912 } 2915 }
2913 2916
2914 1 2917 1
2915} 2918}

Diff Legend

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