--- deliantra/server/lib/cf.pm 2006/07/19 08:50:42 1.22 +++ deliantra/server/lib/cf.pm 2006/07/19 22:19:19 1.23 @@ -3,6 +3,9 @@ use Symbol; use List::Util; use Storable; +use Opcode; +use Safe; +use Safe::Hole; use Event; $Event::Eval = 1; # no idea why this is required, but it is @@ -162,7 +165,7 @@ $ext_pkg{$base} = $pkg; # no strict 'refs'; -# @{"$pkg\::ISA"} = cf::ext::; +# @{"$pkg\::ISA"} = ext::; register $base, $pkg; } @@ -352,17 +355,70 @@ ############################################################################# # core extensions - in perl +=item cf::player::exists $login + +Returns true when the given account exists. + +=cut + +sub cf::player::exists($) { + cf::player::find $_[0] + or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; +} + # rough implementation of a future "reply" method that works # with dialog boxes. -sub cf::object::player::reply($$;$) { - my ($self, $msg, $flags) = @_; +sub cf::object::player::reply($$$;$) { + my ($self, $npc, $msg, $flags) = @_; + + $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; - $flags = cf::NDI_WHITE unless @_ >= 3; + $msg = $npc->name . " says: $msg" if $npc; $self->message ($msg, $flags); } ############################################################################# +# map scripting support + +our $safe = new Safe "ext"; +our $safe_hole = new Safe::Hole; + +$SIG{FPE} = 'IGNORE'; + +$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); + +# here we would export the classes and methods available to script code +#@ext::cf::object::player::ISA = @cf::object::player::ISA; +#@ext::cf::object::map::ISA = @cf::object::map::ISA; + +sub safe_eval($;@) { + my ($code, %vars) = @_; + + my $qcode = $code; + $qcode =~ s/"/‟/g; # not allowed in #line filenames + $qcode =~ s/\n/\\n/g; + + local $_; + local @ext::cf::_safe_eval_args = values %vars; + + $safe->reval ( + "do {\n" + . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" + . "#line 0 \"{$qcode}\"\n" + . $code + . "\n}" + ) +} + +sub register_script_function { + my ($fun, $cb) = @_; + + no strict 'refs'; + *{"ext::$fun"} = $safe_hole->wrap ($cb); +} + +############################################################################# # initialisation register "", __PACKAGE__;