--- deliantra/server/random_maps/door.C	2006/09/10 16:06:37	1.3
+++ deliantra/server/random_maps/door.C	2009/10/12 14:00:58	1.20
@@ -1,32 +1,27 @@
-
 /*
- * static char *rcsid_door_c =
- *   "$Id: door.C,v 1.3 2006/09/10 16:06:37 root Exp $";
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ * 
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * 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 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 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>
  */
 
-/*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program 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 2 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
-*/
-
 #include <global.h>
 #include <random_map.h>
 #include <rproto.h>
@@ -41,28 +36,27 @@
      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;
 }
 
 void
-put_doors (mapstruct *the_map, char **maze, const char *doorstyle, RMParms * RP)
+put_doors (maptile *the_map, char **maze, const char *doorstyle, random_map_params *RP)
 {
   int i, j;
-  mapstruct *vdoors;
-  mapstruct *hdoors;
-  char doorpath[128];
+  maptile *vdoors;
+  maptile *hdoors;
+  char doorpath[1024];
 
   if (!strcmp (doorstyle, "none"))
     return;
+
   vdoors = find_style ("/styles/doorstyles", doorstyle, -1);
+
   if (vdoors)
     hdoors = vdoors;
   else
@@ -70,27 +64,25 @@
       vdoors = find_style ("/styles/doorstyles/vdoors", doorstyle, -1);
       if (!vdoors)
         return;
+
       sprintf (doorpath, "/styles/doorstyles/hdoors%s", strrchr (vdoors->path, '/'));
       hdoors = find_style (doorpath, 0, -1);
+      if (!hdoors)
+        return;
     }
+
   for (i = 0; i < RP->Xsize; i++)
     for (j = 0; j < RP->Ysize; j++)
       {
         if (maze[i][j] == 'D')
           {
-            int sindex;
-            object *this_door, *new_door;
+            int sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize);
+
+            object *this_door = (sindex == 3 ? hdoors : vdoors)
+                                ->pick_random_object (rmg_rndm);
 
-            sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize);
-            if (sindex == 3)
-              this_door = pick_random_object (hdoors);
-            else
-              this_door = pick_random_object (vdoors);
-            new_door = arch_to_object (this_door->arch);
-            copy_object (this_door, new_door);
-            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);
           }
       }
 }
+