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.23 by root, Wed Jul 19 22:19:19 2006 UTC vs.
Revision 1.28 by root, Sun Jul 30 17:42:14 2006 UTC

… …
14 14
15our %COMMAND; 15our %COMMAND;
16our @EVENT; 16our @EVENT;
17our %PROP_TYPE; 17our %PROP_TYPE;
18our %PROP_IDX; 18our %PROP_IDX;
19our $LIBDIR = maps_directory "perl";
19 20
20BEGIN { 21BEGIN {
21 @EVENT = map lc, @EVENT; 22 @EVENT = map lc, @EVENT;
22 23
23 *CORE::GLOBAL::warn = sub { 24 *CORE::GLOBAL::warn = sub {
… …
64prop_gen MAP_PROP => "cf::map"; 65prop_gen MAP_PROP => "cf::map";
65prop_gen ARCH_PROP => "cf::arch"; 66prop_gen ARCH_PROP => "cf::arch";
66 67
67# guessed hierarchies 68# guessed hierarchies
68 69
69@cf::object::player::ISA = 'cf::object'; 70@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
70@cf::object::map::ISA = 'cf::object'; 71@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
72
73# we bless all objects into derived classes to force a method lookup
74# within the Safe compartment.
75for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region)) {
76 no strict 'refs';
77 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
78}
71 79
72$Event::DIED = sub { 80$Event::DIED = sub {
73 warn "error in event callback: @_"; 81 warn "error in event callback: @_";
74}; 82};
75 83
… …
223 if ($who->flag (FLAG_WIZ)) { 231 if ($who->flag (FLAG_WIZ)) {
224 $who->message ("reloading..."); 232 $who->message ("reloading...");
225 233
226 warn "reloading...\n"; 234 warn "reloading...\n";
227 eval { 235 eval {
236 # 1. cancel all watchers
228 $_->cancel for Event::all_watchers; 237 $_->cancel for Event::all_watchers;
229 238
239 # 2. unload all extensions
240 for (@exts) {
241 $who->message ("unloading <$_>");
230 unload_extension $_ for @exts; 242 unload_extension $_;
243 }
244
245 # 3. unload all modules loaded from $LIBDIR
246 while (my ($k, $v) = each %INC) {
247 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
248
249 $who->message ("removing <$k>");
250 delete $INC{$k};
251
252 $k =~ s/\.pm$//;
253 $k =~ s/\//::/g;
254
255 if (my $cb = $k->can ("unload_module")) {
256 $cb->();
257 }
258
259 Symbol::delete_package $k;
260 }
261
262 # 4. get rid of ext::, as good as possible
263 Symbol::delete_package "ext::$_"
264 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
265
266 # 5. remove register_script_function callbacks
267 # TODO
268
269 # 6. unload cf.pm "a bit"
231 delete $INC{"cf.pm"}; 270 delete $INC{"cf.pm"};
232 271
233 # don't, removes xs symbols, too 272 # don't, removes xs symbols, too
234 #Symbol::delete_package __PACKAGE__; 273 #Symbol::delete_package __PACKAGE__;
235 274
275 # 7. reload cf.pm
276 $who->message ("reloading cf.pm");
236 require cf; 277 require cf;
237 }; 278 };
238 warn $@ if $@; 279 warn $@ if $@;
239 $who->message ($@) if $@; 280 $who->message ($@) if $@;
240 warn "reloaded\n"; 281 warn "reloaded\n";
… …
244 $who->message ("Intruder Alert!"); 285 $who->message ("Intruder Alert!");
245 } 286 }
246}; 287};
247 288
248############################################################################# 289#############################################################################
290# utility functions
291
292use JSON::Syck (); # TODO# replace by JSON::PC once working
293
294$JSON::Syck::ImplicitUnicode = 1;
295
296sub from_json($) {
297 JSON::Syck::Load $_[0]
298}
299
300sub to_json($) {
301 JSON::Syck::Dump $_[0]
302}
303
304#############################################################################
249# extcmd framework, basically convert ext <id> <pkg> arg1 args 305# extcmd framework, basically convert ext <msg>
250# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 306# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
251 307
252sub on_extcmd { 308sub on_extcmd {
253 my ($pl, $buf) = @_; 309 my ($pl, $buf) = @_;
254 310
255 my ($type) = $buf =~ s/^(\S+) // ? $1 : ""; 311 my $msg = eval { from_json $buf };
256 312
257 $extcmd{$type}[0]->($pl, $buf) 313 if (ref $msg) {
258 if $extcmd{$type}; 314 if (my $cb = $extcmd{$msg->{msgtype}}) {
315 if (my %reply = $cb->[0]->($pl, $msg)) {
316 $pl->ext_reply ($msg->{msgid}, %reply);
317 }
318 }
319 } else {
320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
321 }
322
323 1
259} 324}
260 325
261############################################################################# 326#############################################################################
262# load/save/clean perl data associated with a map 327# load/save/clean perl data associated with a map
263 328
… …
319# load/save perl data associated with player->ob objects 384# load/save perl data associated with player->ob objects
320 385
321*on_player_load = sub { 386*on_player_load = sub {
322 my ($ob, $path) = @_; 387 my ($ob, $path) = @_;
323 388
324 if (open my $fh, "<:raw", "$path.cfperl") {
325
326 #d##TODO#remove
327
328 my $data = Storable::thaw do { local $/; <$fh> };
329
330 $data->{version} <= 1
331 or return; # too new
332
333 %$ob = %{$data->{ob}};
334 return;
335 }
336
337 for my $o ($ob, $ob->inv) { 389 for my $o ($ob, $ob->inv) {
338 if (my $value = $o->get_ob_key_value ("_perl_data")) { 390 if (my $value = $o->get_ob_key_value ("_perl_data")) {
339 $o->set_ob_key_value ("_perl_data"); 391 $o->set_ob_key_value ("_perl_data");
340 392
341 %$o = %{ Storable::thaw pack "H*", $value }; 393 %$o = %{ Storable::thaw pack "H*", $value };
… …
346*on_player_save = sub { 398*on_player_save = sub {
347 my ($ob, $path) = @_; 399 my ($ob, $path) = @_;
348 400
349 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_) 401 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
350 for grep %$_, $ob, $ob->inv; 402 for grep %$_, $ob, $ob->inv;
351
352 unlink "$path.cfperl";#d##TODO#remove
353}; 403};
354 404
355############################################################################# 405#############################################################################
356# core extensions - in perl 406# core extensions - in perl
357 407
… …
363 413
364sub cf::player::exists($) { 414sub cf::player::exists($) {
365 cf::player::find $_[0] 415 cf::player::find $_[0]
366 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 416 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
367} 417}
418
419=item $player->reply ($npc, $msg[, $flags])
420
421Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
422can be C<undef>. Does the right thing when the player is currently in a
423dialogue with the given NPC character.
424
425=cut
368 426
369# rough implementation of a future "reply" method that works 427# rough implementation of a future "reply" method that works
370# with dialog boxes. 428# with dialog boxes.
371sub cf::object::player::reply($$$;$) { 429sub cf::object::player::reply($$$;$) {
372 my ($self, $npc, $msg, $flags) = @_; 430 my ($self, $npc, $msg, $flags) = @_;
373 431
374 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 432 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
375 433
434 if ($self->{record_replies}) {
435 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
436 } else {
376 $msg = $npc->name . " says: $msg" if $npc; 437 $msg = $npc->name . " says: $msg" if $npc;
377
378 $self->message ($msg, $flags); 438 $self->message ($msg, $flags);
439 }
440}
441
442=item $player->ext_reply ($msgid, $msgtype, %msg)
443
444Sends an ext reply to the player.
445
446=cut
447
448sub cf::player::ext_reply($$$%) {
449 my ($self, $id, %msg) = @_;
450
451 $msg{msgid} = $id;
452
453 $self->send ("ext " . to_json \%msg);
379} 454}
380 455
381############################################################################# 456#############################################################################
382# map scripting support 457# map scripting support
383 458
… …
386 461
387$SIG{FPE} = 'IGNORE'; 462$SIG{FPE} = 'IGNORE';
388 463
389$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 464$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
390 465
391# here we would export the classes and methods available to script code 466# here we export the classes and methods available to script code
392#@ext::cf::object::player::ISA = @cf::object::player::ISA; 467
393#@ext::cf::object::map::ISA = @cf::object::map::ISA; 468for (
469 ["cf::object" => qw(contr pay_amount pay_player)],
470 ["cf::object::player" => qw(player)],
471 ["cf::player" => qw(peaceful)],
472) {
473 no strict 'refs';
474 my ($pkg, @funs) = @$_;
475 *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
476 for @funs;
477}
394 478
395sub safe_eval($;@) { 479sub safe_eval($;@) {
396 my ($code, %vars) = @_; 480 my ($code, %vars) = @_;
397 481
398 my $qcode = $code; 482 my $qcode = $code;
… …
400 $qcode =~ s/\n/\\n/g; 484 $qcode =~ s/\n/\\n/g;
401 485
402 local $_; 486 local $_;
403 local @ext::cf::_safe_eval_args = values %vars; 487 local @ext::cf::_safe_eval_args = values %vars;
404 488
405 $safe->reval ( 489 $code =
406 "do {\n" 490 "do {\n"
407 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 491 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
408 . "#line 0 \"{$qcode}\"\n" 492 . "#line 0 \"{$qcode}\"\n"
409 . $code 493 . $code
410 . "\n}" 494 . "\n}"
411 ) 495 ;
496
497 sub_generation_inc;
498 my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code);
499 sub_generation_inc;
500
501 wantarray ? @res : $res[0]
412} 502}
413 503
414sub register_script_function { 504sub register_script_function {
415 my ($fun, $cb) = @_; 505 my ($fun, $cb) = @_;
416 506
… …
421############################################################################# 511#############################################################################
422# initialisation 512# initialisation
423 513
424register "<global>", __PACKAGE__; 514register "<global>", __PACKAGE__;
425 515
426unshift @INC, maps_directory "perl"; 516unshift @INC, $LIBDIR;
427 517
428load_extensions; 518load_extensions;
429 519
4301 5201
431 521

Diff Legend

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