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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines