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.36 by root, Thu Aug 24 14:04:29 2006 UTC vs.
Revision 1.62 by root, Fri Sep 8 16:51:44 2006 UTC

11use Event; 11use Event;
12$Event::Eval = 1; # no idea why this is required, but it is 12$Event::Eval = 1; # no idea why this is required, but it is
13 13
14use strict; 14use strict;
15 15
16_reload_1;
17
16our %COMMAND; 18our %COMMAND = ();
17our @EVENT; 19our @EVENT;
18our %PROP_TYPE;
19our %PROP_IDX;
20our $LIBDIR = maps_directory "perl"; 20our $LIBDIR = maps_directory "perl";
21 21
22our $TICK = MAX_TIME * 1e-6; 22our $TICK = MAX_TIME * 1e-6;
23our $TICK_WATCHER; 23our $TICK_WATCHER;
24our $NEXT_TICK; 24our $NEXT_TICK;
25 25
26BEGIN { 26BEGIN {
27 @EVENT = map lc, @EVENT;
28
29 *CORE::GLOBAL::warn = sub { 27 *CORE::GLOBAL::warn = sub {
30 my $msg = join "", @_; 28 my $msg = join "", @_;
31 $msg .= "\n" 29 $msg .= "\n"
32 unless $msg =~ /\n$/; 30 unless $msg =~ /\n$/;
33 31
34 print STDERR "cfperl: $msg"; 32 print STDERR "cfperl: $msg";
35 LOG llevError, "cfperl: $msg"; 33 LOG llevError, "cfperl: $msg";
36 }; 34 };
37} 35}
38 36
39my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply! 37@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
40 38
41# generate property mutators 39# we bless all objects into (empty) derived classes to force a method lookup
42sub prop_gen { 40# within the Safe compartment.
43 my ($prefix, $class) = @_; 41for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) {
44
45 no strict 'refs'; 42 no strict 'refs';
46
47 for my $prop (keys %PROP_TYPE) {
48 $prop =~ /^\Q$prefix\E_(.*$)/ or next;
49 my $sub = lc $1;
50
51 my $type = $PROP_TYPE{$prop};
52 my $idx = $PROP_IDX {$prop};
53
54 *{"$class\::get_$sub"} = *{"$class\::$sub"} = sub {
55 $_[0]->get_property ($type, $idx)
56 };
57
58 *{"$class\::set_$sub"} = sub {
59 $_[0]->set_property ($type, $idx, $_[1]);
60 } unless $ignore_set{$prop};
61 }
62}
63
64# auto-generate most of the API
65
66prop_gen OBJECT_PROP => "cf::object";
67# CFAPI_OBJECT_ANIMATION?
68prop_gen PLAYER_PROP => "cf::object::player";
69
70prop_gen MAP_PROP => "cf::map";
71prop_gen ARCH_PROP => "cf::arch";
72
73# guessed hierarchies
74
75@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
76@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
77
78# we bless all objects into derived classes to force a method lookup
79# within the Safe compartment.
80for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
81 no strict 'refs';
82 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 43 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
83} 44}
84 45
85$Event::DIED = sub { 46$Event::DIED = sub {
86 warn "error in event callback: @_"; 47 warn "error in event callback: @_";
87}; 48};
90my @exts; 51my @exts;
91my @hook; 52my @hook;
92my %command; 53my %command;
93my %extcmd; 54my %extcmd;
94 55
56#############################################################################
57# utility functions
58
59use JSON::Syck (); # TODO# replace by JSON::PC once working
60
61sub from_json($) {
62 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
63 JSON::Syck::Load $_[0]
64}
65
66sub to_json($) {
67 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
68 JSON::Syck::Dump $_[0]
69}
70
71#############################################################################
72# "new" plug-in system
73
74=head3 EVENTS AND OBJECT ATTACHMENTS
75
76=over 4
77
78=item $object->attach ($attachment, key => $value...)
79
80=item $object->detach ($attachment)
81
82Attach/detach a pre-registered attachment to an object.
83
84=item $player->attach ($attachment, key => $value...)
85
86=item $player->detach ($attachment)
87
88Attach/detach a pre-registered attachment to a player.
89
90=item $map->attach ($attachment, key => $value...)
91
92=item $map->detach ($attachment)
93
94Attach/detach a pre-registered attachment to a map.
95
96=item $bool = $object->attached ($name)
97
98=item $bool = $player->attached ($name)
99
100=item $bool = $map->attached ($name)
101
102Checks wether the named attachment is currently attached to the object.
103
104=item cf::attach_global ...
105
106Attach handlers for global events.
107
108This and all following C<attach_*>-functions expect any number of the
109following handler/hook descriptions:
110
111=over 4
112
113=item prio => $number
114
115Set the priority for all following handlers/hooks (unless overwritten
116by another C<prio> setting). Lower priority handlers get executed
117earlier. The default priority is C<0>, and many built-in handlers are
118registered at priority C<-1000>, so lower priorities should not be used
119unless you know what you are doing.
120
121=item on_I<event> => \&cb
122
123Call the given code reference whenever the named event happens (event is
124something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
125handlers are recognised generally depends on the type of object these
126handlers attach to).
127
128See F<include/eventinc.h> for the full list of events supported, and their
129class.
130
131=item package => package::
132
133Look for sub functions of the name C<< on_I<event> >> in the given
134package and register them. Only handlers for eevents supported by the
135object/class are recognised.
136
137=back
138
139=item cf::attach_to_type $object_type, $subtype, ...
140
141Attach handlers for a specific object type (e.g. TRANSPORT) and
142subtype. If C<$subtype> is zero or undef, matches all objects of the given
143type.
144
145=item cf::attach_to_objects ...
146
147Attach handlers to all objects. Do not use this except for debugging or
148very rare events, as handlers are (obviously) called for I<all> objects in
149the game.
150
151=item cf::attach_to_players ...
152
153Attach handlers to all players.
154
155=item cf::attach_to_maps ...
156
157Attach handlers to all maps.
158
159=item cf:register_attachment $name, ...
160
161Register an attachment by name through which objects can refer to this
162attachment.
163
164=item cf:register_player_attachment $name, ...
165
166Register an attachment by name through which players can refer to this
167attachment.
168
169=item cf:register_map_attachment $name, ...
170
171Register an attachment by name through which maps can refer to this
172attachment.
173
174=cut
175
176# the following variables are defined in .xs and must not be re-created
177our @CB_GLOBAL = (); # registry for all global events
178our @CB_OBJECT = (); # all objects (should not be used except in emergency)
179our @CB_PLAYER = ();
180our @CB_TYPE = (); # registry for type (cf-object class) based events
181our @CB_MAP = ();
182
183my %attachment;
184
185sub _attach_cb($\%$$$) {
186 my ($registry, $undo, $event, $prio, $cb) = @_;
187
188 use sort 'stable';
189
190 $cb = [$prio, $cb];
191
192 @{$registry->[$event]} = sort
193 { $a->[0] cmp $b->[0] }
194 @{$registry->[$event] || []}, $cb;
195
196 push @{$undo->{cb}}, [$event, $cb];
197}
198
199# attach handles attaching event callbacks
200# the only thing the caller has to do is pass the correct
201# registry (== where the callback attaches to).
202sub _attach(\@$@) {
203 my ($registry, $klass, @arg) = @_;
204
205 my $prio = 0;
206
207 my %undo = (
208 registry => $registry,
209 cb => [],
210 );
211
212 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
213
214 while (@arg) {
215 my $type = shift @arg;
216
217 if ($type eq "prio") {
218 $prio = shift @arg;
219
220 } elsif ($type eq "package") {
221 my $pkg = shift @arg;
222
223 while (my ($name, $id) = each %cb_id) {
224 if (my $cb = $pkg->can ($name)) {
225 _attach_cb $registry, %undo, $id, $prio, $cb;
226 }
227 }
228
229 } elsif (exists $cb_id{$type}) {
230 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
231
232 } elsif (ref $type) {
233 warn "attaching objects not supported, ignoring.\n";
234
235 } else {
236 shift @arg;
237 warn "attach argument '$type' not supported, ignoring.\n";
238 }
239 }
240
241 \%undo
242}
243
244sub _attach_attachment {
245 my ($obj, $name, %arg) = @_;
246
247 return if exists $obj->{_attachment}{$name};
248
249 my $res;
250
251 if (my $attach = $attachment{$name}) {
252 my $registry = $obj->registry;
253
254 for (@$attach) {
255 my ($klass, @attach) = @$_;
256 $res = _attach @$registry, $klass, @attach;
257 }
258
259 $obj->{$name} = \%arg;
260 } else {
261 warn "object uses attachment '$name' that is not available, postponing.\n";
262 }
263
264 $obj->{_attachment}{$name} = undef;
265
266 $res->{attachment} = $name;
267 $res
268}
269
270*cf::object::attach =
271*cf::player::attach =
272*cf::map::attach = sub {
273 my ($obj, $name, %arg) = @_;
274
275 _attach_attachment $obj, $name, %arg;
276};
277
278# all those should be optimised
279*cf::object::detach =
280*cf::player::detach =
281*cf::map::detach = sub {
282 my ($obj, $name) = @_;
283
284 delete $obj->{_attachment}{$name};
285 reattach ($obj);
286};
287
288*cf::object::attached =
289*cf::player::attached =
290*cf::map::attached = sub {
291 my ($obj, $name) = @_;
292
293 exists $obj->{_attachment}{$name}
294};
295
296sub attach_global {
297 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
298}
299
300sub attach_to_type {
301 my $type = shift;
302 my $subtype = shift;
303
304 _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
305}
306
307sub attach_to_objects {
308 _attach @CB_OBJECT, KLASS_OBJECT, @_
309}
310
311sub attach_to_players {
312 _attach @CB_PLAYER, KLASS_PLAYER, @_
313}
314
315sub attach_to_maps {
316 _attach @CB_MAP, KLASS_MAP, @_
317}
318
319sub register_attachment {
320 my $name = shift;
321
322 $attachment{$name} = [[KLASS_OBJECT, @_]];
323}
324
325sub register_player_attachment {
326 my $name = shift;
327
328 $attachment{$name} = [[KLASS_PLAYER, @_]];
329}
330
331sub register_map_attachment {
332 my $name = shift;
333
334 $attachment{$name} = [[KLASS_MAP, @_]];
335}
336
337our $override;
338our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
339
340sub override {
341 $override = 1;
342 @invoke_results = ();
343}
344
345sub do_invoke {
346 my $event = shift;
347 my $callbacks = shift;
348
349 @invoke_results = ();
350
351 local $override;
352
353 for (@$callbacks) {
354 eval { &{$_->[1]} };
355
356 if ($@) {
357 warn "$@";
358 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
359 override;
360 }
361
362 return 1 if $override;
363 }
364
365 0
366}
367
368=item $bool = cf::invoke EVENT_GLOBAL_XXX, ...
369
370=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...)
371
372=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...)
373
374=item $bool = $map->invoke (EVENT_MAP_XXX, ...)
375
376Generate a global/object/player/map-specific event with the given arguments.
377
378This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be
379removed in future versions), and there is no public API to access override
380results (if you must, access C<@cf::invoke_results> directly).
381
382=back
383
384=head2 methods valid for all pointers
385
386=over 4
387
388=item $object->valid
389
390=item $player->valid
391
392=item $map->valid
393
394Just because you have a perl object does not mean that the corresponding
395C-level object still exists. If you try to access an object that has no
396valid C counterpart anymore you get an exception at runtime. This method
397can be used to test for existence of the C object part without causing an
398exception.
399
400=back
401
402=cut
403
404*cf::object::valid =
405*cf::player::valid =
406*cf::map::valid = \&cf::_valid;
407
408#############################################################################
409# object support
410
411sub instantiate {
412 my ($obj, $data) = @_;
413
414 $data = from_json $data;
415
416 for (@$data) {
417 my ($name, $args) = @$_;
418
419 $obj->attach ($name, %{$args || {} });
420 }
421}
422
423# basically do the same as instantiate, without calling instantiate
424sub reattach {
425 my ($obj) = @_;
426 my $registry = $obj->registry;
427
428 @$registry = ();
429
430 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
431
432 for my $name (keys %{ $obj->{_attachment} || {} }) {
433 if (my $attach = $attachment{$name}) {
434 for (@$attach) {
435 my ($klass, @attach) = @$_;
436 _attach @$registry, $klass, @attach;
437 }
438 } else {
439 warn "object uses attachment '$name' that is not available, postponing.\n";
440 }
441 }
442}
443
444sub object_freezer_save {
445 my ($filename, $rdata, $objs) = @_;
446
447 if (length $$rdata) {
448 warn sprintf "saving %s (%d,%d)\n",
449 $filename, length $$rdata, scalar @$objs;
450
451 if (open my $fh, ">:raw", "$filename~") {
452 chmod SAVE_MODE, $fh;
453 syswrite $fh, $$rdata;
454 close $fh;
455
456 if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
457 chmod SAVE_MODE, $fh;
458 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
459 close $fh;
460 rename "$filename.pst~", "$filename.pst";
461 } else {
462 unlink "$filename.pst";
463 }
464
465 rename "$filename~", $filename;
466 } else {
467 warn "FATAL: $filename~: $!\n";
468 }
469 } else {
470 unlink $filename;
471 unlink "$filename.pst";
472 }
473}
474
475sub object_thawer_load {
476 my ($filename) = @_;
477
478 local $/;
479
480 my $av;
481
482 #TODO: use sysread etc.
483 if (open my $data, "<:raw:perlio", $filename) {
484 $data = <$data>;
485 if (open my $pst, "<:raw:perlio", "$filename.pst") {
486 $av = eval { (Storable::thaw <$pst>)->{objs} };
487 }
488 return ($data, $av);
489 }
490
491 ()
492}
493
494attach_to_objects
495 prio => -1000000,
496 on_clone => sub {
497 my ($src, $dst) = @_;
498
499 @{$dst->registry} = @{$src->registry};
500
501 %$dst = %$src;
502
503 %{$dst->{_attachment}} = %{$src->{_attachment}}
504 if exists $src->{_attachment};
505 },
506;
507
508#############################################################################
509# old plug-in events
510
95sub inject_event { 511sub inject_event {
96 my $extension = shift; 512 my $extension = shift;
97 my $event_code = shift; 513 my $event_code = shift;
98 514
99 my $cb = $hook[$event_code]{$extension} 515 my $cb = $hook[$event_code]{$extension}
141} 557}
142 558
143sub register { 559sub register {
144 my ($base, $pkg) = @_; 560 my ($base, $pkg) = @_;
145 561
146 for my $idx (0 .. $#EVENT) { 562 #TODO
147 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
148 #warn "registering $EVENT[$idx] hook to '$pkg'\n";
149 $hook[$idx]{$base} = $ref;
150 }
151 }
152} 563}
153 564
154sub load_extension { 565sub load_extension {
155 my ($path) = @_; 566 my ($path) = @_;
156 567
157 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 568 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
158 my $base = $1; 569 my $base = $1;
159 my $pkg = $1; 570 my $pkg = $1;
160 $pkg =~ s/[^[:word:]]/_/g; 571 $pkg =~ s/[^[:word:]]/_/g;
161 $pkg = "cf::ext::$pkg"; 572 $pkg = "ext::$pkg";
162 573
163 warn "loading '$path' into '$pkg'\n"; 574 warn "loading '$path' into '$pkg'\n";
164 575
165 open my $fh, "<:utf8", $path 576 open my $fh, "<:utf8", $path
166 or die "$path: $!"; 577 or die "$path: $!";
187 my ($pkg) = @_; 598 my ($pkg) = @_;
188 599
189 warn "removing extension $pkg\n"; 600 warn "removing extension $pkg\n";
190 601
191 # remove hooks 602 # remove hooks
603 #TODO
192 for my $idx (0 .. $#EVENT) { 604# for my $idx (0 .. $#PLUGIN_EVENT) {
193 delete $hook[$idx]{$pkg}; 605# delete $hook[$idx]{$pkg};
194 } 606# }
195 607
196 # remove commands 608 # remove commands
197 for my $name (keys %command) { 609 for my $name (keys %command) {
198 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 610 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
199 611
209 # remove extcmds 621 # remove extcmds
210 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 622 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
211 delete $extcmd{$name}; 623 delete $extcmd{$name};
212 } 624 }
213 625
214 if (my $cb = $pkg->can ("on_unload")) { 626 if (my $cb = $pkg->can ("unload")) {
215 eval { 627 eval {
216 $cb->($pkg); 628 $cb->($pkg);
217 1 629 1
218 } or warn "$pkg unloaded, but with errors: $@"; 630 } or warn "$pkg unloaded, but with errors: $@";
219 } 631 }
263 } 675 }
264 676
265 Symbol::delete_package $k; 677 Symbol::delete_package $k;
266 } 678 }
267 679
268 # 4. get rid of ext::, as good as possible 680 # 4. get rid of safe::, as good as possible
269 Symbol::delete_package "ext::$_" 681 Symbol::delete_package "safe::$_"
270 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region); 682 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
271 683
272 # 5. remove register_script_function callbacks 684 # 5. remove register_script_function callbacks
273 # TODO 685 # TODO
274 686
275 # 6. unload cf.pm "a bit" 687 # 6. unload cf.pm "a bit"
276 delete $INC{"cf.pm"}; 688 delete $INC{"cf.pm"};
277 689
278 # don't, removes xs symbols, too 690 # don't, removes xs symbols, too,
691 # and global variables created in xs
279 #Symbol::delete_package __PACKAGE__; 692 #Symbol::delete_package __PACKAGE__;
280 693
281 # 7. reload cf.pm 694 # 7. reload cf.pm
282 $msg->("reloading cf.pm"); 695 $msg->("reloading cf.pm");
283 require cf; 696 require cf;
697
698 $msg->("load extensions");
699 cf::load_extensions;
284 }; 700 };
285 $msg->($@) if $@; 701 $msg->($@) if $@;
286 702
287 $msg->("reloaded"); 703 $msg->("reloaded");
288}; 704};
304 }; 720 };
305 } 721 }
306}; 722};
307 723
308############################################################################# 724#############################################################################
309# utility functions
310
311use JSON::Syck (); # TODO# replace by JSON::PC once working
312
313sub from_json($) {
314 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
315 JSON::Syck::Load $_[0]
316}
317
318sub to_json($) {
319 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
320 JSON::Syck::Dump $_[0]
321}
322
323#############################################################################
324# extcmd framework, basically convert ext <msg> 725# extcmd framework, basically convert ext <msg>
325# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 726# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
326 727
327sub on_extcmd { 728attach_to_players
729 on_extcmd => sub {
328 my ($pl, $buf) = @_; 730 my ($pl, $buf) = @_;
329 731
330 my $msg = eval { from_json $buf }; 732 my $msg = eval { from_json $buf };
331 733
332 if (ref $msg) { 734 if (ref $msg) {
333 if (my $cb = $extcmd{$msg->{msgtype}}) { 735 if (my $cb = $extcmd{$msg->{msgtype}}) {
334 if (my %reply = $cb->[0]->($pl, $msg)) { 736 if (my %reply = $cb->[0]->($pl, $msg)) {
335 $pl->ext_reply ($msg->{msgid}, %reply); 737 $pl->ext_reply ($msg->{msgid}, %reply);
738 }
336 } 739 }
337 }
338 } else { 740 } else {
339 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 741 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
742 }
743
744 cf::override;
340 } 745 },
341 746;
342 1
343}
344 747
345############################################################################# 748#############################################################################
346# load/save/clean perl data associated with a map 749# load/save/clean perl data associated with a map
347 750
348*on_mapclean = sub { 751*cf::mapsupport::on_clean = sub {
349 my ($map) = @_; 752 my ($map) = @_;
350 753
351 my $path = $map->tmpname; 754 my $path = $map->tmpname;
352 defined $path or return; 755 defined $path or return;
353 756
354 unlink "$path.cfperl"; 757 unlink "$path.pst";
355}; 758};
356 759
357*on_mapin = 760attach_to_maps prio => -10000, package => cf::mapsupport::;
358*on_mapload = sub {
359 my ($map) = @_;
360
361 my $path = $map->tmpname;
362 $path = $map->path unless defined $path;
363
364 open my $fh, "<:raw", "$path.cfperl"
365 or return; # no perl data
366
367 my $data = Storable::thaw do { local $/; <$fh> };
368
369 $data->{version} <= 1
370 or return; # too new
371
372 $map->_set_obs ($data->{obs});
373};
374
375*on_mapout = sub {
376 my ($map) = @_;
377
378 my $path = $map->tmpname;
379 $path = $map->path unless defined $path;
380
381 my $obs = $map->_get_obs;
382
383 if (defined $obs) {
384 open my $fh, ">:raw", "$path.cfperl"
385 or die "$path.cfperl: $!";
386
387 stat $path;
388
389 print $fh Storable::nfreeze {
390 size => (stat _)[7],
391 time => (stat _)[9],
392 version => 1,
393 obs => $obs,
394 };
395
396 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
397 } else {
398 unlink "$path.cfperl";
399 }
400};
401 761
402############################################################################# 762#############################################################################
403# load/save perl data associated with player->ob objects 763# load/save perl data associated with player->ob objects
404 764
405sub all_objects(@) { 765sub all_objects(@) {
406 @_, map all_objects ($_->inv), @_ 766 @_, map all_objects ($_->inv), @_
407} 767}
408 768
409*on_player_load = sub { 769# TODO: compatibility cruft, remove when no longer needed
770attach_to_players
771 on_load => sub {
410 my ($ob, $path) = @_; 772 my ($pl, $path) = @_;
411 773
412 for my $o (all_objects $ob) { 774 for my $o (all_objects $pl->ob) {
413 if (my $value = $o->get_ob_key_value ("_perl_data")) { 775 if (my $value = $o->get_ob_key_value ("_perl_data")) {
414 $o->set_ob_key_value ("_perl_data"); 776 $o->set_ob_key_value ("_perl_data");
415 777
416 %$o = %{ Storable::thaw pack "H*", $value }; 778 %$o = %{ Storable::thaw pack "H*", $value };
417 } 779 }
780 }
418 } 781 },
419}; 782;
420
421*on_player_save = sub {
422 my ($ob, $path) = @_;
423
424 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
425 for grep %$_, all_objects $ob;
426};
427 783
428############################################################################# 784#############################################################################
429# core extensions - in perl 785# core extensions - in perl
430 786
431=item cf::player::exists $login 787=item cf::player::exists $login
477} 833}
478 834
479############################################################################# 835#############################################################################
480# map scripting support 836# map scripting support
481 837
482our $safe = new Safe "ext"; 838our $safe = new Safe "safe";
483our $safe_hole = new Safe::Hole; 839our $safe_hole = new Safe::Hole;
484 840
485$SIG{FPE} = 'IGNORE'; 841$SIG{FPE} = 'IGNORE';
486 842
487$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 843$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
493 ["cf::object::player" => qw(player)], 849 ["cf::object::player" => qw(player)],
494 ["cf::player" => qw(peaceful)], 850 ["cf::player" => qw(peaceful)],
495) { 851) {
496 no strict 'refs'; 852 no strict 'refs';
497 my ($pkg, @funs) = @$_; 853 my ($pkg, @funs) = @$_;
498 *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 854 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
499 for @funs; 855 for @funs;
500} 856}
501 857
502sub safe_eval($;@) { 858sub safe_eval($;@) {
503 my ($code, %vars) = @_; 859 my ($code, %vars) = @_;
505 my $qcode = $code; 861 my $qcode = $code;
506 $qcode =~ s/"/‟/g; # not allowed in #line filenames 862 $qcode =~ s/"/‟/g; # not allowed in #line filenames
507 $qcode =~ s/\n/\\n/g; 863 $qcode =~ s/\n/\\n/g;
508 864
509 local $_; 865 local $_;
510 local @ext::cf::_safe_eval_args = values %vars; 866 local @safe::cf::_safe_eval_args = values %vars;
511 867
512 $code = 868 my $eval =
513 "do {\n" 869 "do {\n"
514 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 870 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
515 . "#line 0 \"{$qcode}\"\n" 871 . "#line 0 \"{$qcode}\"\n"
516 . $code 872 . $code
517 . "\n}" 873 . "\n}"
518 ; 874 ;
519 875
520 sub_generation_inc; 876 sub_generation_inc;
521 my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code); 877 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
522 sub_generation_inc; 878 sub_generation_inc;
879
880 if ($@) {
881 warn "$@";
882 warn "while executing safe code '$code'\n";
883 warn "with arguments " . (join " ", %vars) . "\n";
884 }
523 885
524 wantarray ? @res : $res[0] 886 wantarray ? @res : $res[0]
525} 887}
526 888
527sub register_script_function { 889sub register_script_function {
528 my ($fun, $cb) = @_; 890 my ($fun, $cb) = @_;
529 891
530 no strict 'refs'; 892 no strict 'refs';
531 *{"ext::$fun"} = $safe_hole->wrap ($cb); 893 *{"safe::$fun"} = $safe_hole->wrap ($cb);
532} 894}
533 895
534############################################################################# 896#############################################################################
535# the server's main() 897# the server's main()
536 898
537sub run { 899sub main {
900 load_extensions;
538 Event::loop; 901 Event::loop;
539} 902}
540 903
541############################################################################# 904#############################################################################
542# initialisation 905# initialisation
543 906
544register "<global>", __PACKAGE__; 907register "<global>", __PACKAGE__;
545 908
546unshift @INC, $LIBDIR; 909unshift @INC, $LIBDIR;
547
548load_extensions;
549 910
550$TICK_WATCHER = Event->timer ( 911$TICK_WATCHER = Event->timer (
551 prio => 1, 912 prio => 1,
552 at => $NEXT_TICK || 1, 913 at => $NEXT_TICK || 1,
553 cb => sub { 914 cb => sub {
554 cf::server_tick; # one server iteration 915 cf::server_tick; # one server iteration
555 916
556 my $NOW = Event::time; 917 my $NOW = Event::time;
557 $NEXT_TICK += $TICK; 918 $NEXT_TICK += $TICK;
558 919
559 # if we are delayed by > 0.25 second, skip ticks 920 # if we are delayed by four ticks, skip them all
560 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + .25; 921 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
561 922
562 $TICK_WATCHER->at ($NEXT_TICK); 923 $TICK_WATCHER->at ($NEXT_TICK);
563 $TICK_WATCHER->start; 924 $TICK_WATCHER->start;
564 }, 925 },
565); 926);
566 927
928_reload_2;
929
5671 9301
568 931

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines