--- deliantra/server/lib/cf.pm 2006/03/28 16:48:11 1.12 +++ deliantra/server/lib/cf.pm 2006/03/31 22:09:36 1.13 @@ -218,7 +218,7 @@ # load/save/clean perl data associated with a map *on_mapclean = sub { - my $map = shift->{map}; + my ($map) = @_; my $path = $map->tmpname; defined $path or return; @@ -228,7 +228,7 @@ *on_mapin = *on_mapload = sub { - my $map = shift->{map}; + my ($map) = @_; my $path = $map->tmpname; $path = $map->path unless defined $path; @@ -245,7 +245,7 @@ }; *on_mapout = sub { - my $map = shift->{map}; + my ($map) = @_; my $path = $map->tmpname; $path = $map->path unless defined $path; @@ -275,9 +275,7 @@ # load/save perl data associated with player->ob objects *on_player_load = sub { - my ($event) = @_; - my $path = $event->{message}; - my $ob = $event->{who}; + my ($ob, $path) = @_; if (open my $fh, "<:raw", "$path.cfperl") { @@ -302,9 +300,7 @@ }; *on_player_save = sub { - my ($event) = @_; - my $path = $event->{message}; - my $ob = $event->{who}; + my ($ob, $path) = @_; $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_) for grep %$_, $ob, $ob->inv;