--- deliantra/Deliantra-Client/DC/DB.pm	2007/12/26 18:20:46	1.27
+++ deliantra/Deliantra-Client/DC/DB.pm	2007/12/26 20:46:39	1.28
@@ -1,10 +1,10 @@
 =head1 NAME
 
-CFPlus::DB - async. database and filesystem access for cfplus
+dc::DB - async. database and filesystem access for cfplus
 
 =head1 SYNOPSIS
 
- use CFPlus::DB;
+ use dc::DB;
 
 =head1 DESCRIPTION
 
@@ -12,7 +12,7 @@
 
 =cut
 
-package CFPlus::DB;
+package dc::DB;
 
 use strict;
 use utf8;
@@ -22,7 +22,7 @@
 use Config;
 use BDB;
 
-use CFPlus;
+use dc;
 
 our $DBDIR   = "cfplus-" . BDB::VERSION . "-$Config{archname}";
 our $DB_HOME = "$Deliantra::VARDIR/$DBDIR";
@@ -177,7 +177,7 @@
          my %maptile = reverse %$tilemap;#d#
          if ((scalar keys %$tilemap) != (scalar keys %maptile)) {#d#
             $tilemap = { };#d#
-            CFPlus::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d#
+            dc::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d#
          }#d#
       };
       BDB::flush;
@@ -202,31 +202,31 @@
 
 sub sync {
    # for debugging
-   #CFPlus::DB::Server::req (sync => sub { });
-   CFPlus::DB::Server::sync ();
+   #dc::DB::Server::req (sync => sub { });
+   dc::DB::Server::sync ();
 }
 
 sub unlink($$) {
-   CFPlus::DB::Server::req (unlink => @_);
+   dc::DB::Server::req (unlink => @_);
 }
 
 sub read_file($$) {
-   CFPlus::DB::Server::req (read_file => @_);
+   dc::DB::Server::req (read_file => @_);
 }
 
 sub write_file($$$) {
-   CFPlus::DB::Server::req (write_file => @_);
+   dc::DB::Server::req (write_file => @_);
 }
 
 sub prefetch_file($$$) {
-   CFPlus::DB::Server::req (prefetch_file => @_);
+   dc::DB::Server::req (prefetch_file => @_);
 }
 
 sub logprint($$$) {
-   CFPlus::DB::Server::req (logprint => @_);
+   dc::DB::Server::req (logprint => @_);
 }
 
-package CFPlus::DB::Server;
+package dc::DB::Server;
 
 use strict;
 
@@ -357,7 +357,7 @@
 }
 
 sub run {
-   ($FH, my $fh) = CFPlus::socketpipe;
+   ($FH, my $fh) = dc::socketpipe;
 
    my $oldfh = select $FH; $| = 1; select $oldfh;
    my $oldfh = select $fh; $| = 1; select $oldfh;
@@ -381,7 +381,7 @@
             $req = Storable::thaw $req;
 
             my ($id, $type, @args) = @$req;
-            my $cb = CFPlus::DB::Server->can ("do_$type")
+            my $cb = dc::DB::Server->can ("do_$type")
                or die "$type: unknown database request type\n";
             my $res = pack "N/a*", Storable::freeze [$id, $cb->(@args)];
             (syswrite $fh, $res) == length $res
@@ -398,11 +398,11 @@
       warn $error
          if $error;
 
-      CFPlus::_exit 0;
+      dc::_exit 0;
    }
 
    close $fh;
-   CFPlus::fh_nonblocking $FH, 1;
+   dc::fh_nonblocking $FH, 1;
 
    $CB{die} = sub { die shift };