--- cf.schmorp.de/server/random_maps/decor.C	2007/01/27 02:19:37	1.13
+++ cf.schmorp.de/server/random_maps/decor.C	2007/11/08 19:43:25	1.17
@@ -1,28 +1,26 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program is free software; you can redistribute it and/or modify
+ * 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 2 of the License, or
+ * 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
+ * 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>
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
-
 #include <global.h>
 #include <random_map.h>
 #include <rproto.h>
@@ -80,13 +78,13 @@
                 {               /* empty */
                   object *this_object;
 
-                  new_decor_object = pick_random_object (decor_map);
+                  new_decor_object = decor_map->pick_random_object ();
                   this_object = arch_to_object (new_decor_object->arch);
                   new_decor_object->copy_to (this_object);
                   this_object->x = x;
                   this_object->y = y;
                   /* it screws things up if decor can stop people */
-                  this_object->move_block = MOVE_BLOCK_DEFAULT;
+                  this_object->move_block = 0;
                   insert_ob_in_map (this_object, map, NULL, 0);
                   number_to_place--;
                 }
@@ -106,13 +104,13 @@
                   {
                     object *new_decor_object, *this_object;
 
-                    new_decor_object = pick_random_object (decor_map);
+                    new_decor_object = decor_map->pick_random_object ();
                     this_object = arch_to_object (new_decor_object->arch);
                     new_decor_object->copy_to (this_object);
                     this_object->x = i;
                     this_object->y = j;
                     /* it screws things up if decor can stop people */
-                    this_object->move_block = MOVE_BLOCK_DEFAULT;
+                    this_object->move_block = 0;
                     insert_ob_in_map (this_object, map, NULL, 0);
                   }
               }