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.17 by root, Mon Jun 19 10:20:07 2006 UTC vs.
Revision 1.54 by root, Tue Aug 29 14:49:28 2006 UTC

1package cf; 1package cf;
2 2
3use Symbol; 3use Symbol;
4use List::Util; 4use List::Util;
5use Storable; 5use Storable;
6use Opcode;
7use Safe;
8use Safe::Hole;
9
10use Time::HiRes;
11use Event;
12$Event::Eval = 1; # no idea why this is required, but it is
6 13
7use strict; 14use strict;
8 15
16_reload_1;
17
9our %COMMAND; 18our %COMMAND = ();
10our @EVENT; 19our @EVENT;
11our %PROP_TYPE; 20our %PROP_TYPE;
12our %PROP_IDX; 21our %PROP_IDX;
22our $LIBDIR = maps_directory "perl";
23
24our $TICK = MAX_TIME * 1e-6;
25our $TICK_WATCHER;
26our $NEXT_TICK;
13 27
14BEGIN { 28BEGIN {
15 @EVENT = map lc, @EVENT;
16
17 *CORE::GLOBAL::warn = sub { 29 *CORE::GLOBAL::warn = sub {
18 my $msg = join "", @_; 30 my $msg = join "", @_;
19 $msg .= "\n" 31 $msg .= "\n"
20 unless $msg =~ /\n$/; 32 unless $msg =~ /\n$/;
21 33
56prop_gen PLAYER_PROP => "cf::object::player"; 68prop_gen PLAYER_PROP => "cf::object::player";
57 69
58prop_gen MAP_PROP => "cf::map"; 70prop_gen MAP_PROP => "cf::map";
59prop_gen ARCH_PROP => "cf::arch"; 71prop_gen ARCH_PROP => "cf::arch";
60 72
61# guessed hierarchies 73@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
62 74
63@cf::object::player::ISA = 'cf::object'; 75# we bless all objects into (empty) derived classes to force a method lookup
64@cf::object::map::ISA = 'cf::object'; 76# within the Safe compartment.
77for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) {
78 no strict 'refs';
79 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
80}
81
82$Event::DIED = sub {
83 warn "error in event callback: @_";
84};
65 85
66my %ext_pkg; 86my %ext_pkg;
67my @exts; 87my @exts;
68my @hook; 88my @hook;
69my %command; 89my %command;
70my %extcmd; 90my %extcmd;
71 91
92#############################################################################
93# utility functions
94
95use JSON::Syck (); # TODO# replace by JSON::PC once working
96
97sub from_json($) {
98 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
99 JSON::Syck::Load $_[0]
100}
101
102sub to_json($) {
103 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
104 JSON::Syck::Dump $_[0]
105}
106
107#############################################################################
108# "new" plug-in system
109
110=item $object->attach ($attachment, key => $value...)
111
112=item $object->detach ($attachment)
113
114Attach/detach a pre-registered attachment to an object.
115
116=item $player->attach ($attachment, key => $value...)
117
118=item $player->detach ($attachment)
119
120Attach/detach a pre-registered attachment to a player.
121
122=item $map->attach ($attachment, key => $value...)
123
124=item $map->detach ($attachment)
125
126Attach/detach a pre-registered attachment to a map.
127
128=item cf::attach_global ...
129
130Attach handlers for global events.
131
132This and all following C<attach_*>-functions expect any number of the
133following handler/hook descriptions:
134
135=over 4
136
137=item prio => $number
138
139Set the priority for all following handlers/hooks (unless overwritten
140by another C<prio> setting). Lower priority handlers get executed
141earlier. The default priority is C<0>, and many built-in handlers are
142registered at priority C<-1000>, so lower priorities should not be used
143unless you know what you are doing.
144
145=item on_I<event> => \&cb
146
147Call the given code reference whenever the named event happens (event is
148something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
149handlers are recognised generally depends on the type of object these
150handlers attach to).
151
152See F<include/eventinc.h> for the full list of events supported, and their
153class.
154
155=item package => package::
156
157Look for sub functions of the name C<< on_I<event> >> in the given
158package and register them. Only handlers for eevents supported by the
159object/class are recognised.
160
161=back
162
163=item cf::attach_to_type $object_type, $subtype, ...
164
165Attach handlers for a specific object type (e.g. TRANSPORT) and
166subtype. If C<$subtype> is zero or undef, matches all objects of the given
167type.
168
169=item cf::attach_to_objects ...
170
171Attach handlers to all objects. Do not use this except for debugging or
172very rare events, as handlers are (obviously) called for I<all> objects in
173the game.
174
175=item cf::attach_to_players ...
176
177Attach handlers to all players.
178
179=item cf::attach_to_maps ...
180
181Attach handlers to all maps.
182
183=item cf:register_attachment $name, ...
184
185Register an attachment by name through which objects can refer to this
186attachment.
187
188=item cf:register_map_attachment $name, ...
189
190Register an attachment by name through which maps can refer to this
191attachment.
192
193=cut
194
195# the following variables are defined in .xs and must not be re-created
196our @CB_GLOBAL = (); # registry for all global events
197our @CB_OBJECT = (); # all objects (should not be used except in emergency)
198our @CB_PLAYER = ();
199our @CB_TYPE = (); # registry for type (cf-object class) based events
200our @CB_MAP = ();
201
202my %attachment;
203
204sub _attach_cb($\%$$$) {
205 my ($registry, $undo, $event, $prio, $cb) = @_;
206
207 use sort 'stable';
208
209 $cb = [$prio, $cb];
210
211 @{$registry->[$event]} = sort
212 { $a->[0] cmp $b->[0] }
213 @{$registry->[$event] || []}, $cb;
214
215 push @{$undo->{cb}}, [$event, $cb];
216}
217
218# attach handles attaching event callbacks
219# the only thing the caller has to do is pass the correct
220# registry (== where the callback attaches to).
221sub _attach(\@$@) {
222 my ($registry, $klass, @arg) = @_;
223
224 my $prio = 0;
225
226 my %undo = (
227 registry => $registry,
228 cb => [],
229 );
230
231 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
232
233 while (@arg) {
234 my $type = shift @arg;
235
236 if ($type eq "prio") {
237 $prio = shift @arg;
238
239 } elsif ($type eq "package") {
240 my $pkg = shift @arg;
241
242 while (my ($name, $id) = each %cb_id) {
243 if (my $cb = $pkg->can ($name)) {
244 _attach_cb $registry, %undo, $id, $prio, $cb;
245 }
246 }
247
248 } elsif (exists $cb_id{$type}) {
249 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
250
251 } elsif (ref $type) {
252 warn "attaching objects not supported, ignoring.\n";
253
254 } else {
255 shift @arg;
256 warn "attach argument '$type' not supported, ignoring.\n";
257 }
258 }
259
260 \%undo
261}
262
263sub _attach_attachment {
264 my ($obj, $name, %arg) = @_;
265
266 my $res;
267
268 if (my $attach = $attachment{$name}) {
269 my $registry = $obj->registry;
270
271 for (@$attach) {
272 my ($klass, @attach) = @$_;
273 $res = _attach @$registry, $klass, @attach;
274 }
275
276 $obj->{$name} = \%arg;
277 } else {
278 warn "object uses attachment '$name' that is not available, postponing.\n";
279 }
280
281 $obj->{_attachment}{$name} = undef;
282
283 $res->{attachment} = $name;
284 $res
285}
286
287*cf::object::attach =
288*cf::player::attach =
289*cf::map::attach = sub {
290 my ($obj, $name, %arg) = @_;
291
292 _attach_attachment $obj, $name, %arg;
293}
294
295# all those should be optimised
296*cf::object::detach =
297*cf::player::detach =
298*cf::map::detach = sub {
299 my ($obj, $name) = @_;
300
301 delete $obj->{_attachment}{$name};
302 reattach $obj;
303};
304
305sub attach_global {
306 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
307}
308
309sub attach_to_type {
310 my $type = shift;
311 my $subtype = shift;
312
313 _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
314}
315
316sub attach_to_objects {
317 _attach @CB_OBJECT, KLASS_OBJECT, @_
318}
319
320sub attach_to_players {
321 _attach @CB_PLAYER, KLASS_PLAYER, @_
322}
323
324sub attach_to_maps {
325 _attach @CB_MAP, KLASS_MAP, @_
326}
327
328sub register_attachment {
329 my $name = shift;
330
331 $attachment{$name} = [[KLASS_OBJECT, @_]];
332}
333
334sub register_map_attachment {
335 my $name = shift;
336
337 $attachment{$name} = [[KLASS_MAP, @_]];
338}
339
340our $override;
341our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
342
343sub override {
344 $override = 1;
345 @invoke_results = ();
346}
347
348sub do_invoke {
349 my $event = shift;
350 my $callbacks = shift;
351
352 @invoke_results = ();
353
354 local $override;
355
356 for (@$callbacks) {
357 eval { &{$_->[1]} };
358
359 if ($@) {
360 warn "$@";
361 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
362 override;
363 }
364
365 return 1 if $override;
366 }
367
368 0
369}
370
371#############################################################################
372# object support
373
374sub instantiate {
375 my ($obj, $data) = @_;
376
377 $data = from_json $data;
378
379 for (@$data) {
380 my ($name, $args) = @$_;
381
382 $obj->attach ($name, %{$args || {} });
383 }
384}
385
386# basically do the same as instantiate, without calling instantiate
387sub reattach {
388 my ($obj) = @_;
389 my $registry = $obj->registry;
390
391 @$registry = ();
392
393 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
394
395 for my $name (keys %{ $obj->{_attachment} || {} }) {
396 if (my $attach = $attachment{$name}) {
397 for (@$attach) {
398 my ($klass, @attach) = @$_;
399 _attach @$registry, $klass, @attach;
400 }
401 } else {
402 warn "object uses attachment '$name' that is not available, postponing.\n";
403 }
404 }
405}
406
407sub object_freezer_save {
408 my ($filename, $objs) = @_;
409
410 if (@$objs) {
411 open my $fh, ">:raw", "$filename.pst~";
412 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
413 close $fh;
414 chmod SAVE_MODE, "$filename.pst~";
415 rename "$filename.pst~", "$filename.pst";
416 } else {
417 unlink "$filename.pst";
418 }
419
420 chmod SAVE_MODE, "$filename~";
421 rename "$filename~", $filename;
422}
423
424sub object_thawer_load {
425 my ($filename) = @_;
426
427 open my $fh, "<:raw:perlio", "$filename.pst"
428 or return;
429
430 eval { local $/; (Storable::thaw <$fh>)->{objs} }
431}
432
433attach_to_objects
434 prio => -1000000,
435 on_clone => sub {
436 my ($src, $dst) = @_;
437
438 @{$dst->registry} = @{$src->registry};
439
440 %$dst = %$src;
441
442 %{$dst->{_attachment}} = %{$src->{_attachment}}
443 if exists $src->{_attachment};
444 },
445;
446
447#############################################################################
448# old plug-in events
449
72sub inject_event { 450sub inject_event {
73 my $extension = shift; 451 my $extension = shift;
74 my $event_code = shift; 452 my $event_code = shift;
75 453
76 my $cb = $hook[$event_code]{$extension} 454 my $cb = $hook[$event_code]{$extension}
118} 496}
119 497
120sub register { 498sub register {
121 my ($base, $pkg) = @_; 499 my ($base, $pkg) = @_;
122 500
123 for my $idx (0 .. $#EVENT) { 501 #TODO
124 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
125 #warn "registering $EVENT[$idx] hook to '$pkg'\n";
126 $hook[$idx]{$base} = $ref;
127 }
128 }
129} 502}
130 503
131sub load_extension { 504sub load_extension {
132 my ($path) = @_; 505 my ($path) = @_;
133 506
134 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 507 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
135 my $base = $1; 508 my $base = $1;
136 my $pkg = $1; 509 my $pkg = $1;
137 $pkg =~ s/[^[:word:]]/_/g; 510 $pkg =~ s/[^[:word:]]/_/g;
138 $pkg = "cf::ext::$pkg"; 511 $pkg = "ext::$pkg";
139 512
140 warn "loading '$path' into '$pkg'\n"; 513 warn "loading '$path' into '$pkg'\n";
141 514
142 open my $fh, "<:utf8", $path 515 open my $fh, "<:utf8", $path
143 or die "$path: $!"; 516 or die "$path: $!";
153 526
154 push @exts, $pkg; 527 push @exts, $pkg;
155 $ext_pkg{$base} = $pkg; 528 $ext_pkg{$base} = $pkg;
156 529
157# no strict 'refs'; 530# no strict 'refs';
158# @{"$pkg\::ISA"} = cf::ext::; 531# @{"$pkg\::ISA"} = ext::;
159 532
160 register $base, $pkg; 533 register $base, $pkg;
161} 534}
162 535
163sub unload_extension { 536sub unload_extension {
164 my ($pkg) = @_; 537 my ($pkg) = @_;
165 538
166 warn "removing extension $pkg\n"; 539 warn "removing extension $pkg\n";
167 540
168 # remove hooks 541 # remove hooks
542 #TODO
169 for my $idx (0 .. $#EVENT) { 543# for my $idx (0 .. $#PLUGIN_EVENT) {
170 delete $hook[$idx]{$pkg}; 544# delete $hook[$idx]{$pkg};
171 } 545# }
172 546
173 # remove commands 547 # remove commands
174 for my $name (keys %command) { 548 for my $name (keys %command) {
175 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 549 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
176 550
186 # remove extcmds 560 # remove extcmds
187 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 561 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
188 delete $extcmd{$name}; 562 delete $extcmd{$name};
189 } 563 }
190 564
565 if (my $cb = $pkg->can ("unload")) {
566 eval {
567 $cb->($pkg);
568 1
569 } or warn "$pkg unloaded, but with errors: $@";
570 }
571
191 Symbol::delete_package $pkg; 572 Symbol::delete_package $pkg;
192} 573}
193 574
194sub load_extensions { 575sub load_extensions {
195 my $LIBDIR = maps_directory "perl"; 576 my $LIBDIR = maps_directory "perl";
201 1 582 1
202 } or warn "$ext not loaded: $@"; 583 } or warn "$ext not loaded: $@";
203 } 584 }
204} 585}
205 586
587sub _perl_reload(&) {
588 my ($msg) = @_;
589
590 $msg->("reloading...");
591
592 eval {
593 # 1. cancel all watchers
594 $_->cancel for Event::all_watchers;
595
596 # 2. unload all extensions
597 for (@exts) {
598 $msg->("unloading <$_>");
599 unload_extension $_;
600 }
601
602 # 3. unload all modules loaded from $LIBDIR
603 while (my ($k, $v) = each %INC) {
604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
605
606 $msg->("removing <$k>");
607 delete $INC{$k};
608
609 $k =~ s/\.pm$//;
610 $k =~ s/\//::/g;
611
612 if (my $cb = $k->can ("unload_module")) {
613 $cb->();
614 }
615
616 Symbol::delete_package $k;
617 }
618
619 # 4. get rid of safe::, as good as possible
620 Symbol::delete_package "safe::$_"
621 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
622
623 # 5. remove register_script_function callbacks
624 # TODO
625
626 # 6. unload cf.pm "a bit"
627 delete $INC{"cf.pm"};
628
629 # don't, removes xs symbols, too,
630 # and global variables created in xs
631 #Symbol::delete_package __PACKAGE__;
632
633 # 7. reload cf.pm
634 $msg->("reloading cf.pm");
635 require cf;
636 };
637 $msg->($@) if $@;
638
639 $msg->("reloaded");
640};
641
642sub perl_reload() {
643 _perl_reload {
644 warn $_[0];
645 print "$_[0]\n";
646 };
647}
648
206register_command "perl-reload", 0, sub { 649register_command "perl-reload", 0, sub {
207 my ($who, $arg) = @_; 650 my ($who, $arg) = @_;
208 651
209 if ($who->flag (FLAG_WIZ)) { 652 if ($who->flag (FLAG_WIZ)) {
210 $who->message ("reloading..."); 653 _perl_reload {
211 654 warn $_[0];
212 warn "reloading...\n"; 655 $who->message ($_[0]);
213 eval {
214 unload_extension $_ for @exts;
215 delete $INC{"cf.pm"};
216
217 # don't, removes xs symbols, too
218 #Symbol::delete_package $pkg;
219
220 require cf;
221 }; 656 };
222 warn $@ if $@;
223 $who->message ($@) if $@;
224 warn "reloaded\n";
225
226 $who->message ("reloaded");
227 } else {
228 $who->message ("Intruder Alert!");
229 } 657 }
230}; 658};
231 659
232############################################################################# 660#############################################################################
233# extcmd framework, basically convert ext <id> <pkg> arg1 args 661# extcmd framework, basically convert ext <msg>
234# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 662# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
235 663
236sub on_extcmd { 664attach_to_players
665 on_extcmd => sub {
237 my ($pl, $buf) = @_; 666 my ($pl, $buf) = @_;
238 667
239 my ($type) = $buf =~ s/^(\S+) // ? $1 : ""; 668 my $msg = eval { from_json $buf };
240 669
241 $extcmd{$type}[0]->($pl, $buf) 670 if (ref $msg) {
242 if $extcmd{$type}; 671 if (my $cb = $extcmd{$msg->{msgtype}}) {
243} 672 if (my %reply = $cb->[0]->($pl, $msg)) {
673 $pl->ext_reply ($msg->{msgid}, %reply);
674 }
675 }
676 } else {
677 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
678 }
679
680 cf::override;
681 },
682;
244 683
245############################################################################# 684#############################################################################
246# load/save/clean perl data associated with a map 685# load/save/clean perl data associated with a map
247 686
248*on_mapclean = sub { 687*cf::mapsupport::on_clean = sub {
249 my ($map) = @_; 688 my ($map) = @_;
250 689
251 my $path = $map->tmpname; 690 my $path = $map->tmpname;
252 defined $path or return; 691 defined $path or return;
253 692
254 unlink "$path.cfperl"; 693 unlink "$path.pst";
255}; 694};
256 695
257*on_mapin = 696# old style persistent data, TODO: remove #d#
258*on_mapload = sub { 697*cf::mapsupport::on_swapin =
698*cf::mapsupport::on_load = sub {
259 my ($map) = @_; 699 my ($map) = @_;
260 700
261 my $path = $map->tmpname; 701 my $path = $map->tmpname;
262 $path = $map->path unless defined $path; 702 $path = $map->path unless defined $path;
263 703
268 708
269 $data->{version} <= 1 709 $data->{version} <= 1
270 or return; # too new 710 or return; # too new
271 711
272 $map->_set_obs ($data->{obs}); 712 $map->_set_obs ($data->{obs});
713 $map->invoke (EVENT_MAP_UPGRADE);
273}; 714};
274 715
275*on_mapout = sub { 716attach_to_maps prio => -10000, package => cf::mapsupport::;
276 my ($map) = @_;
277 717
278 my $path = $map->tmpname; 718#############################################################################
279 $path = $map->path unless defined $path; 719# load/save perl data associated with player->ob objects
280 720
281 my $obs = $map->_get_obs; 721sub all_objects(@) {
722 @_, map all_objects ($_->inv), @_
723}
282 724
283 if (defined $obs) { 725attach_to_players
284 open my $fh, ">:raw", "$path.cfperl" 726 on_load => sub {
285 or die "$path.cfperl: $!"; 727 my ($pl, $path) = @_;
286 728
287 stat $path; 729 for my $o (all_objects $pl->ob) {
730 if (my $value = $o->get_ob_key_value ("_perl_data")) {
731 $o->set_ob_key_value ("_perl_data");
288 732
289 print $fh Storable::nfreeze { 733 %$o = %{ Storable::thaw pack "H*", $value };
290 size => (stat _)[7], 734 }
291 time => (stat _)[9],
292 version => 1,
293 obs => $obs,
294 }; 735 }
736 },
737;
295 738
296 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g* 739#############################################################################
740# core extensions - in perl
741
742=item cf::player::exists $login
743
744Returns true when the given account exists.
745
746=cut
747
748sub cf::player::exists($) {
749 cf::player::find $_[0]
750 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
751}
752
753=item $player->reply ($npc, $msg[, $flags])
754
755Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
756can be C<undef>. Does the right thing when the player is currently in a
757dialogue with the given NPC character.
758
759=cut
760
761# rough implementation of a future "reply" method that works
762# with dialog boxes.
763sub cf::object::player::reply($$$;$) {
764 my ($self, $npc, $msg, $flags) = @_;
765
766 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
767
768 if ($self->{record_replies}) {
769 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
297 } else { 770 } else {
298 unlink "$path.cfperl"; 771 $msg = $npc->name . " says: $msg" if $npc;
772 $self->message ($msg, $flags);
299 } 773 }
300}; 774}
301 775
302############################################################################# 776=item $player->ext_reply ($msgid, $msgtype, %msg)
303# load/save perl data associated with player->ob objects
304 777
305*on_player_load = sub { 778Sends an ext reply to the player.
779
780=cut
781
782sub cf::player::ext_reply($$$%) {
783 my ($self, $id, %msg) = @_;
784
785 $msg{msgid} = $id;
786
787 $self->send ("ext " . to_json \%msg);
788}
789
790#############################################################################
791# map scripting support
792
793our $safe = new Safe "safe";
794our $safe_hole = new Safe::Hole;
795
796$SIG{FPE} = 'IGNORE';
797
798$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
799
800# here we export the classes and methods available to script code
801
802for (
803 ["cf::object" => qw(contr pay_amount pay_player)],
804 ["cf::object::player" => qw(player)],
805 ["cf::player" => qw(peaceful)],
806) {
807 no strict 'refs';
808 my ($pkg, @funs) = @$_;
809 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
810 for @funs;
811}
812
813sub safe_eval($;@) {
306 my ($ob, $path) = @_; 814 my ($code, %vars) = @_;
307 815
308 if (open my $fh, "<:raw", "$path.cfperl") { 816 my $qcode = $code;
817 $qcode =~ s/"/‟/g; # not allowed in #line filenames
818 $qcode =~ s/\n/\\n/g;
309 819
310 #d##TODO#remove 820 local $_;
821 local @safe::cf::_safe_eval_args = values %vars;
311 822
312 my $data = Storable::thaw do { local $/; <$fh> }; 823 my $eval =
313 824 "do {\n"
314 $data->{version} <= 1 825 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
315 or return; # too new 826 . "#line 0 \"{$qcode}\"\n"
316 827 . $code
317 %$ob = %{$data->{ob}}; 828 . "\n}"
318 return;
319 } 829 ;
320 830
321 for my $o ($ob, $ob->inv) { 831 sub_generation_inc;
322 if (my $value = $o->get_ob_key_value ("_perl_data")) { 832 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
323 $o->set_ob_key_value ("_perl_data"); 833 sub_generation_inc;
324 834
325 %$o = %{ Storable::thaw pack "H*", $value }; 835 if ($@) {
326 } 836 warn "$@";
837 warn "while executing safe code '$code'\n";
838 warn "with arguments " . (join " ", %vars) . "\n";
327 } 839 }
328};
329 840
330*on_player_save = sub { 841 wantarray ? @res : $res[0]
331 my ($ob, $path) = @_; 842}
332 843
333 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_) 844sub register_script_function {
334 for grep %$_, $ob, $ob->inv; 845 my ($fun, $cb) = @_;
335 846
336 unlink "$path.cfperl";#d##TODO#remove 847 no strict 'refs';
337}; 848 *{"safe::$fun"} = $safe_hole->wrap ($cb);
849}
850
851#############################################################################
852# the server's main()
853
854sub main {
855 Event::loop;
856}
857
858#############################################################################
859# initialisation
338 860
339register "<global>", __PACKAGE__; 861register "<global>", __PACKAGE__;
340 862
341unshift @INC, maps_directory "perl"; 863unshift @INC, $LIBDIR;
342 864
343load_extensions; 865load_extensions;
344 866
867$TICK_WATCHER = Event->timer (
868 prio => 1,
869 at => $NEXT_TICK || 1,
870 cb => sub {
871 cf::server_tick; # one server iteration
872
873 my $NOW = Event::time;
874 $NEXT_TICK += $TICK;
875
876 # if we are delayed by four ticks, skip them all
877 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
878
879 $TICK_WATCHER->at ($NEXT_TICK);
880 $TICK_WATCHER->start;
881 },
882);
883
884_reload_2;
885
3451 8861
346 887

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines