--- deliantra/server/random_maps/door.C	2008/05/02 21:01:53	1.18
+++ deliantra/server/random_maps/door.C	2009/10/12 14:00:58	1.20
@@ -5,18 +5,19 @@
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -35,14 +36,11 @@
      8 = door or wall below */
   int surround_index = 0;
 
-  if ((i > 0) && (layout[i - 1][j] == 'D' || layout[i - 1][j] == '#'))
-    surround_index += 1;
-  if ((i < Xsize - 1) && (layout[i + 1][j] == 'D' || layout[i + 1][j] == '#'))
-    surround_index += 2;
-  if ((j > 0) && (layout[i][j - 1] == 'D' || layout[i][j - 1] == '#'))
-    surround_index += 4;
-  if ((j < Ysize - 1) && (layout[i][j + 1] == 'D' && layout[i][j + 1] == '#'))
-    surround_index += 8;
+  if ((i >         0) && (layout[i - 1][j] == 'D' || layout[i - 1][j] == '#')) surround_index |= 1;
+  if ((i < Xsize - 1) && (layout[i + 1][j] == 'D' || layout[i + 1][j] == '#')) surround_index |= 2;
+  if ((j >         0) && (layout[i][j - 1] == 'D' || layout[i][j - 1] == '#')) surround_index |= 4;
+  if ((j < Ysize - 1) && (layout[i][j + 1] == 'D' || layout[i][j + 1] == '#')) surround_index |= 8;
+
   return surround_index;
 }
 
@@ -81,15 +79,9 @@
             int sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize);
 
             object *this_door = (sindex == 3 ? hdoors : vdoors)
-                                ->pick_random_object ();
-
-            if (!this_door)//TODO not necessary?
-              abort ();
+                                ->pick_random_object (rmg_rndm);
 
-            object *new_door = this_door->clone ();
-            new_door->x = i;
-            new_door->y = j;
-            insert_ob_in_map (new_door, the_map, NULL, 0);
+            the_map->insert (this_door->clone (), i, j, 0, 0);
           }
       }
 }