[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.49 by root, Sun Aug 27 17:59:26 2006 UTC vs.
Revision 1.57 by root, Wed Aug 30 11:21:24 2006 UTC

 @safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
 # we bless all objects into (empty) derived classes to force a method lookup
 # within the Safe compartment.
-for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
+for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) {
    no strict 'refs';
    @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
 }
 $Event::DIED = sub {
 }
 #############################################################################
 # "new" plug-in system
+=head3 EVENTS AND OBJECT ATTACHMENTS
+=over 4
 =item $object->attach ($attachment, key => $value...)
+=item $object->detach ($attachment)
-Attach a pre-registered attachment to an object.
+Attach/detach a pre-registered attachment to an object.
 =item $player->attach ($attachment, key => $value...)
+=item $player->detach ($attachment)
-Attach a pre-registered attachment to a player.
+Attach/detach a pre-registered attachment to a player.
-=item $map->attach ($attachment, key => $value...) # not yet persistent
+=item $map->attach ($attachment, key => $value...)
+=item $map->detach ($attachment)
-Attach a pre-registered attachment to a map.
+Attach/detach a pre-registered attachment to a map.
+=item $bool = $object->attached ($name)
+=item $bool = $player->attached ($name)
+=item $bool = $map->attached ($name)
+Checks wether the named attachment is currently attached to the object.
 =item cf::attach_global ...
 Attach handlers for global events.
 =item cf::attach_to_maps ...
 Attach handlers to all maps.
 =item cf:register_attachment $name, ...
+Register an attachment by name through which objects can refer to this
+attachment.
+=item cf:register_player_attachment $name, ...
+Register an attachment by name through which players can refer to this
+attachment.
+=item cf:register_map_attachment $name, ...
+Register an attachment by name through which maps can refer to this
+attachment.
 =cut
 # the following variables are defined in .xs and must not be re-created
 our @CB_GLOBAL = (); # registry for all global events
 }
 sub _attach_attachment {
    my ($obj, $name, %arg) = @_;
+   return if exists $obj->{_attachment}{$name};
    my $res;
    if (my $attach = $attachment{$name}) {
       my $registry = $obj->registry;
       $obj->{$name} = \%arg;
    } else {
       warn "object uses attachment '$name' that is not available, postponing.\n";
    }
-   push @{$obj->{_attachment}}, $name;
+   $obj->{_attachment}{$name} = undef;
    $res->{attachment} = $name;
    $res
 }
-sub cf::object::attach {
+*cf::object::attach =
+*cf::player::attach =
+*cf::map::attach = sub {
    my ($obj, $name, %arg) = @_;
    _attach_attachment $obj, $name, %arg;
-}
+};
+# all those should be optimised
+*cf::object::detach =
-sub cf::player::attach {
+*cf::player::detach =
+*cf::map::detach = sub {
-   my ($obj, $name, %arg) = @_;
+   my ($obj, $name) = @_;
-   _attach_attachment KLASS_PLAYER, $obj, $name, %arg;
+   delete $obj->{_attachment}{$name};
-}
+   reattach ($obj);
+};
-sub cf::map::attach {
+*cf::object::attached =
+*cf::player::attached =
+*cf::map::attached = sub {
-   my ($obj, $name, %arg) = @_;
+   my ($obj, $name) = @_;
-   _attach_attachment KLASS_MAP, $obj, $name, %arg;
+   exists $obj->{_attachment}{$name}
-}
+};
 sub attach_global {
    _attach @CB_GLOBAL, KLASS_GLOBAL, @_
 }
 sub register_attachment {
    my $name = shift;
    $attachment{$name} = [[KLASS_OBJECT, @_]];
+}
+sub register_player_attachment {
+   my $name = shift;
+   $attachment{$name} = [[KLASS_PLAYER, @_]];
+}
+sub register_map_attachment {
+   my $name = shift;
+   $attachment{$name} = [[KLASS_MAP, @_]];
 }
 our $override;
 our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
    }
    0
 }
+=item $bool = cf::invoke EVENT_GLOBAL_XXX, ...
+=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...)
+=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...)
+=item $bool = $map->invoke (EVENT_MAP_XXX, ...)
+Generate a global/object/player/map-specific event with the given arguments.
+This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be
+removed in future versions), and there is no public API to access override
+results (if you must, access C<@cf::invoke_results> directly).
+=back
+=head2 methods valid for all pointers
+=over 4
+=item $object->valid
+=item $player->valid
+=item $map->valid
+Just because you have a perl object does not mean that the corresponding
+C-level object still exists. If you try to access an object that has no
+valid C counterpart anymore you get an exception at runtime. This method
+can be used to test for existence of the C object part without causing an
+exception.
+=back
+=cut
+*cf::object::valid =
+*cf::player::valid =
+*cf::map::valid = \&cf::_valid;
 #############################################################################
 # object support
 sub instantiate {
    my ($obj, $data) = @_;
    my ($obj) = @_;
    my $registry = $obj->registry;
    @$registry = ();
-   delete $obj->{_attachment} unless @{ $obj->{_attachment} || [] };
+   delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
-   for my $name (@{ $obj->{_attachment} || [] }) {
+   for my $name (keys %{ $obj->{_attachment} || {} }) {
       if (my $attach = $attachment{$name}) {
          for (@$attach) {
             my ($klass, @attach) = @$_;
             _attach @$registry, $klass, @attach;
          }
 }
 sub object_freezer_save {
    my ($filename, $objs) = @_;
-   $filename .= ".pst";
    if (@$objs) {
-      open my $fh, ">:raw", "$filename~";
+      open my $fh, ">:raw", "$filename.pst~";
-      chmod $fh, SAVE_MODE;
       syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
       close $fh;
+      unlink "$filename.cfperl";
+      chmod SAVE_MODE, "$filename.pst~";
-      rename "$filename~", $filename;
+      rename "$filename.pst~", "$filename.pst";
    } else {
-      unlink $filename;
+      unlink "$filename.pst";
    }
+   chmod SAVE_MODE, "$filename~";
+   rename "$filename~", $filename;
 }
 sub object_thawer_load {
    my ($filename) = @_;
       @{$dst->registry} = @{$src->registry};
       %$dst = %$src;
-      $dst->{_attachment} = [@{ $src->{_attachment} }]
+      %{$dst->{_attachment}} = %{$src->{_attachment}}
          if exists $src->{_attachment};
    },
 ;
 #############################################################################
    my ($map) = @_;
    my $path = $map->tmpname;
    defined $path or return;
-   unlink "$path.cfperl";
    unlink "$path.pst";
 };
+# old style persistent data, TODO: remove #d#
-*cf::mapsupport::on_swapin =
+*cf::mapsupport::on_swapin = sub {
-*cf::mapsupport::on_load = sub {
    my ($map) = @_;
    my $path = $map->tmpname;
    $path = $map->path unless defined $path;
    $data->{version} <= 1
       or return; # too new
    $map->_set_obs ($data->{obs});
+   $map->invoke (EVENT_MAP_UPGRADE);
 };
 attach_to_maps prio => -10000, package => cf::mapsupport::;
 #############################################################################

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.49 by root, Sun Aug 27 17:59:26 2006 UTC vs. Revision 1.57 by root, Wed Aug 30 11:21:24 2006 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.49 by root, Sun Aug 27 17:59:26 2006 UTC vs.
Revision 1.57 by root, Wed Aug 30 11:21:24 2006 UTC