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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.58 by root, Wed Aug 30 12:08:15 2006 UTC vs.
Revision 1.60 by root, Thu Aug 31 06:23:19 2006 UTC

       }
    }
 }
 sub object_freezer_save {
-   my ($filename, $objs) = @_;
+   my ($filename, $rdata, $objs) = @_;
-   if (@$objs) {
+   if (length $$rdata) {
+      warn sprintf "saving %s (%d,%d)\n",
+         $filename, length $$rdata, scalar @$objs;
-      open my $fh, ">:raw", "$filename.pst~";
+      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 };
+            syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
-      close $fh;
+            close $fh;
-      chmod SAVE_MODE, "$filename.pst~";
-      rename "$filename.pst~", "$filename.pst";
+            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 {
    my ($filename) = @_;
 sub all_objects(@) {
    @_, map all_objects ($_->inv), @_
 }
+# TODO: compatibility cruft, remove when no longer needed
 attach_to_players
    on_load => sub {
       my ($pl, $path) = @_;
       for my $o (all_objects $pl->ob) {

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