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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.60 by root, Thu Aug 31 06:23:19 2006 UTC vs.
Revision 1.61 by root, Sun Sep 3 22:45:56 2006 UTC

 }
 sub object_thawer_load {
    my ($filename) = @_;
+   local $/;
+   my $av;
+   #TODO: use sysread etc.
+   if (open my $data, "<:raw:perlio", $filename) {
+      $data = <$data>;
-   open my $fh, "<:raw:perlio", "$filename.pst"
+      if (open my $pst, "<:raw:perlio", "$filename.pst") {
-      or return;
+         $av = eval { (Storable::thaw <$pst>)->{objs} };
+      }
+      return ($data, $av);
+   }
-   eval { local $/; (Storable::thaw <$fh>)->{objs} }
+   ()
 }
 attach_to_objects
    prio     => -1000000,
    on_clone => sub {
       #Symbol::delete_package __PACKAGE__;
       # 7. reload cf.pm
       $msg->("reloading cf.pm");
       require cf;
+      $msg->("load extensions");
+      cf::load_extensions;
    };
    $msg->($@) if $@;
    $msg->("reloaded");
 };
 #############################################################################
 # the server's main()
 sub main {
+   load_extensions;
    Event::loop;
 }
 #############################################################################
 # initialisation
 register "<global>", __PACKAGE__;
 unshift @INC, $LIBDIR;
-load_extensions;
 $TICK_WATCHER = Event->timer (
    prio => 1,
    at   => $NEXT_TICK || 1,
    cb   => sub {

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