--- deliantra/server/random_maps/door.C	2007/01/06 14:42:30	1.11
+++ deliantra/server/random_maps/door.C	2007/07/01 05:00:19	1.15
@@ -1,26 +1,25 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    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@schmorp.de>
-*/
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 
+ * Crossfire TRT 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.
+ * 
+ * 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/>.
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ */
 
 #include <global.h>
 #include <random_map.h>
@@ -67,8 +66,11 @@
       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++)
@@ -81,9 +83,9 @@
 
             sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize);
             if (sindex == 3)
-              this_door = pick_random_object (hdoors);
+              this_door = hdoors->pick_random_object ();
             else
-              this_door = pick_random_object (vdoors);
+              this_door = vdoors->pick_random_object ();
 
             if (!this_door)
               abort ();
@@ -96,3 +98,4 @@
           }
       }
 }
+