--- deliantra/Deliantra-Client/DC/DB.pm	2007/08/20 16:16:06	1.19
+++ deliantra/Deliantra-Client/DC/DB.pm	2007/08/28 20:07:18	1.20
@@ -72,17 +72,25 @@
 our $tilemap;
 
 sub get_tile_id_sync($) {
-   my ($hash) = @_;
+   my ($name) = @_;
 
    # fetch the full face table first
    unless ($tilemap) {
-      CFPlus::DB::Server::req (table => facemap => sub { $tilemap = $_[0] });
+      CFPlus::DB::Server::req (table => facemap => sub {
+         $tilemap = $_[0];
+         delete $tilemap->{id};
+         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#
+         }#d#
+      });
       sync;
    }
 
-   $tilemap->{$hash} ||= do {
+   $tilemap->{$name} ||= do {
       my $id;
-      CFPlus::DB::Server::req (get_tile_id => $hash, sub { $id = $_[0] });
+      CFPlus::DB::Server::req (get_tile_id => $name, sub { $id = $_[0] });
       sync;
       $id
    }
@@ -250,13 +258,13 @@
 }
 
 sub do_get_tile_id {
-   my ($hash) = @_;
+   my ($name) = @_;
 
    my $id;
    my $table = table "facemap";
 
    return $id
-      if $table->db_get ($hash, $id) == 0;
+      if $table->db_get ($name, $id) == 0;
 
    for (1..100) {
       my $txn = $DB_ENV->txn_begin;
@@ -264,7 +272,7 @@
       if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
          $id = ($id || 64) + 1;
          if ($table->db_put (id => $id) == 0
-             && $table->db_put ($hash => $id) == 0) {
+             && $table->db_put ($name => $id) == 0) {
             $txn->txn_commit;
 
             return $id;