--- deliantra/server/lib/cf.pm	2008/06/15 20:32:51	1.436
+++ deliantra/server/lib/cf.pm	2008/08/11 23:23:41	1.440
@@ -42,7 +42,7 @@
 use Coro::Semaphore;
 use Coro::AnyEvent;
 use Coro::AIO;
-use Coro::BDB;
+use Coro::BDB 1.6;
 use Coro::Storable;
 use Coro::Util ();
 
@@ -245,7 +245,8 @@
    cf::object cf::object::player
    cf::client cf::player
    cf::arch cf::living
-   cf::map cf::party cf::region
+   cf::map cf::mapspace
+   cf::party cf::region
 )) {
    no strict 'refs';
    @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
@@ -2088,7 +2089,7 @@
       $self->_load_objects ($f)
          or return;
 
-      $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
+      $self->post_load_original
          if delete $self->{load_original};
 
       if (my $uniq = $self->uniq_path) {
@@ -3130,7 +3131,7 @@
 for (
    ["cf::object"         => qw(contr pay_amount pay_player map force_find force_add x y
                                insert remove inv nrof name archname title slaying race
-                               decrease split destroy)],
+                               decrease split destroy change_exp)],
    ["cf::object::player" => qw(player)],
    ["cf::player"         => qw(peaceful)],
    ["cf::map"            => qw(trigger)],
@@ -3798,8 +3799,9 @@
 
    unless ($DB_ENV) {
       $DB_ENV = BDB::db_env_create;
-      $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
-                          | BDB::LOG_AUTOREMOVE, 1);
+      $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
+      $DB_ENV->set_flags      (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
+      $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
       $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
       $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);