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.47 by root, Sun Aug 27 13:02:04 2006 UTC vs.
Revision 1.54 by root, Tue Aug 29 14:49:28 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 {
… …
105} 105}
106 106
107############################################################################# 107#############################################################################
108# "new" plug-in system 108# "new" plug-in system
109 109
110=item $object->attach ($attachment, key => $value...)
111
110=item $object->attach ($attachment, ...) 112=item $object->detach ($attachment)
111 113
112Attach a pre-registered attachment to an object. 114Attach/detach a pre-registered attachment to an object.
113 115
116=item $player->attach ($attachment, key => $value...)
117
114=item $player->attach ($attachment, ...) 118=item $player->detach ($attachment)
115 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, ...) # 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
… …
245 259
246 \%undo 260 \%undo
247} 261}
248 262
249sub _attach_attachment { 263sub _attach_attachment {
250 my ($obj, $name, @args) = @_; 264 my ($obj, $name, %arg) = @_;
251 265
252 my $res; 266 my $res;
253 267
254 if (my $attach = $attachment{$name}) { 268 if (my $attach = $attachment{$name}) {
255 my $registry = $obj->registry; 269 my $registry = $obj->registry;
… …
257 for (@$attach) { 271 for (@$attach) {
258 my ($klass, @attach) = @$_; 272 my ($klass, @attach) = @$_;
259 $res = _attach @$registry, $klass, @attach; 273 $res = _attach @$registry, $klass, @attach;
260 } 274 }
261 275
262 if (my $cb = delete $registry->[EVENT_OBJECT_INSTANTIATE]) { 276 $obj->{$name} = \%arg;
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 { 277 } else {
272 warn "object uses attachment '$name' that is not available, postponing.\n"; 278 warn "object uses attachment '$name' that is not available, postponing.\n";
273 } 279 }
274 280
275 push @{$obj->{_attachment}}, $name; 281 $obj->{_attachment}{$name} = undef;
276 282
277 $res->{attachment} = $name; 283 $res->{attachment} = $name;
278 $res 284 $res
279} 285}
280 286
281sub cf::object::attach { 287*cf::object::attach =
288*cf::player::attach =
289*cf::map::attach = sub {
282 my ($obj, $name, @args) = @_; 290 my ($obj, $name, %arg) = @_;
283 291
284 _attach_attachment $obj, $name, @args; 292 _attach_attachment $obj, $name, %arg;
285} 293}
286 294
295# all those should be optimised
296*cf::object::detach =
287sub cf::player::attach { 297*cf::player::detach =
298*cf::map::detach = sub {
288 my ($obj, $name, @args) = @_; 299 my ($obj, $name) = @_;
289 300
290 _attach_attachment KLASS_PLAYER, $obj, $name, @args; 301 delete $obj->{_attachment}{$name};
291} 302 reattach $obj;
292 303};
293sub cf::map::attach {
294 my ($obj, $name, @args) = @_;
295
296 _attach_attachment KLASS_MAP, $obj, $name, @args;
297}
298 304
299sub attach_global { 305sub attach_global {
300 _attach @CB_GLOBAL, KLASS_GLOBAL, @_ 306 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
301} 307}
302 308
… …
321 327
322sub register_attachment { 328sub register_attachment {
323 my $name = shift; 329 my $name = shift;
324 330
325 $attachment{$name} = [[KLASS_OBJECT, @_]]; 331 $attachment{$name} = [[KLASS_OBJECT, @_]];
332}
333
334sub register_map_attachment {
335 my $name = shift;
336
337 $attachment{$name} = [[KLASS_MAP, @_]];
326} 338}
327 339
328our $override; 340our $override;
329our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 341our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
330 342
… …
364 376
365 $data = from_json $data; 377 $data = from_json $data;
366 378
367 for (@$data) { 379 for (@$data) {
368 my ($name, $args) = @$_; 380 my ($name, $args) = @$_;
369 attach $obj, $name, @{$args || [] }; 381
382 $obj->attach ($name, %{$args || {} });
370 } 383 }
371} 384}
372 385
373# basically do the same as instantiate, without calling instantiate 386# basically do the same as instantiate, without calling instantiate
374sub reattach { 387sub reattach {
375 my ($obj) = @_; 388 my ($obj) = @_;
376 my $registry = $obj->registry; 389 my $registry = $obj->registry;
377 390
378 @$registry = (); 391 @$registry = ();
379 392
393 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
394
380 for my $name (@{ $obj->{_attachment} }) { 395 for my $name (keys %{ $obj->{_attachment} || {} }) {
381 if (my $attach = $attachment{$name}) { 396 if (my $attach = $attachment{$name}) {
382 for (@$attach) { 397 for (@$attach) {
383 my ($klass, @attach) = @$_; 398 my ($klass, @attach) = @$_;
384 _attach @$registry, $klass, @attach; 399 _attach @$registry, $klass, @attach;
385 } 400 }
… …
390} 405}
391 406
392sub object_freezer_save { 407sub object_freezer_save {
393 my ($filename, $objs) = @_; 408 my ($filename, $objs) = @_;
394 409
395 $filename .= ".pst";
396
397 if (@$objs) { 410 if (@$objs) {
398 open my $fh, ">:raw", "$filename~"; 411 open my $fh, ">:raw", "$filename.pst~";
399 chmod $fh, SAVE_MODE;
400 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs }; 412 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
401 close $fh; 413 close $fh;
414 chmod SAVE_MODE, "$filename.pst~";
402 rename "$filename~", $filename; 415 rename "$filename.pst~", "$filename.pst";
403 } else { 416 } else {
404 unlink $filename; 417 unlink "$filename.pst";
405 } 418 }
419
420 chmod SAVE_MODE, "$filename~";
421 rename "$filename~", $filename;
406} 422}
407 423
408sub object_thawer_load { 424sub object_thawer_load {
409 my ($filename) = @_; 425 my ($filename) = @_;
410 426
… …
421 437
422 @{$dst->registry} = @{$src->registry}; 438 @{$dst->registry} = @{$src->registry};
423 439
424 %$dst = %$src; 440 %$dst = %$src;
425 441
426 $dst->{_attachment} = [@{ $src->{_attachment} }] 442 %{$dst->{_attachment}} = %{$src->{_attachment}}
427 if exists $src->{_attachment}; 443 if exists $src->{_attachment};
428 }, 444 },
429; 445;
430 446
431############################################################################# 447#############################################################################
… …
672 my ($map) = @_; 688 my ($map) = @_;
673 689
674 my $path = $map->tmpname; 690 my $path = $map->tmpname;
675 defined $path or return; 691 defined $path or return;
676 692
677 unlink "$path.cfperl";
678 unlink "$path.pst"; 693 unlink "$path.pst";
679}; 694};
680 695
696# old style persistent data, TODO: remove #d#
681*cf::mapsupport::on_swapin = 697*cf::mapsupport::on_swapin =
682*cf::mapsupport::on_load = sub { 698*cf::mapsupport::on_load = sub {
683 my ($map) = @_; 699 my ($map) = @_;
684 700
685 my $path = $map->tmpname; 701 my $path = $map->tmpname;
… …
692 708
693 $data->{version} <= 1 709 $data->{version} <= 1
694 or return; # too new 710 or return; # too new
695 711
696 $map->_set_obs ($data->{obs}); 712 $map->_set_obs ($data->{obs});
713 $map->invoke (EVENT_MAP_UPGRADE);
697}; 714};
698 715
699attach_to_maps prio => -10000, package => cf::mapsupport::; 716attach_to_maps prio => -10000, package => cf::mapsupport::;
700 717
701############################################################################# 718#############################################################################

Diff Legend

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