--- deliantra/server/include/map.h	2007/04/19 16:23:47	1.74
+++ deliantra/server/include/map.h	2007/06/07 19:12:22	1.77
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 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.
+ * 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 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.
+ * 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
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /*
@@ -202,6 +202,7 @@
                                     * should be reset
                                     */
   bool ACC (RW, dirty);            /* if true, something was inserted or removed */
+  bool ACC (RW, no_reset);         // must not reset this map
   bool ACC (RW, fixed_resettime);  /* if true, reset time is not affected by
                                     * players entering/exiting map
                                     */
@@ -213,6 +214,7 @@
   sint16 players;        /* How many players are on this map right now */
   uint16 ACC (RW, difficulty);     /* What level the player should be to play here */
 
+  bool ACC (RW, active);           // wether this map is active or not
   bool ACC (RW, per_player);
   bool ACC (RW, per_party);
   bool ACC (RW, outdoor);  /* True if an outdoor map */
@@ -251,7 +253,7 @@
   MTH void clear ();
 
   MTH void fix_auto_apply ();
-  MTH void decay_objects ();
+  MTH void do_decay_objects ();
   MTH void update_buttons ();
   MTH int change_map_light (int change);
   static void change_all_map_light (int change); //PERL