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.48 by root, Sun Aug 27 15:24:22 2006 UTC vs.
Revision 1.53 by root, Tue Aug 29 13:11:58 2006 UTC

… …
72 72
73@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 73@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
74 74
75# we bless all objects into (empty) derived classes to force a method lookup 75# we bless all objects into (empty) derived classes to force a method lookup
76# within the Safe compartment. 76# within the Safe compartment.
77for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch)) { 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'; 78 no strict 'refs';
79 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 79 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
80} 80}
81 81
82$Event::DIED = sub { 82$Event::DIED = sub {
… …
107############################################################################# 107#############################################################################
108# "new" plug-in system 108# "new" plug-in system
109 109
110=item $object->attach ($attachment, key => $value...) 110=item $object->attach ($attachment, key => $value...)
111 111
112=item $object->detach ($attachment)
113
112Attach a pre-registered attachment to an object. 114Attach/detach a pre-registered attachment to an object.
113 115
114=item $player->attach ($attachment, key => $value...) 116=item $player->attach ($attachment, key => $value...)
115 117
118=item $player->detach ($attachment)
119
116Attach a pre-registered attachment to a player. 120Attach/detach a pre-registered attachment to a player.
117 121
118=item $map->attach ($attachment, key => $value...) # not yet persistent 122=item $map->attach ($attachment, key => $value...)
119 123
124=item $map->detach ($attachment)
125
120Attach a pre-registered attachment to a map. 126Attach/detach a pre-registered attachment to a map.
121 127
122=item cf::attach_global ... 128=item cf::attach_global ...
123 129
124Attach handlers for global events. 130Attach handlers for global events.
125 131
… …
173=item cf::attach_to_maps ... 179=item cf::attach_to_maps ...
174 180
175Attach handlers to all maps. 181Attach handlers to all maps.
176 182
177=item cf:register_attachment $name, ... 183=item cf:register_attachment $name, ...
184
185Register an attachment by name through which objects can refer to this
186attachment.
187
188=item cf:register_map_attachment $name, ...
189
190Register an attachment by name through which maps can refer to this
191attachment.
178 192
179=cut 193=cut
180 194
181# the following variables are defined in .xs and must not be re-created 195# the following variables are defined in .xs and must not be re-created
182our @CB_GLOBAL = (); # registry for all global events 196our @CB_GLOBAL = (); # registry for all global events
… …
262 $obj->{$name} = \%arg; 276 $obj->{$name} = \%arg;
263 } else { 277 } else {
264 warn "object uses attachment '$name' that is not available, postponing.\n"; 278 warn "object uses attachment '$name' that is not available, postponing.\n";
265 } 279 }
266 280
267 push @{$obj->{_attachment}}, $name; 281 $obj->{_attachment}{$name} = undef;
268 282
269 $res->{attachment} = $name; 283 $res->{attachment} = $name;
270 $res 284 $res
271} 285}
272 286
… …
277} 291}
278 292
279sub cf::player::attach { 293sub cf::player::attach {
280 my ($obj, $name, %arg) = @_; 294 my ($obj, $name, %arg) = @_;
281 295
282 _attach_attachment KLASS_PLAYER, $obj, $name, %arg; 296 _attach_attachment $obj, $name, %arg;
283} 297}
284 298
285sub cf::map::attach { 299sub cf::map::attach {
286 my ($obj, $name, %arg) = @_; 300 my ($obj, $name, %arg) = @_;
287 301
288 _attach_attachment KLASS_MAP, $obj, $name, %arg; 302 _attach_attachment $obj, $name, %arg;
303}
304
305sub cf::object::detach {
306 my ($obj, $name) = @_;
307 die;#d#
308}
309sub cf::player::detach {
310 my ($obj, $name) = @_;
311 die;#d#
312}
313sub cf::map::detach {
314 my ($obj, $name) = @_;
315 die;#d#
289} 316}
290 317
291sub attach_global { 318sub attach_global {
292 _attach @CB_GLOBAL, KLASS_GLOBAL, @_ 319 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
293} 320}
… …
313 340
314sub register_attachment { 341sub register_attachment {
315 my $name = shift; 342 my $name = shift;
316 343
317 $attachment{$name} = [[KLASS_OBJECT, @_]]; 344 $attachment{$name} = [[KLASS_OBJECT, @_]];
345}
346
347sub register_map_attachment {
348 my $name = shift;
349
350 $attachment{$name} = [[KLASS_MAP, @_]];
318} 351}
319 352
320our $override; 353our $override;
321our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 354our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
322 355
… …
356 389
357 $data = from_json $data; 390 $data = from_json $data;
358 391
359 for (@$data) { 392 for (@$data) {
360 my ($name, $args) = @$_; 393 my ($name, $args) = @$_;
394
361 attach $obj, $name, %{$args || {} }; 395 $obj->attach ($name, %{$args || {} });
362 } 396 }
363} 397}
364 398
365# basically do the same as instantiate, without calling instantiate 399# basically do the same as instantiate, without calling instantiate
366sub reattach { 400sub reattach {
367 my ($obj) = @_; 401 my ($obj) = @_;
368 my $registry = $obj->registry; 402 my $registry = $obj->registry;
369 403
370 @$registry = (); 404 @$registry = ();
371 405
406 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
407
372 for my $name (@{ $obj->{_attachment} }) { 408 for my $name (keys %{ $obj->{_attachment} || {} }) {
373 if (my $attach = $attachment{$name}) { 409 if (my $attach = $attachment{$name}) {
374 for (@$attach) { 410 for (@$attach) {
375 my ($klass, @attach) = @$_; 411 my ($klass, @attach) = @$_;
376 _attach @$registry, $klass, @attach; 412 _attach @$registry, $klass, @attach;
377 } 413 }
… …
382} 418}
383 419
384sub object_freezer_save { 420sub object_freezer_save {
385 my ($filename, $objs) = @_; 421 my ($filename, $objs) = @_;
386 422
387 $filename .= ".pst";
388
389 if (@$objs) { 423 if (@$objs) {
390 open my $fh, ">:raw", "$filename~"; 424 open my $fh, ">:raw", "$filename.pst~";
391 chmod $fh, SAVE_MODE;
392 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs }; 425 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
393 close $fh; 426 close $fh;
427 chmod SAVE_MODE, "$filename.pst~";
394 rename "$filename~", $filename; 428 rename "$filename.pst~", "$filename.pst";
395 } else { 429 } else {
396 unlink $filename; 430 unlink "$filename.pst";
397 } 431 }
432
433 chmod SAVE_MODE, "$filename~";
434 rename "$filename~", $filename;
398} 435}
399 436
400sub object_thawer_load { 437sub object_thawer_load {
401 my ($filename) = @_; 438 my ($filename) = @_;
402 439
… …
413 450
414 @{$dst->registry} = @{$src->registry}; 451 @{$dst->registry} = @{$src->registry};
415 452
416 %$dst = %$src; 453 %$dst = %$src;
417 454
418 $dst->{_attachment} = [@{ $src->{_attachment} }] 455 %{$dst->{_attachment}} = %{$src->{_attachment}}
419 if exists $src->{_attachment}; 456 if exists $src->{_attachment};
420 }, 457 },
421; 458;
422 459
423############################################################################# 460#############################################################################
… …
664 my ($map) = @_; 701 my ($map) = @_;
665 702
666 my $path = $map->tmpname; 703 my $path = $map->tmpname;
667 defined $path or return; 704 defined $path or return;
668 705
669 unlink "$path.cfperl";
670 unlink "$path.pst"; 706 unlink "$path.pst";
671}; 707};
672 708
709# old style persistent data, TODO: remove #d#
673*cf::mapsupport::on_swapin = 710*cf::mapsupport::on_swapin =
674*cf::mapsupport::on_load = sub { 711*cf::mapsupport::on_load = sub {
675 my ($map) = @_; 712 my ($map) = @_;
676 713
677 my $path = $map->tmpname; 714 my $path = $map->tmpname;
… …
684 721
685 $data->{version} <= 1 722 $data->{version} <= 1
686 or return; # too new 723 or return; # too new
687 724
688 $map->_set_obs ($data->{obs}); 725 $map->_set_obs ($data->{obs});
726 $map->invoke (EVENT_MAP_UPGRADE);
689}; 727};
690 728
691attach_to_maps prio => -10000, package => cf::mapsupport::; 729attach_to_maps prio => -10000, package => cf::mapsupport::;
692 730
693############################################################################# 731#############################################################################

Diff Legend

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