--- deliantra/server/lib/cf.pm	2007/02/12 00:27:20	1.208
+++ deliantra/server/lib/cf.pm	2007/02/12 01:25:55	1.209
@@ -2199,34 +2199,32 @@
 
 our $DB;
 
-sub db_load() {
-   unless ($DB) {
-      $DB = BDB::db_create $DB_ENV;
+unless ($DB) {
+   $DB = BDB::db_create $DB_ENV;
 
-      cf::sync_job {
-         eval {
-            $DB->set_flags (BDB::CHKSUM);
+   cf::sync_job {
+      eval {
+         $DB->set_flags (BDB::CHKSUM);
 
-            BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
-                         BDB::CREATE | BDB::AUTO_COMMIT, 0666;
-            cf::cleanup "db_open(db): $!" if $!;
-         };
-         cf::cleanup "db_open(db): $@" if $@;
+         BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
+                      BDB::CREATE | BDB::AUTO_COMMIT, 0666;
+         cf::cleanup "db_open(db): $!" if $!;
       };
+      cf::cleanup "db_open(db): $@" if $@;
+   };
 
-      my $path = cf::localdir . "/database.pst";
-      if (stat $path) {
-         cf::sync_job {
-            my $pst = Storable::retrieve $path;
-
-            cf::db_put (board => data      => $pst->{board});
-            cf::db_put (guildrules => data => $pst->{guildrules});
-            cf::db_put (rent => balance    => $pst->{rent}{balance});
-            BDB::db_env_txn_checkpoint $DB_ENV;
+   my $path = cf::localdir . "/database.pst";
+   if (stat $path) {
+      cf::sync_job {
+         my $pst = Storable::retrieve $path;
 
-            unlink $path;
-         };
-      }
+         cf::db_put (board => data      => $pst->{board});
+         cf::db_put (guildrules => data => $pst->{guildrules});
+         cf::db_put (rent => balance    => $pst->{rent}{balance});
+         BDB::db_env_txn_checkpoint $DB_ENV;
+
+         unlink $path;
+      };
    }
 }
 
@@ -2289,7 +2287,6 @@
    };
 
    cfg_load;
-   db_load;
    load_extensions;
 
    $TICK_WATCHER->start;
@@ -2442,7 +2439,6 @@
 
       warn "loading config and database again";
       cf::cfg_load;
-      cf::db_load;
 
       warn "loading extensions";
       cf::load_extensions;