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.26 by root, Thu Jul 20 22:03:36 2006 UTC vs.
Revision 1.47 by root, Sun Aug 27 13:02:04 2006 UTC

5use Storable; 5use Storable;
6use Opcode; 6use Opcode;
7use Safe; 7use Safe;
8use Safe::Hole; 8use Safe::Hole;
9 9
10use Time::HiRes;
10use Event; 11use Event;
11$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
12 13
13use strict; 14use strict;
14 15
16_reload_1;
17
15our %COMMAND; 18our %COMMAND = ();
16our @EVENT; 19our @EVENT;
17our %PROP_TYPE; 20our %PROP_TYPE;
18our %PROP_IDX; 21our %PROP_IDX;
22our $LIBDIR = maps_directory "perl";
23
24our $TICK = MAX_TIME * 1e-6;
25our $TICK_WATCHER;
26our $NEXT_TICK;
19 27
20BEGIN { 28BEGIN {
21 @EVENT = map lc, @EVENT;
22
23 *CORE::GLOBAL::warn = sub { 29 *CORE::GLOBAL::warn = sub {
24 my $msg = join "", @_; 30 my $msg = join "", @_;
25 $msg .= "\n" 31 $msg .= "\n"
26 unless $msg =~ /\n$/; 32 unless $msg =~ /\n$/;
27 33
62prop_gen PLAYER_PROP => "cf::object::player"; 68prop_gen PLAYER_PROP => "cf::object::player";
63 69
64prop_gen MAP_PROP => "cf::map"; 70prop_gen MAP_PROP => "cf::map";
65prop_gen ARCH_PROP => "cf::arch"; 71prop_gen ARCH_PROP => "cf::arch";
66 72
67# guessed hierarchies
68
69@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 73@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
70@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
71 74
72# we bless all objects into derived classes to force a method lookup 75# we bless all objects into (empty) derived classes to force a method lookup
73# within the Safe compartment. 76# within the Safe compartment.
74for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region)) { 77for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
75 no strict 'refs'; 78 no strict 'refs';
76 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 79 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
77} 80}
78 81
79$Event::DIED = sub { 82$Event::DIED = sub {
80 warn "error in event callback: @_"; 83 warn "error in event callback: @_";
81}; 84};
84my @exts; 87my @exts;
85my @hook; 88my @hook;
86my %command; 89my %command;
87my %extcmd; 90my %extcmd;
88 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, ...)
111
112Attach a pre-registered attachment to an object.
113
114=item $player->attach ($attachment, ...)
115
116Attach a pre-registered attachment to a player.
117
118=item $map->attach ($attachment, ...) # 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, @args) = @_;
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 if (my $cb = delete $registry->[EVENT_OBJECT_INSTANTIATE]) {
263 for (@$cb) {
264 eval { $_->[1]->($obj, @args); };
265 if ($@) {
266 warn "$@";
267 warn "... while processing '$name' instantiate with args <@args>.\n";
268 }
269 }
270 }
271 } else {
272 warn "object uses attachment '$name' that is not available, postponing.\n";
273 }
274
275 push @{$obj->{_attachment}}, $name;
276
277 $res->{attachment} = $name;
278 $res
279}
280
281sub cf::object::attach {
282 my ($obj, $name, @args) = @_;
283
284 _attach_attachment $obj, $name, @args;
285}
286
287sub cf::player::attach {
288 my ($obj, $name, @args) = @_;
289
290 _attach_attachment KLASS_PLAYER, $obj, $name, @args;
291}
292
293sub cf::map::attach {
294 my ($obj, $name, @args) = @_;
295
296 _attach_attachment KLASS_MAP, $obj, $name, @args;
297}
298
299sub attach_global {
300 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
301}
302
303sub attach_to_type {
304 my $type = shift;
305 my $subtype = shift;
306
307 _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
308}
309
310sub attach_to_objects {
311 _attach @CB_OBJECT, KLASS_OBJECT, @_
312}
313
314sub attach_to_players {
315 _attach @CB_PLAYER, KLASS_PLAYER, @_
316}
317
318sub attach_to_maps {
319 _attach @CB_MAP, KLASS_MAP, @_
320}
321
322sub register_attachment {
323 my $name = shift;
324
325 $attachment{$name} = [[KLASS_OBJECT, @_]];
326}
327
328our $override;
329our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
330
331sub override {
332 $override = 1;
333 @invoke_results = ();
334}
335
336sub do_invoke {
337 my $event = shift;
338 my $callbacks = shift;
339
340 @invoke_results = ();
341
342 local $override;
343
344 for (@$callbacks) {
345 eval { &{$_->[1]} };
346
347 if ($@) {
348 warn "$@";
349 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
350 override;
351 }
352
353 return 1 if $override;
354 }
355
356 0
357}
358
359#############################################################################
360# object support
361
362sub instantiate {
363 my ($obj, $data) = @_;
364
365 $data = from_json $data;
366
367 for (@$data) {
368 my ($name, $args) = @$_;
369 attach $obj, $name, @{$args || [] };
370 }
371}
372
373# basically do the same as instantiate, without calling instantiate
374sub reattach {
375 my ($obj) = @_;
376 my $registry = $obj->registry;
377
378 @$registry = ();
379
380 for my $name (@{ $obj->{_attachment} }) {
381 if (my $attach = $attachment{$name}) {
382 for (@$attach) {
383 my ($klass, @attach) = @$_;
384 _attach @$registry, $klass, @attach;
385 }
386 } else {
387 warn "object uses attachment '$name' that is not available, postponing.\n";
388 }
389 }
390}
391
392sub object_freezer_save {
393 my ($filename, $objs) = @_;
394
395 $filename .= ".pst";
396
397 if (@$objs) {
398 open my $fh, ">:raw", "$filename~";
399 chmod $fh, SAVE_MODE;
400 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
401 close $fh;
402 rename "$filename~", $filename;
403 } else {
404 unlink $filename;
405 }
406}
407
408sub object_thawer_load {
409 my ($filename) = @_;
410
411 open my $fh, "<:raw:perlio", "$filename.pst"
412 or return;
413
414 eval { local $/; (Storable::thaw <$fh>)->{objs} }
415}
416
417attach_to_objects
418 prio => -1000000,
419 on_clone => sub {
420 my ($src, $dst) = @_;
421
422 @{$dst->registry} = @{$src->registry};
423
424 %$dst = %$src;
425
426 $dst->{_attachment} = [@{ $src->{_attachment} }]
427 if exists $src->{_attachment};
428 },
429;
430
431#############################################################################
432# old plug-in events
433
89sub inject_event { 434sub inject_event {
90 my $extension = shift; 435 my $extension = shift;
91 my $event_code = shift; 436 my $event_code = shift;
92 437
93 my $cb = $hook[$event_code]{$extension} 438 my $cb = $hook[$event_code]{$extension}
135} 480}
136 481
137sub register { 482sub register {
138 my ($base, $pkg) = @_; 483 my ($base, $pkg) = @_;
139 484
140 for my $idx (0 .. $#EVENT) { 485 #TODO
141 if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
142 #warn "registering $EVENT[$idx] hook to '$pkg'\n";
143 $hook[$idx]{$base} = $ref;
144 }
145 }
146} 486}
147 487
148sub load_extension { 488sub load_extension {
149 my ($path) = @_; 489 my ($path) = @_;
150 490
151 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 491 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
152 my $base = $1; 492 my $base = $1;
153 my $pkg = $1; 493 my $pkg = $1;
154 $pkg =~ s/[^[:word:]]/_/g; 494 $pkg =~ s/[^[:word:]]/_/g;
155 $pkg = "cf::ext::$pkg"; 495 $pkg = "ext::$pkg";
156 496
157 warn "loading '$path' into '$pkg'\n"; 497 warn "loading '$path' into '$pkg'\n";
158 498
159 open my $fh, "<:utf8", $path 499 open my $fh, "<:utf8", $path
160 or die "$path: $!"; 500 or die "$path: $!";
180sub unload_extension { 520sub unload_extension {
181 my ($pkg) = @_; 521 my ($pkg) = @_;
182 522
183 warn "removing extension $pkg\n"; 523 warn "removing extension $pkg\n";
184 524
185 if (my $cb = $pkg->can ("on_unload")) {
186 $cb->($pkg);
187 }
188
189 # remove hooks 525 # remove hooks
526 #TODO
190 for my $idx (0 .. $#EVENT) { 527# for my $idx (0 .. $#PLUGIN_EVENT) {
191 delete $hook[$idx]{$pkg}; 528# delete $hook[$idx]{$pkg};
192 } 529# }
193 530
194 # remove commands 531 # remove commands
195 for my $name (keys %command) { 532 for my $name (keys %command) {
196 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 533 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
197 534
207 # remove extcmds 544 # remove extcmds
208 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 545 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
209 delete $extcmd{$name}; 546 delete $extcmd{$name};
210 } 547 }
211 548
549 if (my $cb = $pkg->can ("unload")) {
550 eval {
551 $cb->($pkg);
552 1
553 } or warn "$pkg unloaded, but with errors: $@";
554 }
555
212 Symbol::delete_package $pkg; 556 Symbol::delete_package $pkg;
213} 557}
214 558
215sub load_extensions { 559sub load_extensions {
216 my $LIBDIR = maps_directory "perl"; 560 my $LIBDIR = maps_directory "perl";
222 1 566 1
223 } or warn "$ext not loaded: $@"; 567 } or warn "$ext not loaded: $@";
224 } 568 }
225} 569}
226 570
571sub _perl_reload(&) {
572 my ($msg) = @_;
573
574 $msg->("reloading...");
575
576 eval {
577 # 1. cancel all watchers
578 $_->cancel for Event::all_watchers;
579
580 # 2. unload all extensions
581 for (@exts) {
582 $msg->("unloading <$_>");
583 unload_extension $_;
584 }
585
586 # 3. unload all modules loaded from $LIBDIR
587 while (my ($k, $v) = each %INC) {
588 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
589
590 $msg->("removing <$k>");
591 delete $INC{$k};
592
593 $k =~ s/\.pm$//;
594 $k =~ s/\//::/g;
595
596 if (my $cb = $k->can ("unload_module")) {
597 $cb->();
598 }
599
600 Symbol::delete_package $k;
601 }
602
603 # 4. get rid of safe::, as good as possible
604 Symbol::delete_package "safe::$_"
605 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
606
607 # 5. remove register_script_function callbacks
608 # TODO
609
610 # 6. unload cf.pm "a bit"
611 delete $INC{"cf.pm"};
612
613 # don't, removes xs symbols, too,
614 # and global variables created in xs
615 #Symbol::delete_package __PACKAGE__;
616
617 # 7. reload cf.pm
618 $msg->("reloading cf.pm");
619 require cf;
620 };
621 $msg->($@) if $@;
622
623 $msg->("reloaded");
624};
625
626sub perl_reload() {
627 _perl_reload {
628 warn $_[0];
629 print "$_[0]\n";
630 };
631}
632
227register_command "perl-reload", 0, sub { 633register_command "perl-reload", 0, sub {
228 my ($who, $arg) = @_; 634 my ($who, $arg) = @_;
229 635
230 if ($who->flag (FLAG_WIZ)) { 636 if ($who->flag (FLAG_WIZ)) {
231 $who->message ("reloading..."); 637 _perl_reload {
232 638 warn $_[0];
233 warn "reloading...\n"; 639 $who->message ($_[0]);
234 eval {
235 $_->cancel for Event::all_watchers;
236
237 unload_extension $_ for @exts;
238 delete $INC{"cf.pm"};
239
240 # don't, removes xs symbols, too
241 #Symbol::delete_package __PACKAGE__;
242
243 require cf;
244 }; 640 };
245 warn $@ if $@;
246 $who->message ($@) if $@;
247 warn "reloaded\n";
248
249 $who->message ("reloaded");
250 } else {
251 $who->message ("Intruder Alert!");
252 } 641 }
253}; 642};
254 643
255############################################################################# 644#############################################################################
256# extcmd framework, basically convert ext <id> <pkg> arg1 args 645# extcmd framework, basically convert ext <msg>
257# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 646# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
258 647
259sub on_extcmd { 648attach_to_players
649 on_extcmd => sub {
260 my ($pl, $buf) = @_; 650 my ($pl, $buf) = @_;
261 651
262 my ($type) = $buf =~ s/^(\S+) // ? $1 : ""; 652 my $msg = eval { from_json $buf };
263 653
264 $extcmd{$type}[0]->($pl, $buf) 654 if (ref $msg) {
265 if $extcmd{$type}; 655 if (my $cb = $extcmd{$msg->{msgtype}}) {
266} 656 if (my %reply = $cb->[0]->($pl, $msg)) {
657 $pl->ext_reply ($msg->{msgid}, %reply);
658 }
659 }
660 } else {
661 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
662 }
663
664 cf::override;
665 },
666;
267 667
268############################################################################# 668#############################################################################
269# load/save/clean perl data associated with a map 669# load/save/clean perl data associated with a map
270 670
271*on_mapclean = sub { 671*cf::mapsupport::on_clean = sub {
272 my ($map) = @_; 672 my ($map) = @_;
273 673
274 my $path = $map->tmpname; 674 my $path = $map->tmpname;
275 defined $path or return; 675 defined $path or return;
276 676
277 unlink "$path.cfperl"; 677 unlink "$path.cfperl";
678 unlink "$path.pst";
278}; 679};
279 680
280*on_mapin = 681*cf::mapsupport::on_swapin =
281*on_mapload = sub { 682*cf::mapsupport::on_load = sub {
282 my ($map) = @_; 683 my ($map) = @_;
283 684
284 my $path = $map->tmpname; 685 my $path = $map->tmpname;
285 $path = $map->path unless defined $path; 686 $path = $map->path unless defined $path;
286 687
293 or return; # too new 694 or return; # too new
294 695
295 $map->_set_obs ($data->{obs}); 696 $map->_set_obs ($data->{obs});
296}; 697};
297 698
298*on_mapout = sub { 699attach_to_maps prio => -10000, package => cf::mapsupport::;
299 my ($map) = @_;
300
301 my $path = $map->tmpname;
302 $path = $map->path unless defined $path;
303
304 my $obs = $map->_get_obs;
305
306 if (defined $obs) {
307 open my $fh, ">:raw", "$path.cfperl"
308 or die "$path.cfperl: $!";
309
310 stat $path;
311
312 print $fh Storable::nfreeze {
313 size => (stat _)[7],
314 time => (stat _)[9],
315 version => 1,
316 obs => $obs,
317 };
318
319 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
320 } else {
321 unlink "$path.cfperl";
322 }
323};
324 700
325############################################################################# 701#############################################################################
326# load/save perl data associated with player->ob objects 702# load/save perl data associated with player->ob objects
327 703
328*on_player_load = sub { 704sub all_objects(@) {
705 @_, map all_objects ($_->inv), @_
706}
707
708attach_to_players
709 on_load => sub {
329 my ($ob, $path) = @_; 710 my ($pl, $path) = @_;
330 711
331 for my $o ($ob, $ob->inv) { 712 for my $o (all_objects $pl->ob) {
332 if (my $value = $o->get_ob_key_value ("_perl_data")) { 713 if (my $value = $o->get_ob_key_value ("_perl_data")) {
333 $o->set_ob_key_value ("_perl_data"); 714 $o->set_ob_key_value ("_perl_data");
334 715
335 %$o = %{ Storable::thaw pack "H*", $value }; 716 %$o = %{ Storable::thaw pack "H*", $value };
336 } 717 }
718 }
337 } 719 },
338}; 720;
339
340*on_player_save = sub {
341 my ($ob, $path) = @_;
342
343 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
344 for grep %$_, $ob, $ob->inv;
345};
346 721
347############################################################################# 722#############################################################################
348# core extensions - in perl 723# core extensions - in perl
349 724
350=item cf::player::exists $login 725=item cf::player::exists $login
355 730
356sub cf::player::exists($) { 731sub cf::player::exists($) {
357 cf::player::find $_[0] 732 cf::player::find $_[0]
358 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 733 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
359} 734}
735
736=item $player->reply ($npc, $msg[, $flags])
737
738Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
739can be C<undef>. Does the right thing when the player is currently in a
740dialogue with the given NPC character.
741
742=cut
360 743
361# rough implementation of a future "reply" method that works 744# rough implementation of a future "reply" method that works
362# with dialog boxes. 745# with dialog boxes.
363sub cf::object::player::reply($$$;$) { 746sub cf::object::player::reply($$$;$) {
364 my ($self, $npc, $msg, $flags) = @_; 747 my ($self, $npc, $msg, $flags) = @_;
371 $msg = $npc->name . " says: $msg" if $npc; 754 $msg = $npc->name . " says: $msg" if $npc;
372 $self->message ($msg, $flags); 755 $self->message ($msg, $flags);
373 } 756 }
374} 757}
375 758
759=item $player->ext_reply ($msgid, $msgtype, %msg)
760
761Sends an ext reply to the player.
762
763=cut
764
765sub cf::player::ext_reply($$$%) {
766 my ($self, $id, %msg) = @_;
767
768 $msg{msgid} = $id;
769
770 $self->send ("ext " . to_json \%msg);
771}
772
376############################################################################# 773#############################################################################
377# map scripting support 774# map scripting support
378 775
379our $safe = new Safe "ext"; 776our $safe = new Safe "safe";
380our $safe_hole = new Safe::Hole; 777our $safe_hole = new Safe::Hole;
381 778
382$SIG{FPE} = 'IGNORE'; 779$SIG{FPE} = 'IGNORE';
383 780
384$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 781$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
385 782
386# here we export the classes and methods available to script code 783# here we export the classes and methods available to script code
387 784
388for ( 785for (
389 ["cf::object" => qw(contr)], 786 ["cf::object" => qw(contr pay_amount pay_player)],
390 ["cf::object::player" => qw(player)], 787 ["cf::object::player" => qw(player)],
391 ["cf::player" => qw(peaceful)], 788 ["cf::player" => qw(peaceful)],
392) { 789) {
393 no strict 'refs'; 790 no strict 'refs';
394 my ($pkg, @funs) = @$_; 791 my ($pkg, @funs) = @$_;
395 *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 792 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
396 for @funs; 793 for @funs;
397} 794}
398 795
399sub safe_eval($;@) { 796sub safe_eval($;@) {
400 my ($code, %vars) = @_; 797 my ($code, %vars) = @_;
402 my $qcode = $code; 799 my $qcode = $code;
403 $qcode =~ s/"/‟/g; # not allowed in #line filenames 800 $qcode =~ s/"/‟/g; # not allowed in #line filenames
404 $qcode =~ s/\n/\\n/g; 801 $qcode =~ s/\n/\\n/g;
405 802
406 local $_; 803 local $_;
407 local @ext::cf::_safe_eval_args = values %vars; 804 local @safe::cf::_safe_eval_args = values %vars;
408 805
409 $code = 806 my $eval =
410 "do {\n" 807 "do {\n"
411 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 808 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
412 . "#line 0 \"{$qcode}\"\n" 809 . "#line 0 \"{$qcode}\"\n"
413 . $code 810 . $code
414 . "\n}" 811 . "\n}"
415 ; 812 ;
416 813
417 sub_generation_inc; 814 sub_generation_inc;
418 my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code); 815 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
419 sub_generation_inc; 816 sub_generation_inc;
817
818 if ($@) {
819 warn "$@";
820 warn "while executing safe code '$code'\n";
821 warn "with arguments " . (join " ", %vars) . "\n";
822 }
420 823
421 wantarray ? @res : $res[0] 824 wantarray ? @res : $res[0]
422} 825}
423 826
424sub register_script_function { 827sub register_script_function {
425 my ($fun, $cb) = @_; 828 my ($fun, $cb) = @_;
426 829
427 no strict 'refs'; 830 no strict 'refs';
428 *{"ext::$fun"} = $safe_hole->wrap ($cb); 831 *{"safe::$fun"} = $safe_hole->wrap ($cb);
832}
833
834#############################################################################
835# the server's main()
836
837sub main {
838 Event::loop;
429} 839}
430 840
431############################################################################# 841#############################################################################
432# initialisation 842# initialisation
433 843
434register "<global>", __PACKAGE__; 844register "<global>", __PACKAGE__;
435 845
436unshift @INC, maps_directory "perl"; 846unshift @INC, $LIBDIR;
437 847
438load_extensions; 848load_extensions;
439 849
850$TICK_WATCHER = Event->timer (
851 prio => 1,
852 at => $NEXT_TICK || 1,
853 cb => sub {
854 cf::server_tick; # one server iteration
855
856 my $NOW = Event::time;
857 $NEXT_TICK += $TICK;
858
859 # if we are delayed by four ticks, skip them all
860 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
861
862 $TICK_WATCHER->at ($NEXT_TICK);
863 $TICK_WATCHER->start;
864 },
865);
866
867_reload_2;
868
4401 8691
441 870

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines