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.84 by root, Mon Dec 11 02:54:57 2006 UTC vs.
Revision 1.93 by root, Thu Dec 21 22:41:35 2006 UTC

… …
16# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 16# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
17$YAML::Syck::ImplicitUnicode = 1; 17$YAML::Syck::ImplicitUnicode = 1;
18 18
19use strict; 19use strict;
20 20
21sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
22
23our %COMMAND = ();
24our %COMMAND_TIME = ();
25our %EXTCMD = ();
26
21_init_vars; 27_init_vars;
22 28
23our %COMMAND = ();
24our @EVENT; 29our @EVENT;
25our $LIBDIR = maps_directory "perl"; 30our $LIBDIR = datadir . "/ext";
26 31
27our $TICK = MAX_TIME * 1e-6; 32our $TICK = MAX_TIME * 1e-6;
28our $TICK_WATCHER; 33our $TICK_WATCHER;
29our $NEXT_TICK; 34our $NEXT_TICK;
30 35
… …
69 print STDERR "cfperl: $msg"; 74 print STDERR "cfperl: $msg";
70 LOG llevError, "cfperl: $msg"; 75 LOG llevError, "cfperl: $msg";
71 }; 76 };
72} 77}
73 78
79@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
80@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
81@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
82@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
83@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
74@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 84@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
75 85
76# we bless all objects into (empty) derived classes to force a method lookup 86# we bless all objects into (empty) derived classes to force a method lookup
77# within the Safe compartment. 87# within the Safe compartment.
78for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) { 88for my $pkg (qw(
89 cf::global
90 cf::object cf::object::player
91 cf::client cf::player
92 cf::arch cf::living
93 cf::map cf::party cf::region
94)) {
79 no strict 'refs'; 95 no strict 'refs';
80 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 96 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
81} 97}
82 98
83$Event::DIED = sub { 99$Event::DIED = sub {
… …
85}; 101};
86 102
87my %ext_pkg; 103my %ext_pkg;
88my @exts; 104my @exts;
89my @hook; 105my @hook;
90my %command;
91my %extcmd;
92 106
93=head2 UTILITY FUNCTIONS 107=head2 UTILITY FUNCTIONS
94 108
95=over 4 109=over 4
96 110
… …
124 138
125=cut 139=cut
126 140
127############################################################################# 141#############################################################################
128 142
129=head2 EVENTS AND OBJECT ATTACHMENTS 143=head2 ATTACHABLE OBJECTS
144
145You can define and attach attachments to each "attachable" object in
146crossfire+ (objects, players, clients, maps and the special "global"
147class). In the following description, CLASS can be any of C<global>,
148C<object> C<player>, C<client> or C<map>.
130 149
131=over 4 150=over 4
132 151
133=item $object->attach ($attachment, key => $value...) 152=item cf::CLASS::attachment $name, ...
134 153
135=item $object->detach ($attachment) 154Register an attachment by name through which attachable objects can refer
155to this attachment.
136 156
137Attach/detach a pre-registered attachment to an object.
138
139=item $player->attach ($attachment, key => $value...)
140
141=item $player->detach ($attachment)
142
143Attach/detach a pre-registered attachment to a player.
144
145=item $map->attach ($attachment, key => $value...)
146
147=item $map->detach ($attachment)
148
149Attach/detach a pre-registered attachment to a map.
150
151=item $bool = $object->attached ($name)
152
153=item $bool = $player->attached ($name)
154
155=item $bool = $map->attached ($name) 157=item $bool = $attachable->attached ($name)
156 158
157Checks wether the named attachment is currently attached to the object. 159Checks wether the named attachment is currently attached to the object.
158 160
159=item cf::attach_global ... 161=item $attachable->attach ($attachment, key => $value...)
160 162
161Attach handlers for global events. 163=item $attachable->detach ($attachment)
162 164
163This and all following C<attach_*>-functions expect any number of the 165Attach/detach a pre-registered attachment either to a specific object
164following handler/hook descriptions: 166(C<$attachable>) or all objects of the given class (if C<$attachable> is a
167class in a static method call).
168
169You can attach to global events by using the C<cf::global> class.
170
171These method calls expect any number of the following handler/hook
172descriptions:
165 173
166=over 4 174=over 4
167 175
168=item prio => $number 176=item prio => $number
169 177
… …
171by another C<prio> setting). Lower priority handlers get executed 179by another C<prio> setting). Lower priority handlers get executed
172earlier. The default priority is C<0>, and many built-in handlers are 180earlier. The default priority is C<0>, and many built-in handlers are
173registered at priority C<-1000>, so lower priorities should not be used 181registered at priority C<-1000>, so lower priorities should not be used
174unless you know what you are doing. 182unless you know what you are doing.
175 183
184=item type => $type
185
186(Only for C<< cf::object->attach >> calls), limits the attachment to the
187given type of objects only (the additional parameter C<subtype> can be
188used to further limit to the given subtype).
189
176=item on_I<event> => \&cb 190=item on_I<event> => \&cb
177 191
178Call the given code reference whenever the named event happens (event is 192Call the given code reference whenever the named event happens (event is
179something like C<instantiate>, C<apply>, C<use_skill> and so on, and which 193something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
180handlers are recognised generally depends on the type of object these 194handlers are recognised generally depends on the type of object these
… …
189package and register them. Only handlers for eevents supported by the 203package and register them. Only handlers for eevents supported by the
190object/class are recognised. 204object/class are recognised.
191 205
192=back 206=back
193 207
194=item cf::attach_to_type $object_type, $subtype, ...
195
196Attach handlers for a specific object type (e.g. TRANSPORT) and
197subtype. If C<$subtype> is zero or undef, matches all objects of the given
198type.
199
200=item cf::attach_to_objects ...
201
202Attach handlers to all objects. Do not use this except for debugging or
203very rare events, as handlers are (obviously) called for I<all> objects in
204the game.
205
206=item cf::attach_to_players ...
207
208Attach handlers to all players.
209
210=item cf::attach_to_maps ...
211
212Attach handlers to all maps.
213
214=item cf:register_attachment $name, ...
215
216Register an attachment by name through which objects can refer to this
217attachment.
218
219=item cf:register_player_attachment $name, ...
220
221Register an attachment by name through which players can refer to this
222attachment.
223
224=item cf:register_map_attachment $name, ...
225
226Register an attachment by name through which maps can refer to this
227attachment.
228
229=cut 208=cut
230 209
231# the following variables are defined in .xs and must not be re-created 210# the following variables are defined in .xs and must not be re-created
232our @CB_GLOBAL = (); # registry for all global events 211our @CB_GLOBAL = (); # registry for all global events
233our @CB_OBJECT = (); # all objects (should not be used except in emergency) 212our @CB_OBJECT = (); # all objects (should not be used except in emergency)
234our @CB_PLAYER = (); 213our @CB_PLAYER = ();
214our @CB_CLIENT = ();
235our @CB_TYPE = (); # registry for type (cf-object class) based events 215our @CB_TYPE = (); # registry for type (cf-object class) based events
236our @CB_MAP = (); 216our @CB_MAP = ();
237 217
238my %attachment; 218my %attachment;
239 219
240sub _attach_cb($\%$$$) { 220sub _attach_cb($$$$) {
241 my ($registry, $undo, $event, $prio, $cb) = @_; 221 my ($registry, $event, $prio, $cb) = @_;
242 222
243 use sort 'stable'; 223 use sort 'stable';
244 224
245 $cb = [$prio, $cb]; 225 $cb = [$prio, $cb];
246 226
247 @{$registry->[$event]} = sort 227 @{$registry->[$event]} = sort
248 { $a->[0] cmp $b->[0] } 228 { $a->[0] cmp $b->[0] }
249 @{$registry->[$event] || []}, $cb; 229 @{$registry->[$event] || []}, $cb;
250
251 push @{$undo->{cb}}, [$event, $cb];
252} 230}
253 231
254# attach handles attaching event callbacks 232# attach handles attaching event callbacks
255# the only thing the caller has to do is pass the correct 233# the only thing the caller has to do is pass the correct
256# registry (== where the callback attaches to). 234# registry (== where the callback attaches to).
257sub _attach(\@$@) { 235sub _attach {
258 my ($registry, $klass, @arg) = @_; 236 my ($registry, $klass, @arg) = @_;
259 237
238 my $object_type;
260 my $prio = 0; 239 my $prio = 0;
261
262 my %undo = (
263 registry => $registry,
264 cb => [],
265 );
266
267 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT; 240 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
268 241
269 while (@arg) { 242 while (@arg) {
270 my $type = shift @arg; 243 my $type = shift @arg;
271 244
272 if ($type eq "prio") { 245 if ($type eq "prio") {
273 $prio = shift @arg; 246 $prio = shift @arg;
274 247
248 } elsif ($type eq "type") {
249 $object_type = shift @arg;
250 $registry = $CB_TYPE[$object_type] ||= [];
251
252 } elsif ($type eq "subtype") {
253 defined $object_type or Carp::croak "subtype specified without type";
254 my $object_subtype = shift @arg;
255 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];
256
275 } elsif ($type eq "package") { 257 } elsif ($type eq "package") {
276 my $pkg = shift @arg; 258 my $pkg = shift @arg;
277 259
278 while (my ($name, $id) = each %cb_id) { 260 while (my ($name, $id) = each %cb_id) {
279 if (my $cb = $pkg->can ($name)) { 261 if (my $cb = $pkg->can ($name)) {
280 _attach_cb $registry, %undo, $id, $prio, $cb; 262 _attach_cb $registry, $id, $prio, $cb;
281 } 263 }
282 } 264 }
283 265
284 } elsif (exists $cb_id{$type}) { 266 } elsif (exists $cb_id{$type}) {
285 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg; 267 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
286 268
287 } elsif (ref $type) { 269 } elsif (ref $type) {
288 warn "attaching objects not supported, ignoring.\n"; 270 warn "attaching objects not supported, ignoring.\n";
289 271
290 } else { 272 } else {
291 shift @arg; 273 shift @arg;
292 warn "attach argument '$type' not supported, ignoring.\n"; 274 warn "attach argument '$type' not supported, ignoring.\n";
293 } 275 }
294 } 276 }
295
296 \%undo
297} 277}
298 278
299sub _attach_attachment { 279sub _object_attach {
300 my ($obj, $name, %arg) = @_; 280 my ($obj, $name, %arg) = @_;
301 281
302 return if exists $obj->{_attachment}{$name}; 282 return if exists $obj->{_attachment}{$name};
303
304 my $res;
305 283
306 if (my $attach = $attachment{$name}) { 284 if (my $attach = $attachment{$name}) {
307 my $registry = $obj->registry; 285 my $registry = $obj->registry;
308 286
309 for (@$attach) { 287 for (@$attach) {
310 my ($klass, @attach) = @$_; 288 my ($klass, @attach) = @$_;
311 $res = _attach @$registry, $klass, @attach; 289 _attach $registry, $klass, @attach;
312 } 290 }
313 291
314 $obj->{$name} = \%arg; 292 $obj->{$name} = \%arg;
315 } else { 293 } else {
316 warn "object uses attachment '$name' that is not available, postponing.\n"; 294 warn "object uses attachment '$name' that is not available, postponing.\n";
317 } 295 }
318 296
319 $obj->{_attachment}{$name} = undef; 297 $obj->{_attachment}{$name} = undef;
320
321 $res->{attachment} = $name;
322 $res
323} 298}
324 299
325*cf::object::attach = 300sub cf::attachable::attach {
326*cf::player::attach = 301 if (ref $_[0]) {
327*cf::map::attach = sub { 302 _object_attach @_;
328 my ($obj, $name, %arg) = @_; 303 } else {
329 304 _attach shift->_attach_registry, @_;
330 _attach_attachment $obj, $name, %arg; 305 }
331}; 306};
332 307
333# all those should be optimised 308# all those should be optimised
334*cf::object::detach = 309sub cf::attachable::detach {
335*cf::player::detach =
336*cf::map::detach = sub {
337 my ($obj, $name) = @_; 310 my ($obj, $name) = @_;
338 311
312 if (ref $obj) {
339 delete $obj->{_attachment}{$name}; 313 delete $obj->{_attachment}{$name};
340 reattach ($obj); 314 reattach ($obj);
315 } else {
316 Carp::croak "cannot, currently, detach class attachments";
317 }
341}; 318};
342 319
343*cf::object::attached = 320sub cf::attachable::attached {
344*cf::player::attached =
345*cf::map::attached = sub {
346 my ($obj, $name) = @_; 321 my ($obj, $name) = @_;
347 322
348 exists $obj->{_attachment}{$name} 323 exists $obj->{_attachment}{$name}
349};
350
351sub attach_global {
352 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
353} 324}
354 325
355sub attach_to_type { 326for my $klass (qw(GLOBAL OBJECT PLAYER CLIENT MAP)) {
356 my $type = shift; 327 eval "#line " . __LINE__ . " 'cf.pm'
357 my $subtype = shift; 328 sub cf::\L$klass\E::_attach_registry {
329 (\\\@CB_$klass, KLASS_$klass)
330 }
358 331
359 _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_ 332 sub cf::\L$klass\E::attachment {
360}
361
362sub attach_to_objects {
363 _attach @CB_OBJECT, KLASS_OBJECT, @_
364}
365
366sub attach_to_players {
367 _attach @CB_PLAYER, KLASS_PLAYER, @_
368}
369
370sub attach_to_maps {
371 _attach @CB_MAP, KLASS_MAP, @_
372}
373
374sub register_attachment {
375 my $name = shift; 333 my \$name = shift;
376 334
377 $attachment{$name} = [[KLASS_OBJECT, @_]];
378}
379
380sub register_player_attachment {
381 my $name = shift;
382
383 $attachment{$name} = [[KLASS_PLAYER, @_]];
384}
385
386sub register_map_attachment {
387 my $name = shift;
388
389 $attachment{$name} = [[KLASS_MAP, @_]]; 335 \$attachment{\$name} = [[KLASS_$klass, \@_]];
336 }
337 ";
338 die if $@;
390} 339}
391 340
392our $override; 341our $override;
393our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 342our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
394 343
… …
424 373
425=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...) 374=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...)
426 375
427=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...) 376=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...)
428 377
378=item $bool = $client->invoke (EVENT_CLIENT_XXX, ...)
379
429=item $bool = $map->invoke (EVENT_MAP_XXX, ...) 380=item $bool = $map->invoke (EVENT_MAP_XXX, ...)
430 381
431Generate a global/object/player/map-specific event with the given arguments. 382Generate a global/object/player/map-specific event with the given arguments.
432 383
433This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be 384This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be
… …
438 389
439=cut 390=cut
440 391
441############################################################################# 392#############################################################################
442 393
443=head2 METHODS VALID FOR ALL CORE OBJECTS 394=head2 METHODS VALID FOR ALL ATTACHABLE OBJECTS
395
396Attachable objects includes objects, players, clients and maps.
444 397
445=over 4 398=over 4
446 399
447=item $object->valid, $player->valid, $map->valid 400=item $object->valid
448 401
449Just because you have a perl object does not mean that the corresponding 402Just because you have a perl object does not mean that the corresponding
450C-level object still exists. If you try to access an object that has no 403C-level object still exists. If you try to access an object that has no
451valid C counterpart anymore you get an exception at runtime. This method 404valid C counterpart anymore you get an exception at runtime. This method
452can be used to test for existence of the C object part without causing an 405can be used to test for existence of the C object part without causing an
… …
454 407
455=back 408=back
456 409
457=cut 410=cut
458 411
459*cf::object::valid =
460*cf::player::valid =
461*cf::map::valid = \&cf::_valid;
462
463############################################################################# 412#############################################################################
464# object support 413# object support
465 414
466sub instantiate { 415sub instantiate {
467 my ($obj, $data) = @_; 416 my ($obj, $data) = @_;
… …
486 435
487 for my $name (keys %{ $obj->{_attachment} || {} }) { 436 for my $name (keys %{ $obj->{_attachment} || {} }) {
488 if (my $attach = $attachment{$name}) { 437 if (my $attach = $attachment{$name}) {
489 for (@$attach) { 438 for (@$attach) {
490 my ($klass, @attach) = @$_; 439 my ($klass, @attach) = @$_;
491 _attach @$registry, $klass, @attach; 440 _attach $registry, $klass, @attach;
492 } 441 }
493 } else { 442 } else {
494 warn "object uses attachment '$name' that is not available, postponing.\n"; 443 warn "object uses attachment '$name' that is not available, postponing.\n";
495 } 444 }
496 } 445 }
… …
552 } 501 }
553 502
554 () 503 ()
555} 504}
556 505
557attach_to_objects 506cf::object->attach (
558 prio => -1000000, 507 prio => -1000000,
559 on_clone => sub { 508 on_clone => sub {
560 my ($src, $dst) = @_; 509 my ($src, $dst) = @_;
561 510
562 @{$dst->registry} = @{$src->registry}; 511 @{$dst->registry} = @{$src->registry};
… …
564 %$dst = %$src; 513 %$dst = %$src;
565 514
566 %{$dst->{_attachment}} = %{$src->{_attachment}} 515 %{$dst->{_attachment}} = %{$src->{_attachment}}
567 if exists $src->{_attachment}; 516 if exists $src->{_attachment};
568 }, 517 },
569; 518);
570 519
571############################################################################# 520#############################################################################
572# old plug-in events 521# command handling &c
573 522
574sub inject_event { 523=item cf::register_command $name => \&callback($ob,$args);
575 my $extension = shift;
576 my $event_code = shift;
577 524
578 my $cb = $hook[$event_code]{$extension} 525Register a callback for execution when the client sends the user command
579 or return; 526$name.
580 527
581 &$cb 528=cut
582}
583
584sub inject_global_event {
585 my $event = shift;
586
587 my $cb = $hook[$event]
588 or return;
589
590 List::Util::max map &$_, values %$cb
591}
592
593sub inject_command {
594 my ($name, $obj, $params) = @_;
595
596 for my $cmd (@{ $command{$name} }) {
597 $cmd->[1]->($obj, $params);
598 }
599
600 -1
601}
602 529
603sub register_command { 530sub register_command {
604 my ($name, $time, $cb) = @_; 531 my ($name, $cb) = @_;
605 532
606 my $caller = caller; 533 my $caller = caller;
607 #warn "registering command '$name/$time' to '$caller'"; 534 #warn "registering command '$name/$time' to '$caller'";
608 535
609 push @{ $command{$name} }, [$time, $cb, $caller]; 536 push @{ $COMMAND{$name} }, [$caller, $cb];
610 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
611} 537}
538
539=item cf::register_extcmd $name => \&callback($pl,$packet);
540
541Register a callbackf ro execution when the client sends an extcmd packet.
542
543If the callback returns something, it is sent back as if reply was being
544called.
545
546=cut
612 547
613sub register_extcmd { 548sub register_extcmd {
614 my ($name, $cb) = @_; 549 my ($name, $cb) = @_;
615 550
616 my $caller = caller; 551 my $caller = caller;
617 #warn "registering extcmd '$name' to '$caller'"; 552 #warn "registering extcmd '$name' to '$caller'";
618 553
619 $extcmd{$name} = [$cb, $caller]; 554 $EXTCMD{$name} = [$cb, $caller];
620} 555}
556
557cf::player->attach (
558 on_command => sub {
559 my ($pl, $name, $params) = @_;
560
561 my $cb = $COMMAND{$name}
562 or return;
563
564 for my $cmd (@$cb) {
565 $cmd->[1]->($pl->ob, $params);
566 }
567
568 cf::override;
569 },
570 on_extcmd => sub {
571 my ($pl, $buf) = @_;
572
573 my $msg = eval { from_json $buf };
574
575 if (ref $msg) {
576 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
577 if (my %reply = $cb->[0]->($pl, $msg)) {
578 $pl->ext_reply ($msg->{msgid}, %reply);
579 }
580 }
581 } else {
582 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
583 }
584
585 cf::override;
586 },
587);
621 588
622sub register { 589sub register {
623 my ($base, $pkg) = @_; 590 my ($base, $pkg) = @_;
624 591
625 #TODO 592 #TODO
… …
668# for my $idx (0 .. $#PLUGIN_EVENT) { 635# for my $idx (0 .. $#PLUGIN_EVENT) {
669# delete $hook[$idx]{$pkg}; 636# delete $hook[$idx]{$pkg};
670# } 637# }
671 638
672 # remove commands 639 # remove commands
673 for my $name (keys %command) { 640 for my $name (keys %COMMAND) {
674 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 641 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
675 642
676 if (@cb) { 643 if (@cb) {
677 $command{$name} = \@cb; 644 $COMMAND{$name} = \@cb;
678 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
679 } else { 645 } else {
680 delete $command{$name};
681 delete $COMMAND{"$name\000"}; 646 delete $COMMAND{$name};
682 } 647 }
683 } 648 }
684 649
685 # remove extcmds 650 # remove extcmds
686 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 651 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
687 delete $extcmd{$name}; 652 delete $EXTCMD{$name};
688 } 653 }
689 654
690 if (my $cb = $pkg->can ("unload")) { 655 if (my $cb = $pkg->can ("unload")) {
691 eval { 656 eval {
692 $cb->($pkg); 657 $cb->($pkg);
… …
696 661
697 Symbol::delete_package $pkg; 662 Symbol::delete_package $pkg;
698} 663}
699 664
700sub load_extensions { 665sub load_extensions {
701 my $LIBDIR = maps_directory "perl";
702
703 for my $ext (<$LIBDIR/*.ext>) { 666 for my $ext (<$LIBDIR/*.ext>) {
704 next unless -r $ext; 667 next unless -r $ext;
705 eval { 668 eval {
706 load_extension $ext; 669 load_extension $ext;
707 1 670 1
708 } or warn "$ext not loaded: $@"; 671 } or warn "$ext not loaded: $@";
709 } 672 }
710} 673}
711 674
712############################################################################# 675#############################################################################
713# extcmd framework, basically convert ext <msg>
714# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
715
716attach_to_players
717 on_extcmd => sub {
718 my ($pl, $buf) = @_;
719
720 my $msg = eval { from_json $buf };
721
722 if (ref $msg) {
723 if (my $cb = $extcmd{$msg->{msgtype}}) {
724 if (my %reply = $cb->[0]->($pl, $msg)) {
725 $pl->ext_reply ($msg->{msgid}, %reply);
726 }
727 }
728 } else {
729 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
730 }
731
732 cf::override;
733 },
734;
735
736#############################################################################
737# load/save/clean perl data associated with a map 676# load/save/clean perl data associated with a map
738 677
739*cf::mapsupport::on_clean = sub { 678*cf::mapsupport::on_clean = sub {
740 my ($map) = @_; 679 my ($map) = @_;
741 680
… …
743 defined $path or return; 682 defined $path or return;
744 683
745 unlink "$path.pst"; 684 unlink "$path.pst";
746}; 685};
747 686
748attach_to_maps prio => -10000, package => cf::mapsupport::; 687cf::map->attach (prio => -10000, package => cf::mapsupport::);
749 688
750############################################################################# 689#############################################################################
751# load/save perl data associated with player->ob objects 690# load/save perl data associated with player->ob objects
752 691
753sub all_objects(@) { 692sub all_objects(@) {
754 @_, map all_objects ($_->inv), @_ 693 @_, map all_objects ($_->inv), @_
755} 694}
756 695
757# TODO: compatibility cruft, remove when no longer needed 696# TODO: compatibility cruft, remove when no longer needed
758attach_to_players 697cf::player->attach (
759 on_load => sub { 698 on_load => sub {
760 my ($pl, $path) = @_; 699 my ($pl, $path) = @_;
761 700
762 for my $o (all_objects $pl->ob) { 701 for my $o (all_objects $pl->ob) {
763 if (my $value = $o->get_ob_key_value ("_perl_data")) { 702 if (my $value = $o->get_ob_key_value ("_perl_data")) {
… …
765 704
766 %$o = %{ Storable::thaw pack "H*", $value }; 705 %$o = %{ Storable::thaw pack "H*", $value };
767 } 706 }
768 } 707 }
769 }, 708 },
770; 709);
771 710
772############################################################################# 711#############################################################################
773 712
774=head2 CORE EXTENSIONS 713=head2 CORE EXTENSIONS
775 714
… …
866 805
867=pod 806=pod
868 807
869The following fucntions and emthods are available within a safe environment: 808The following fucntions and emthods are available within a safe environment:
870 809
871 cf::object contr pay_amount pay_player 810 cf::object contr pay_amount pay_player map
872 cf::object::player player 811 cf::object::player player
873 cf::player peaceful 812 cf::player peaceful
813 cf::map trigger
874 814
875=cut 815=cut
876 816
877for ( 817for (
878 ["cf::object" => qw(contr pay_amount pay_player)], 818 ["cf::object" => qw(contr pay_amount pay_player map)],
879 ["cf::object::player" => qw(player)], 819 ["cf::object::player" => qw(player)],
880 ["cf::player" => qw(peaceful)], 820 ["cf::player" => qw(peaceful)],
821 ["cf::map" => qw(trigger)],
881) { 822) {
882 no strict 'refs'; 823 no strict 'refs';
883 my ($pkg, @funs) = @$_; 824 my ($pkg, @funs) = @$_;
884 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 825 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
885 for @funs; 826 for @funs;
… …
1025 sub db_sync() { 966 sub db_sync() {
1026 db_save if $dirty; 967 db_save if $dirty;
1027 undef $dirty; 968 undef $dirty;
1028 } 969 }
1029 970
1030 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, cb => sub { 971 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
1031 db_sync; 972 db_sync;
1032 }); 973 });
1033 974
1034 sub db_dirty() { 975 sub db_dirty() {
1035 $dirty = 1; 976 $dirty = 1;
… …
1049 $DB->{$_[0]} = $_[1]; 990 $DB->{$_[0]} = $_[1];
1050 } 991 }
1051 db_dirty; 992 db_dirty;
1052 } 993 }
1053 994
1054 attach_global 995 cf::global->attach (
1055 prio => 10000, 996 prio => 10000,
1056 on_cleanup => sub { 997 on_cleanup => sub {
1057 db_sync; 998 db_sync;
1058 }, 999 },
1059 ; 1000 );
1060} 1001}
1061 1002
1062############################################################################# 1003#############################################################################
1063# the server's main() 1004# the server's main()
1064 1005
… …
1085 1026
1086 $msg->("reloading..."); 1027 $msg->("reloading...");
1087 1028
1088 eval { 1029 eval {
1089 # cancel all watchers 1030 # cancel all watchers
1090 $_->cancel for Event::all_watchers; 1031 for (Event::all_watchers) {
1032 $_->cancel if $_->data & WF_AUTOCANCEL;
1033 }
1091 1034
1092 # unload all extensions 1035 # unload all extensions
1093 for (@exts) { 1036 for (@exts) {
1094 $msg->("unloading <$_>"); 1037 $msg->("unloading <$_>");
1095 unload_extension $_; 1038 unload_extension $_;
… …
1155 warn $_[0]; 1098 warn $_[0];
1156 print "$_[0]\n"; 1099 print "$_[0]\n";
1157 }; 1100 };
1158} 1101}
1159 1102
1103register "<global>", __PACKAGE__;
1104
1160register_command "perl-reload", 0, sub { 1105register_command "perl-reload" => sub {
1161 my ($who, $arg) = @_; 1106 my ($who, $arg) = @_;
1162 1107
1163 if ($who->flag (FLAG_WIZ)) { 1108 if ($who->flag (FLAG_WIZ)) {
1164 _perl_reload { 1109 _perl_reload {
1165 warn $_[0]; 1110 warn $_[0];
1166 $who->message ($_[0]); 1111 $who->message ($_[0]);
1167 }; 1112 };
1168 } 1113 }
1169}; 1114};
1170 1115
1171register "<global>", __PACKAGE__;
1172
1173unshift @INC, $LIBDIR; 1116unshift @INC, $LIBDIR;
1174 1117
1175$TICK_WATCHER = Event->timer ( 1118$TICK_WATCHER = Event->timer (
1176 prio => 1, 1119 prio => 0,
1177 async => 1,
1178 at => $NEXT_TICK || 1, 1120 at => $NEXT_TICK || 1,
1121 data => WF_AUTOCANCEL,
1179 cb => sub { 1122 cb => sub {
1180 cf::server_tick; # one server iteration 1123 cf::server_tick; # one server iteration
1181 1124
1182 my $NOW = Event::time; 1125 my $NOW = Event::time;
1183 $NEXT_TICK += $TICK; 1126 $NEXT_TICK += $TICK;
… …
1193IO::AIO::max_poll_time $TICK * 0.2; 1136IO::AIO::max_poll_time $TICK * 0.2;
1194 1137
1195Event->io (fd => IO::AIO::poll_fileno, 1138Event->io (fd => IO::AIO::poll_fileno,
1196 poll => 'r', 1139 poll => 'r',
1197 prio => 5, 1140 prio => 5,
1141 data => WF_AUTOCANCEL,
1198 cb => \&IO::AIO::poll_cb); 1142 cb => \&IO::AIO::poll_cb);
1199 1143
12001 11441
1201 1145

Diff Legend

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