--- deliantra/server/lib/cf.pm	2006/08/29 17:32:19	1.55
+++ deliantra/server/lib/cf.pm	2006/08/31 06:23:19	1.60
@@ -478,20 +478,34 @@
 }
 
 sub object_freezer_save {
-   my ($filename, $objs) = @_;
+   my ($filename, $rdata, $objs) = @_;
 
-   if (@$objs) {
-      open my $fh, ">:raw", "$filename.pst~";
-      syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
-      close $fh;
-      chmod SAVE_MODE, "$filename.pst~";
-      rename "$filename.pst~", "$filename.pst";
+   if (length $$rdata) {
+      warn sprintf "saving %s (%d,%d)\n",
+         $filename, length $$rdata, scalar @$objs;
+
+      if (open my $fh, ">:raw", "$filename~") {
+         chmod SAVE_MODE, $fh;
+         syswrite $fh, $$rdata;
+         close $fh;
+
+         if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
+            chmod SAVE_MODE, $fh;
+            syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
+            close $fh;
+            rename "$filename.pst~", "$filename.pst";
+         } else {
+            unlink "$filename.pst";
+         }
+
+         rename "$filename~", $filename;
+      } else {
+         warn "FATAL: $filename~: $!\n";
+      }
    } else {
+      unlink $filename;
       unlink "$filename.pst";
    }
-
-   chmod SAVE_MODE, "$filename~";
-   rename "$filename~", $filename;
 }
 
 sub object_thawer_load {
@@ -766,26 +780,6 @@
    unlink "$path.pst";
 };
 
-# old style persistent data, TODO: remove #d#
-*cf::mapsupport::on_swapin =
-*cf::mapsupport::on_load = sub {
-   my ($map) = @_;
-
-   my $path = $map->tmpname;
-   $path = $map->path unless defined $path;
-
-   open my $fh, "<:raw", "$path.cfperl"
-      or return; # no perl data
-
-   my $data = Storable::thaw do { local $/; <$fh> };
-
-   $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::;
 
 #############################################################################
@@ -795,6 +789,7 @@
    @_, map all_objects ($_->inv), @_
 }
 
+# TODO: compatibility cruft, remove when no longer needed
 attach_to_players
    on_load => sub {
       my ($pl, $path) = @_;